1、新增默认头像设置 2、修改知识库bug 3、修改点赞bug

jyy

2021-01-25 ae6d2af141f18e40956d98cea765fec838985817

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -16,12 +16,14 @@
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.VipInfoVo;
import com.matrix.system.hive.service.SysVipInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -57,6 +59,14 @@

   @Autowired
   private SysVipLabelDao sysVipLabelDao;

   @Value("${default.vip.photo.woman}")
   String defaultWoman;

   @Value("${default.vip.photo.man}")
   String defaultMan;



   /**
    * 新增会员储值卡
@@ -104,6 +114,11 @@
      sysVipInfo.setPointAll(0);
      sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
      sysVipInfo.setZjm(StringUtils.toHanyuPinyin(sysVipInfo.getVipName())+","+StringUtils.toHeadWordHanyuPinyin(sysVipInfo.getVipName()));
      if(sysVipInfo.getSex().equals(Dictionary.SEX_MAN)){
         sysVipInfo.setPhoto(defaultMan);
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      int i=sysVipInfoDao.insert(sysVipInfo);
      modifyVipWithOtherInfo(sysVipInfo);
      //创建用户默认储值卡
@@ -336,6 +351,11 @@
      SysUsers users = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
      sysVipInfo.setCompanyId(users.getCompanyId());
      sysVipInfo.setShopId(users.getShopId());
      if(sysVipInfo.getSex().equals(Dictionary.SEX_MAN)){
         sysVipInfo.setPhoto(defaultMan);
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      int i=sysVipInfoDao.insert(sysVipInfo);
      modifyVipWithOtherInfo(sysVipInfo);
      return i;
@@ -424,6 +444,7 @@
      if (!DataAuthUtil.hasAllShopAuth()) {
         vipInfoListDto.setShopId(sysUsers.getShopId());
      }
      QueryUtil.setQueryLimitCom(vipInfoListDto);
      return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
   }

@@ -447,6 +468,8 @@
      }

      SysVipInfo vipInfo = new SysVipInfo();

      vipInfo.setPhoto(addVipDto.getPhoto());
      vipInfo.setVipName(addVipDto.getVipName());
      vipInfo.setVipNo(addVipDto.getVipNo());
      vipInfo.setSex(addVipDto.getSex());
@@ -455,6 +478,7 @@
      vipInfo.setAddr(addVipDto.getAddress());
      vipInfo.setRemark(addVipDto.getRemark());
      vipInfo.setBirthday1(addVipDto.getBirthday());
      vipInfo.setPassWord(addVipDto.getPassword());
      vipInfo.setRecommendId(addVipDto.getRecommendId());

      if (StringUtils.isNotBlank(addVipDto.getAreas())) {
@@ -476,10 +500,15 @@
      vipInfo.setPointAll(0);
      vipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
      vipInfo.setZjm(StringUtils.toHanyuPinyin(vipInfo.getVipName())+","+StringUtils.toHeadWordHanyuPinyin(vipInfo.getVipName()));
      if(vipInfo.getSex().equals(Dictionary.SEX_MAN)){
         vipInfo.setPhoto(defaultMan);
      }else{
         vipInfo.setPhoto(defaultWoman);
      }
      int i=sysVipInfoDao.insert(vipInfo);

      if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {
         batchInsertLabel(addVipDto.getLabels(), user.getSuName(), vipInfo.getId());
         batchInsertLabel(addVipDto.getLabels(), vipInfo.getId());
      }

      //创建用户默认储值卡
@@ -523,28 +552,27 @@
      vipInfo.setPhone(modifyVipDto.getPhone());
      vipInfo.setAddr(modifyVipDto.getAddress());
      vipInfo.setRemark(modifyVipDto.getRemark());
      vipInfo.setPassWord(modifyVipDto.getPassword());
      vipInfo.setBirthday1(modifyVipDto.getBirthday());
      vipInfo.setRecommendId(modifyVipDto.getRecommendId());
      vipInfo.setPhoto(modifyVipDto.getPhoto());
      int i = sysVipInfoDao.update(vipInfo);

      if (CollectionUtils.isNotEmpty(modifyVipDto.getLabels())) {
         sysVipLabelDao.deleteByVipId(modifyVipDto.getVipId());

         batchInsertLabel(modifyVipDto.getLabels(), user.getSuName(), vipInfo.getId());
         sysVipLabelDao.deleteRelateByVipId(modifyVipDto.getVipId());
         batchInsertLabel(modifyVipDto.getLabels(), vipInfo.getId());
      }
      return i;
   }

   private void batchInsertLabel(List<String> labelList, String suName, Long id) {
   private void batchInsertLabel(List<String> labelList, Long id) {
      Set<String> labels = new HashSet<>(labelList);
      Iterator<String> iterator = labels.iterator();
      if (iterator.hasNext()) {
         SysVipLabel sysVipLabel = new SysVipLabel();
         sysVipLabel.setCreateTime(new Date());
         sysVipLabel.setCreateBy(suName);
         sysVipLabel.setLabel(iterator.next());
         sysVipLabel.setVipId(id);
         sysVipLabelDao.insert(sysVipLabel);
      while (iterator.hasNext()) {
         SysVipLabelRelate relate = new SysVipLabelRelate();
         relate.setLabelId(Long.parseLong(iterator.next()));
         relate.setVipId(id);
         sysVipLabelDao.insertRelate(relate);
      }
   }

@@ -568,6 +596,9 @@
      vipInfoDetailVo.setArea(sysVipInfo.getArea());
      vipInfoDetailVo.setRemark(sysVipInfo.getRemark());
      vipInfoDetailVo.setBirthday(sysVipInfo.getBirthday1());
      vipInfoDetailVo.setPassword(sysVipInfo.getPassWord());
      vipInfoDetailVo.setPhoto(sysVipInfo.getPhoto());
      vipInfoDetailVo.setVipNo(sysVipInfo.getVipNo());

      List<SysVipLabel> labels = sysVipLabelDao.selectByVipId(sysVipInfo.getId());
      vipInfoDetailVo.setLabels(labels);