Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -137,6 +137,7 @@
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      sysVipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(sysVipInfo);
      //创建用户默认储值卡
      addVipDefaultCard(sysVipInfo.getId());
@@ -176,14 +177,21 @@
   @Override
   public int remove(List<Long> list) {

      return sysVipInfoDao.deleteByIds(list);
      return sysVipInfoDao.deleteLogicByIds(list);

   }

   @Override
   public int removeLogic(List<Long> list) {

      return sysVipInfoDao.deleteLogicByIds(list);

   }

   @Override
   public int removeById(Long id) {

      return sysVipInfoDao.deleteById(id);
      return sysVipInfoDao.deleteLogicByIds(Arrays.asList(id));

   }

@@ -348,6 +356,7 @@
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      sysVipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(sysVipInfo);
      modifyVipWithOtherInfo(sysVipInfo);
      return i;
@@ -503,6 +512,7 @@
      }else{
         vipInfo.setPhoto(defaultWoman);
      }
      vipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(vipInfo);

      if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {