From b371c4e4b3257db323817c9bf11ff82ea6abb612 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 17 Jun 2025 15:43:29 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=AD=89=E7=BA=A7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=810=E5=85=83=E6=B3=A8=E5=86=8C=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=A9=BA=E7=82=B9=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/base/service/ICuMemberService.java | 8 - .../service/impl/CuMemberServiceImpl.java | 8 - .../manage/CuMemberSpeRetailController.java | 116 ++++------- .../bonus/mapper/CuMemberSpeRetailMapper.java | 16 +- .../bonus/bonus/param/RetailAreaParam.java | 33 +--- .../service/ICuMemberSpeRetailService.java | 30 +-- .../impl/CuMemberSpeRetailServiceImpl.java | 36 +--- .../bonus/bonus/CuMemberSpeRetailMapper.xml | 12 +- .../account/mapper/CuMemberAccountMapper.java | 15 -- .../service/ICuMemberAccountService.java | 21 -- .../impl/CuMemberAccountServiceImpl.java | 56 +++--- .../manage/ZeroElementRevokeController.java | 89 +++------ .../member/base/mapper/CuMemberMapper.java | 185 ++---------------- .../member/base/service/ICuMemberService.java | 10 - .../service/impl/CuMemberServiceImpl.java | 160 ++++----------- .../member/base/vo/ZeroElementRevokeVO.java | 34 +--- .../manage/ShareRetailMemberController.java | 6 +- .../retail/member/param/ShareDeleteParam.java | 6 +- .../member/param/ShareParentDeleteParam.java | 6 +- .../member/param/ShareRetailMemberParam.java | 6 +- .../mapper/member/base/CuMemberMapper.xml | 85 +++----- .../core/web/controller/BaseController.java | 2 - .../member/bonus/CuMemberSpeRetail.java | 8 +- 23 files changed, 202 insertions(+), 746 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java index 3de83357..e8e284eb 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java @@ -31,14 +31,6 @@ public interface ICuMemberService extends IService { */ CuMember getMember(String memberCode); - /** - * 获取会员缓存 - * - * @param pkId 会员的主键 - * @return CuMember - */ - CuMember getMember(Long pkId); - /** * 更新会员奖衔根据临时表 * diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java index a3c4f772..0a540d04 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java @@ -33,14 +33,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.queryLoginMember(memberCode, null); } - @Override - public CuMember getMember(Long pkId) { - if (pkId == null) { - return null; - } - return baseMapper.queryLoginMember(null, pkId); - } - @Override public void updateCuMemberByPeriod(List enoughAwardsMember, Integer period) { baseMapper.updateCuMemberByPeriod(period); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java index c79bfa05..28b1f008 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberSpeRetailController.java @@ -1,6 +1,5 @@ package com.hzs.bonus.bonus.controller.manage; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -32,30 +31,21 @@ import java.util.*; import java.util.stream.Collectors; /** - *

- * 秒接日志记录表 前端控制器 - *

- * - * @author hzs - * @since 2025-01-03 + * 注水盒数 前端控制器 */ @RestController @RequestMapping("/manage/special") public class CuMemberSpeRetailController extends BaseController { @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberSpeRetailService cuMemberSpeRetailService; + private ICuMemberSpeRetailService iCuMemberSpeRetailService; @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; /** - * @description: 注水列表 - * @author: zhang jing - * @date: 2025/1/3 16:27 - * @param: [retailAreaParam] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 注水列表 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -63,16 +53,12 @@ public class CuMemberSpeRetailController extends BaseController { startPage(); retailAreaParam.setSystemType(SecurityUtils.getSystemType()); retailAreaParam.setPkCountry(SecurityUtils.getPkCountry()); - List list = cuMemberSpeRetailService.getCuMemberSpeRetail(retailAreaParam); + List list = iCuMemberSpeRetailService.getCuMemberSpeRetail(retailAreaParam); return getDataTable(list); } /** - * @description: 新增注水 - * @author: zhang jing - * @date: 2025/1/3 15:00 - * @param: [retailAreaParam] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 新增注水 **/ @PostMapping("/save") @RepeatSubmitSimple @@ -85,19 +71,15 @@ public class CuMemberSpeRetailController extends BaseController { if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) { return AjaxResult.error("团队盒数需大于小区盒数"); } - //校验团队总盒数大于小区盒数 - if (retailAreaParam.getSmallAreaPv().compareTo(retailAreaParam.getTotalTeamPv()) > 0) { - return AjaxResult.error("团队业绩需大于小区业绩"); - } //校验结算日期是否为空 if (StringUtils.isNull(retailAreaParam.getSettleDate())) { return AjaxResult.error("结算日期不能为空"); } - if(cuMemberSpeRetailService.checkCuMemberActivate(retailAreaParam.getMemberCode())==0){ + if (iCuMemberSpeRetailService.checkCuMemberActivate(retailAreaParam.getMemberCode()) == 0) { return AjaxResult.error("会员未激活，不可注水"); } Integer systemType = SecurityUtils.getSystemType(); - CuMemberExt me = cuMemberService.getMemberByCode(retailAreaParam.getMemberCode()); + CuMemberExt me = iCuMemberService.getMemberByCode(retailAreaParam.getMemberCode()); if (null == me || me.getCategory() != ECategory.NORMAL.getValue()) { return AjaxResult.error("会员信息不存在或已撤单"); } @@ -111,16 +93,16 @@ public class CuMemberSpeRetailController extends BaseController { //查询最新期数 String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, retailAreaParam.getSettleDate()); - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(datestr)).getPkId(); retailAreaParam.setPeriod(period); //校验是否已经注水 - LambdaUpdateWrapper cmsrQw = new LambdaUpdateWrapper(); + LambdaUpdateWrapper cmsrQw = new LambdaUpdateWrapper<>(); cmsrQw.eq(CuMemberSpeRetail::getMemberCode, retailAreaParam.getMemberCode()); cmsrQw.eq(CuMemberSpeRetail::getPeriod, period); cmsrQw.eq(CuMemberSpeRetail::getSystemType, systemType); - int check = cuMemberSpeRetailService.count(cmsrQw); + int check = iCuMemberSpeRetailService.count(cmsrQw); if (check > 0) { return AjaxResult.error("会员已注水"); } @@ -130,15 +112,11 @@ public class CuMemberSpeRetailController extends BaseController { cmsr.setPkCountry(SecurityUtils.getPkCountry()); cmsr.setPeriodDate(DateUtils.getStartTime(retailAreaParam.getSettleDate())); cmsr.setSystemType(systemType); - return AjaxResult.success(cuMemberSpeRetailService.save(cmsr)); + return AjaxResult.success(iCuMemberSpeRetailService.save(cmsr)); } /** - * @description: 批量添加秒接日志记录表 - * @author: zhang jing - * @date: 2025/1/3 13:48 - * @param: [file] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 批量添加秒接日志记录表 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.IMPORT) @PostMapping("/importData") @@ -173,23 +151,17 @@ public class CuMemberSpeRetailController extends BaseController { errorlist.add(cma); continue; } - //校验团队总盒数大于小区盒数 - if (cma.getSmallAreaPv().compareTo(cma.getTotalTeamPv()) > 0) { - cma.setMsg("团队业绩需大于小区业绩"); - errorlist.add(cma); - continue; - } if (!DateUtils.isLatestWeek(cma.getSettleDate(), new Date())) { return AjaxResult.error("只能注水7天以内"); } - if(cuMemberSpeRetailService.checkCuMemberActivate(cma.getMemberCode())==0){ + if (iCuMemberSpeRetailService.checkCuMemberActivate(cma.getMemberCode()) == 0) { cma.setMsg("会员未激活，不可注水"); errorlist.add(cma); continue; } //查询最新期数 String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cma.getSettleDate()); - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(datestr)).getPkId(); cma.setPeriod(period); cma.setPeriodDate(DateUtils.getStartTime(cma.getSettleDate())); @@ -202,7 +174,7 @@ public class CuMemberSpeRetailController extends BaseController { errorlist.add(cma); continue; } - CuMemberExt me = cuMemberService.getMemberByCode(cma.getMemberCode()); + CuMemberExt me = iCuMemberService.getMemberByCode(cma.getMemberCode()); if (null == me || me.getCategory() != ECategory.NORMAL.getValue()) { cma.setMsg("会员信息不存在或已撤单"); errorlist.add(cma); @@ -214,11 +186,11 @@ public class CuMemberSpeRetailController extends BaseController { continue; } //校验是否已经注水 - LambdaUpdateWrapper cmsr = new LambdaUpdateWrapper(); + LambdaUpdateWrapper cmsr = new LambdaUpdateWrapper<>(); cmsr.eq(CuMemberSpeRetail::getMemberCode, cma.getMemberCode()); cmsr.eq(CuMemberSpeRetail::getPeriod, period); cmsr.eq(CuMemberSpeRetail::getSystemType, systemType); - int check = cuMemberSpeRetailService.count(cmsr); + int check = iCuMemberSpeRetailService.count(cmsr); if (check > 0) { cma.setMsg("会员已注水"); errorlist.add(cma); @@ -228,8 +200,8 @@ public class CuMemberSpeRetailController extends BaseController { } } } - if(CollectionUtil.isNotEmpty(memberList)){ - cuMemberSpeRetailService.batchSpeRetail(memberList, pkCountry, pkCreator); + if (CollectionUtil.isNotEmpty(memberList)) { + iCuMemberSpeRetailService.batchSpeRetail(memberList, pkCountry, pkCreator); } if (CollectionUtil.isNotEmpty(errorlist)) { return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorlist); @@ -238,11 +210,7 @@ public class CuMemberSpeRetailController extends BaseController { } /** - * @description: 下载模板 - * @author: zhang jing - * @date: 2023/4/11 17:45 - * @param: [response] - * @return: void + * 下载模板 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.EXPORT) @PostMapping("/download") @@ -253,17 +221,13 @@ public class CuMemberSpeRetailController extends BaseController { } /** - * @description: 查询单条新零售注水信息 - * @author: zhang jing - * @date: 2025/1/3 15:43 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 查询单条新零售注水信息 **/ @GetMapping("/getOne/{pkId}") public AjaxResult getOne(@PathVariable Long pkId) { RetailAreaParam param = new RetailAreaParam(); param.setPkId(pkId); - List retailAreaParam = cuMemberSpeRetailService.getCuMemberSpeRetail(param); + List retailAreaParam = iCuMemberSpeRetailService.getCuMemberSpeRetail(param); if (!DateUtils.isLatestWeek(retailAreaParam.get(0).getSettleDate(), new Date())) { return AjaxResult.error("只能修改7天以内注水"); } @@ -275,11 +239,7 @@ public class CuMemberSpeRetailController extends BaseController { } /** - * @description: 修改注水 - * @author: zhang jing - * @date: 2025/1/3 15:59 - * @param: [retailAreaParam] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改注水 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.UPDATE) @PostMapping("/update") @@ -291,10 +251,6 @@ public class CuMemberSpeRetailController extends BaseController { if (retailAreaParam.getTeamBoxNum() < retailAreaParam.getSmallBoxNum()) { return AjaxResult.error("团队盒数需大于小区盒数"); } - //校验团队总盒数大于小区盒数 - if (retailAreaParam.getSmallAreaPv().compareTo(retailAreaParam.getTotalTeamPv()) > 0) { - return AjaxResult.error("团队业绩需大于小区业绩"); - } //校验结算日期是否为空 if (StringUtils.isNull(retailAreaParam.getSettleDate())) { return AjaxResult.error("结算日期不能为空"); @@ -303,7 +259,7 @@ public class CuMemberSpeRetailController extends BaseController { if (!DateUtils.isLatestWeek(retailAreaParam.getSettleDate(), new Date())) { return AjaxResult.error("只能注水7天以内"); } - CuMemberExt me = cuMemberService.getMemberByCode(retailAreaParam.getMemberCode()); + CuMemberExt me = iCuMemberService.getMemberByCode(retailAreaParam.getMemberCode()); if (null == me || me.getCategory() != ECategory.NORMAL.getValue()) { return AjaxResult.error("会员信息不存在或已撤单"); } @@ -312,16 +268,16 @@ public class CuMemberSpeRetailController extends BaseController { } //查询最新期数 String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, retailAreaParam.getSettleDate()); - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(datestr)).getPkId(); retailAreaParam.setPeriod(period); //校验是否已经注水 - LambdaUpdateWrapper cmsrQw = new LambdaUpdateWrapper(); + LambdaUpdateWrapper cmsrQw = new LambdaUpdateWrapper<>(); cmsrQw.eq(CuMemberSpeRetail::getMemberCode, retailAreaParam.getMemberCode()); cmsrQw.eq(CuMemberSpeRetail::getPeriod, period); cmsrQw.ne(CuMemberSpeRetail::getPkId, retailAreaParam.getPkId()); - int check = cuMemberSpeRetailService.count(cmsrQw); + int check = iCuMemberSpeRetailService.count(cmsrQw); if (check > 0) { return AjaxResult.error("会员已注水"); } @@ -329,31 +285,27 @@ public class CuMemberSpeRetailController extends BaseController { cmsr.setPeriodDate(DateUtils.getStartTime(retailAreaParam.getSettleDate())); cmsr.setPkModified(SecurityUtils.getUserId()); cmsr.setModifiedTime(new Date()); - return AjaxResult.success(cuMemberSpeRetailService.updateById(cmsr)); + return AjaxResult.success(iCuMemberSpeRetailService.updateById(cmsr)); } /** - * @description: 删除注水 - * @author: zhang jing - * @date: 2025/1/3 16:03 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 删除注水 **/ @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.INJECT_RETAIL_ACHIEVEMENT, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") public AjaxResult delete(@PathVariable Long pkId) { RetailAreaParam param = new RetailAreaParam(); param.setPkId(pkId); - List retailAreaParam = cuMemberSpeRetailService.getCuMemberSpeRetail(param); + List retailAreaParam = iCuMemberSpeRetailService.getCuMemberSpeRetail(param); if (!DateUtils.isLatestWeek(retailAreaParam.get(0).getSettleDate(), new Date())) { return AjaxResult.error("只能删除7天以内注水"); } - LambdaUpdateWrapper cmsrQw = new LambdaUpdateWrapper(); + LambdaUpdateWrapper cmsrQw = new LambdaUpdateWrapper<>(); cmsrQw.eq(CuMemberSpeRetail::getPkId, pkId); cmsrQw.set(CuMemberSpeRetail::getDelFlag, EDelFlag.DELETE.getValue()); cmsrQw.set(CuMemberSpeRetail::getPkModified, SecurityUtils.getUserId()); cmsrQw.set(CuMemberSpeRetail::getModifiedTime, new Date()); - return AjaxResult.success(cuMemberSpeRetailService.update(cmsrQw)); + return AjaxResult.success(iCuMemberSpeRetailService.update(cmsrQw)); } } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberSpeRetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberSpeRetailMapper.java index 00e15630..acd60e1d 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberSpeRetailMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberSpeRetailMapper.java @@ -8,23 +8,15 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

- * 秒接日志记录表 Mapper 接口 - *

- * - * @author hzs - * @since 2025-01-03 + * 注水盒数 Mapper 接口 */ public interface CuMemberSpeRetailMapper extends BaseMapper { /** - * @description: 获取注水列表 - * @author: zhang jing - * @date: 2025/1/6 10:34 - * @param: [param] - * @return: java.util.List + * 获取注水列表 **/ - List getCuMemberSpeRetail(RetailAreaParam param); + List getCuMemberSpeRetail(RetailAreaParam param); int checkCuMemberActivate(@Param("memberCode") String memberCode); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java index 6f3bfcb7..b727007b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/RetailAreaParam.java @@ -8,14 +8,6 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -/** - * @description: 大小区 - * @author: sui q - * @time: 2025/1/3 10:17 - * @classname: RetailAreaParam - * @package_name: com.hzs.bonus.bonus.param - * version 1.0.0 - */ @Data public class RetailAreaParam implements Serializable { @@ -23,36 +15,24 @@ public class RetailAreaParam implements Serializable { /** * 会员编号 */ - @Excel(name = "会员编号" ) + @Excel(name = "会员编号") private String memberCode; /** * 团队总盒数 */ - @Excel(name = "团队总盒数" ) - private Integer teamBoxNum=0; + @Excel(name = "团队总盒数") + private Integer teamBoxNum = 0; /** * 小区盒数 */ - @Excel(name = "小区盒数" ) - private Integer smallBoxNum=0; - - /** - * 团队总pv - */ - @Excel(name = "团队总业绩" ) - private BigDecimal totalTeamPv=BigDecimal.ZERO; - - /** - * 小区pv - */ - @Excel(name = "小区业绩" ) - private BigDecimal smallAreaPv=BigDecimal.ZERO; + @Excel(name = "小区盒数") + private Integer smallBoxNum = 0; /** * 结算日期 */ - @Excel(name = "结算日期" ) + @Excel(name = "结算日期") @JsonFormat(pattern = "yyyy-MM-dd") private Date settleDate; @@ -73,7 +53,6 @@ public class RetailAreaParam implements Serializable { */ private Date periodDate; - /** * 个人消费盒数 */ diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberSpeRetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberSpeRetailService.java index 231497c0..27e17fd8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberSpeRetailService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberSpeRetailService.java @@ -3,45 +3,21 @@ package com.hzs.bonus.bonus.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.bonus.bonus.param.RetailAreaParam; import com.hzs.common.domain.member.bonus.CuMemberSpeRetail; -import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

- * 秒接日志记录表 服务类 - *

- * - * @author hzs - * @since 2025-01-03 + * 注水盒数 服务类 */ public interface ICuMemberSpeRetailService extends IService { - /** - * @description: 批量添加秒接日志记录表 - * @author: zhang jing - * @date: 2025/1/3 13:47 - * @param: [list, pkCountry, pkCreator] - * @return: void + * 批量添加注水记录表 **/ void batchSpeRetail(List list, Integer pkCountry, Long pkCreator); - - /* - * @description: 查询新零售特殊配置 - * @author: sui q - * @date: 2025/1/3 13:35 - * @param: null null - **/ - List queryCuMemberSpeRetail(Integer period); - /** - * @description: 获取注水列表 - * @author: zhang jing - * @date: 2025/1/6 10:34 - * @param: [param] - * @return: java.util.List + * 获取注水列表 **/ List getCuMemberSpeRetail(RetailAreaParam param); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberSpeRetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberSpeRetailServiceImpl.java index 1c7f53a4..74dbb3e3 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberSpeRetailServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberSpeRetailServiceImpl.java @@ -1,15 +1,12 @@ package com.hzs.bonus.bonus.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.bonus.mapper.CuMemberSpeRetailMapper; import com.hzs.bonus.bonus.param.RetailAreaParam; import com.hzs.bonus.bonus.service.ICuMemberSpeRetailService; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.bonus.CuMemberSpeRetail; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,32 +14,19 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.List; - /** - *

- * 秒接日志记录表 服务实现类 - *

- * - * @author hzs - * @since 2025-01-03 + * 注水盒数 服务实现类 */ @Service public class CuMemberSpeRetailServiceImpl extends ServiceImpl implements ICuMemberSpeRetailService { - @Override - public List queryCuMemberSpeRetail(Integer period) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("period", period); - return baseMapper.selectList(queryWrapper); - } @Transactional(rollbackFor = Exception.class) @Override - public void batchSpeRetail(List list,Integer pkCountry,Long pkCreator) { - List cmsrList=new ArrayList<>(); - Date date=new Date(); - list.forEach(item ->{ - CuMemberSpeRetail cmsr= BeanUtil.copyProperties(item, CuMemberSpeRetail.class); + public void batchSpeRetail(List list, Integer pkCountry, Long pkCreator) { + List cmsrList = new ArrayList<>(); + Date date = new Date(); + list.forEach(item -> { + CuMemberSpeRetail cmsr = BeanUtil.copyProperties(item, CuMemberSpeRetail.class); cmsr.setPeriodDate(DateUtils.getStartTime(item.getSettleDate())); cmsr.setPkCountry(pkCountry); cmsr.setPkCreator(pkCreator); @@ -52,13 +36,6 @@ public class CuMemberSpeRetailServiceImpl extends ServiceImpl - **/ @Override public List getCuMemberSpeRetail(RetailAreaParam param) { return baseMapper.getCuMemberSpeRetail(param); @@ -69,5 +46,4 @@ public class CuMemberSpeRetailServiceImpl extends ServiceImpl and cmsr.pk_id=#{pkId} - and cmsr.SYSTEM_TYPE=#{systemType} and cmsr.pk_Country=#{pkCountry} - and cmsr.member_code like #{memberCode} || '%' @@ -37,12 +35,12 @@ order by cmsr.CREATION_TIME desc - + - + @@ -1597,21 +1593,6 @@ - - - - - - - - -