Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

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

@@ -79,6 +79,9 @@
   @Autowired
   ScoreVipDetailService scoreVipDetailService;

   @Autowired
   private SysOrderDao sysOrderDao;


   /**
    * 新增会员储值卡
@@ -120,7 +123,9 @@
         }
      }
      SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      sysVipInfo.setCompanyId(user.getCompanyId());
      if(user!=null){
         sysVipInfo.setCompanyId(user.getCompanyId());
      }
      sysVipInfo.setCreateTime(new Date());
      sysVipInfo.setPointAll(0);
      sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
@@ -132,6 +137,7 @@
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      sysVipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(sysVipInfo);
      //创建用户默认储值卡
      addVipDefaultCard(sysVipInfo.getId());
@@ -168,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) {
@@ -343,6 +345,7 @@
      }else{
         sysVipInfo.setPhoto(defaultWoman);
      }
      sysVipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(sysVipInfo);
      modifyVipWithOtherInfo(sysVipInfo);
      return i;
@@ -427,8 +430,9 @@

   @Override
   public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
      //todo 会员查询单独做控制
      SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
      if (!DataAuthUtil.hasAllShopAuth()) {
      if (!DataAuthUtil.hasAllCustomerAuth()) {
         vipInfoListDto.setShopId(sysUsers.getShopId());
      }
      QueryUtil.setQueryLimitCom(vipInfoListDto);
@@ -437,7 +441,9 @@

   @Override
   public com.matrix.system.app.vo.VipInfoVo findApiVipInfoById(Long id) {
      return sysVipInfoDao.selectVipInfoById(id);
      com.matrix.system.app.vo.VipInfoVo result = sysVipInfoDao.selectVipInfoById(id);
      result.setArrears(sysOrderDao.selectArrearsByVipId(id));
      return result;
   }

   @Override
@@ -495,6 +501,7 @@
      }else{
         vipInfo.setPhoto(defaultWoman);
      }
      vipInfo.setIsDelete(Dictionary.DELETED_N);
      int i=sysVipInfoDao.insert(vipInfo);

      if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {
@@ -666,5 +673,13 @@
   }


   @Override
   public List<Map<String, Object>> findVipArrearsStatistics(SysVipInfo sysVipInfo, PaginationVO pageVo) {
      return sysVipInfoDao.selectVipArrearsStatistics(sysVipInfo, pageVo);
   }

   @Override
   public Integer findVipArrearsStatisticsTotal(SysVipInfo sysVipInfo) {
      return sysVipInfoDao.selectVipArrearsStatisticsTotal(sysVipInfo);
   }
}