Merge branch 'master' into feature/订单服务单代码改造

姜友瑶

2022-05-23 ea865027c9e115057644f59747f3bed2a8a963e6

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

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

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

   }

@@ -197,7 +198,7 @@
   @Override
   public int removeById(Long id) {

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

   }

@@ -362,6 +363,7 @@
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      sysVipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(sysVipInfo);
      modifyVipWithOtherInfo(sysVipInfo);
      return i;
@@ -517,6 +519,7 @@
      }else{
         vipInfo.setPhoto(defaultWoman);
      }
      vipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(vipInfo);

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