Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

 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());
@@ -173,19 +174,15 @@
      return sysVipInfoDao.update(sysVipInfo);
   }

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

      return sysVipInfoDao.deleteByIds(list);

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

      return sysVipInfoDao.deleteLogicByIds(list);

   }

   @Override
   public int removeById(Long id) {

      return sysVipInfoDao.deleteById(id);

   }

   @Override
   public List<SysVipInfo> findInPage(SysVipInfo sysVipInfo, PaginationVO pageVo) {
@@ -348,6 +345,7 @@
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      sysVipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(sysVipInfo);
      modifyVipWithOtherInfo(sysVipInfo);
      return i;
@@ -503,6 +501,7 @@
      }else{
         vipInfo.setPhoto(defaultWoman);
      }
      vipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(vipInfo);

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