Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-25 0eb83b49a381c31a51b8c8cec9e4d9d88fd5d16f

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

@@ -17,6 +17,7 @@
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;
@@ -425,6 +426,7 @@
      if (!DataAuthUtil.hasAllShopAuth()) {
         vipInfoListDto.setShopId(sysUsers.getShopId());
      }
      QueryUtil.setQueryLimitCom(vipInfoListDto);
      return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
   }

@@ -437,9 +439,11 @@
   public int apiAddVip(AddVipDto addVipDto) {
      SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);

      if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", addVipDto.getVipNo(),
            "company_id",user.getCompanyId())) {
         throw new GlobleException("编号已存在!");
      if (StringUtils.isNotBlank(addVipDto.getVipNo())) {
         if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", addVipDto.getVipNo(),
               "company_id", user.getCompanyId())) {
            throw new GlobleException("编号已存在!");
         }
      }

      if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", addVipDto.getPhone(),
@@ -448,6 +452,7 @@
      }

      SysVipInfo vipInfo = new SysVipInfo();

      vipInfo.setPhoto(addVipDto.getPhoto());
      vipInfo.setVipName(addVipDto.getVipName());
      vipInfo.setVipNo(addVipDto.getVipNo());
@@ -482,7 +487,7 @@
      int i=sysVipInfoDao.insert(vipInfo);

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

      //创建用户默认储值卡
@@ -499,10 +504,12 @@
         throw new GlobleException("用户不存在");
      }

      if (!modifyVipDto.getVipNo().equals(vipInfo.getVipNo())) {
         if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", modifyVipDto.getVipNo(),
               "company_id",user.getCompanyId())) {
            throw new GlobleException("编号已存在!");
      if (StringUtils.isNotBlank(modifyVipDto.getVipNo())) {
         if (!modifyVipDto.getVipNo().equals(vipInfo.getVipNo())) {
            if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", modifyVipDto.getVipNo(),
                  "company_id", user.getCompanyId())) {
               throw new GlobleException("编号已存在!");
            }
         }
      }

@@ -533,23 +540,20 @@
      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);
      }
   }

@@ -575,6 +579,7 @@
      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);