From c5b18ea5e276e488c254f787b9d8bce5b221374b Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 4 Jun 2025 10:03:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../com/qs/serve/framework/base/model/R.java | 6 +++++ .../oms/controller/api/OmsSaleOrderApi.java | 1 + .../service/impl/SysDeleteLogServiceImpl.java | 2 +- .../TbsActivityCheckController.java | 26 ++++++++++++------- .../TbsActivityTemplateController.java | 8 ++++++ .../service/impl/TbsCostApplyServiceImpl.java | 4 ++- .../tzc/controller/TzcRebateController.java | 3 ++- ...RebateApplication4VerificationService.java | 2 +- .../TzcRebateApplication4CostServiceImpl.java | 7 ++++- ...teApplication4VerificationServiceImpl.java | 4 +-- .../VtbVerificationBatchController.java | 2 +- .../service/VtbVerificationBatchService.java | 2 +- .../impl/VtbVerificationBatchServiceImpl.java | 4 +-- 14 files changed, 51 insertions(+), 22 deletions(-) diff --git a/cms-api/cms-admin-svc/src/main/resources/application.yml b/cms-api/cms-admin-svc/src/main/resources/application.yml index c1a1312..bb11fa2 100644 --- a/cms-api/cms-admin-svc/src/main/resources/application.yml +++ b/cms-api/cms-admin-svc/src/main/resources/application.yml @@ -58,7 +58,7 @@ mybatis-plus: # 日志配置 logging: level: - ROOT: debug + ROOT: info com.qs.serve: debug com.qs.serve.modules.his: debug com.qs.serve.modules.sys: debug diff --git a/cms-common/src/main/java/com/qs/serve/framework/base/model/R.java b/cms-common/src/main/java/com/qs/serve/framework/base/model/R.java index ff144c2..58586e0 100644 --- a/cms-common/src/main/java/com/qs/serve/framework/base/model/R.java +++ b/cms-common/src/main/java/com/qs/serve/framework/base/model/R.java @@ -1,9 +1,11 @@ package com.qs.serve.framework.base.model; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.pagehelper.PageInfo; import com.qs.serve.common.utils.PageUtil; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.io.Serializable; @@ -19,6 +21,7 @@ import java.util.List; */ @Getter @Setter +@NoArgsConstructor public class R implements Serializable { public R(int status, String msg) { @@ -42,6 +45,9 @@ public class R implements Serializable { */ private String msg; + @JsonIgnore + private String message; + /** * 数据 */ diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java index ce09984..29fc7c9 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java @@ -208,6 +208,7 @@ public class OmsSaleOrderApi { PageUtil.startPage(); LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(param); + orderWrapper.orderByDesc(OmsSaleOrder::getUserCreateTime); List list = omsSaleOrderService.list(orderWrapper); this.buildOrderVoInfo(list); return R.byPageHelperList(list); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index fb42c28..4fd9288 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -99,8 +99,8 @@ public class SysDeleteLogServiceImpl extends ServiceImpl verificationBoList = new ArrayList<>(); BigDecimal totalAmount = BigDecimal.ZERO; for (TbsActivity activity : activityList) { - VtbVerificationBo verificationBo = this.createVerificationBo(activity); + VtbVerificationBo verificationBo = this.createVerificationBo(activity,TzcArgTypes.LevelOverallReturn); if (verificationBo==null){ continue; } verificationBoList.add(verificationBo); - for (VtbVerificationSubjectCenterBo centerBo : verificationBo.getSubjectCenterList()) { - + for (VtbVerificationSubjectBo subjectBo : verificationBo.getSubjectList()) { + totalAmount = subjectBo.getAmount().add(totalAmount); } } VtbVerificationBatchBo batchBo = new VtbVerificationBatchBo(); batchBo.setVerificationList(verificationBoList); batchBo.setRemark("年度返利核销"); - //batchBo.setPayWayId(0); + // 票扣 + batchBo.setPayWayId(1L); batchBo.setCostApplyId(costApplyId); - //batchBo.setTotalAmount(); + batchBo.setTotalAmount(totalAmount); batchBo.setRebateOfYearFlag(1); - + vtbVerificationBatchService.submit(batchBo,costApply.getUserId()); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index f21ac6f..9d0160e 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -334,6 +334,14 @@ public class TbsActivityTemplateController { }); } + if(CollectionUtil.isNotEmpty(supplierList)){ + List cusIds = supplierList.stream().map(BmsSupplier::getId).collect(Collectors.toList()); + tempLqw.or(con->{ + con.eq(TbsActivityTemplateRegion::getType,"cus"); + con.in(TbsActivityTemplateRegion::getRegionId,cusIds); + }); + } + List templateRegions = null; if(CollectionUtil.isNotEmpty(saleRegionIds)||CollectionUtil.isNotEmpty(bizRegionIds)){ templateRegions = tbsActivityTemplateRegionService.list(tempLqw); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index d1bf53a..4b7970a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -696,7 +696,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl result = new ArrayList<>(); for (TzcGetActivityRebateQuery query : queryList) { - TzcRebateCalculateDTO dto = tzcRebateApplication4VerificationService.getActivityRebateAmount(query.getActivityId(),query.getDispatchAmount()); + TzcRebateCalculateDTO dto = tzcRebateApplication4VerificationService.getActivityRebateAmount(query.getActivityId(),query.getDispatchAmount(), TzcArgTypes.LevelReturn); if (dto != null){ result.add(dto); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplication4VerificationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplication4VerificationService.java index 31ef537..a318f2a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplication4VerificationService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplication4VerificationService.java @@ -30,7 +30,7 @@ public interface TzcRebateApplication4VerificationService { * @param dispatchAmt * @return */ - TzcRebateCalculateDTO getActivityRebateAmount(Long activityId,BigDecimal dispatchAmt); + TzcRebateCalculateDTO getActivityRebateAmount(Long activityId,BigDecimal dispatchAmt,TzcArgTypes argType); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java index ed0a260..333c304 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java @@ -590,13 +590,18 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio dto.appendErrorMsg("坎级ID："+rebateLevels.getId()+"，缺少参数："+argType.name()); continue; } - dto.appendDebugMsg("读取坎级("+rebateLevels.getLevelNum()+")配置 ,返利参数："+currentArgument.getBusinessType()); + dto.appendDebugMsg("读取坎级("+rebateLevels.getLevelNum()+")配置 ,返利参数：" + +currentArgument.getBusinessType()+"最高返利金额："+currentArgument.getMaxReturn()); TzcRebateLevelAmountDTO rebateLevelsDTO = CopierUtil.copy(rebateLevels,new TzcRebateLevelAmountDTO()); rebateLevelsDTO.setArgument(currentArgument); // 选择的策略：0-百分比；1-固定金额 if (currentArgument.getRateAmtFlag().equals(1)){ rebateLevelsDTO.setReturnAmt(currentArgument.getReturnFixed()); rebateLevelsDTO.setDebugMsg("返利为固定金额："+currentArgument.getReturnFixed()); + if (currentArgument.getMaxReturn()!=null && currentArgument.getReturnFixed().compareTo(currentArgument.getMaxReturn())>0){ + rebateLevelsDTO.setDebugMsg("最高返利金额："+currentArgument.getMaxReturn()); + rebateLevelsDTO.setReturnAmt(currentArgument.getMaxReturn()); + } }else if (currentArgument.getRateAmtFlag().equals(0)){ //目标销量维度：0-总量；1-增量 if (currentArgument.getSumAddFlag().equals(0)){ diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4VerificationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4VerificationServiceImpl.java index 85e6084..b104c00 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4VerificationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4VerificationServiceImpl.java @@ -256,7 +256,7 @@ public class TzcRebateApplication4VerificationServiceImpl implements TzcRebateAp } @Override - public TzcRebateCalculateDTO getActivityRebateAmount(Long activityId, BigDecimal dispatchAmt) { + public TzcRebateCalculateDTO getActivityRebateAmount(Long activityId, BigDecimal dispatchAmt,TzcArgTypes argType) { TbsActivity activity = tbsActivityMapper.selectById(activityId); if (activity.getRebatePeriodId()==null||activity.getRebatePeriodId().equals(0L)){ return null; @@ -271,7 +271,7 @@ public class TzcRebateApplication4VerificationServiceImpl implements TzcRebateAp rebatePeriod.getPeriodAmount() ); List levelAmountList = tzcRebateApplication4CostService.calculateRebate( - calculateDTO,dispatchAmt, sameDispatchAmt, TzcArgTypes.LevelReturn); + calculateDTO,dispatchAmt, sameDispatchAmt, argType); return this.calculateRebateVerification(calculateDTO, levelAmountList, activity); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java index 8f3bb82..f639100 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java @@ -135,7 +135,7 @@ public class VtbVerificationBatchController { @SysLog(module = SystemModule.Verification, title = "批量核销", biz = BizType.INSERT) public R save(@RequestBody @Valid VtbVerificationBatchBo param){ seeYonService.testConnection(); - vtbVerificationBatchService.submit(param); + vtbVerificationBatchService.submit(param,AuthContextUtils.getSysUserId()); return R.ok(); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationBatchService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationBatchService.java index 0c66722..4fdfba6 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationBatchService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationBatchService.java @@ -20,7 +20,7 @@ public interface VtbVerificationBatchService extends IService listVerifications(Long batchId); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java index 5c48bf1..c6bf88a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java @@ -97,7 +97,7 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl activityList = tbsActivityService.listByCostApplyId(costApply.getId()); - SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); + SysUser sysUser = sysUserService.getById(userId); sysUser.checkSyAccount(); redisService.throwResLock(VtbVerificationBatch.class.getSimpleName(),submitBo.getCostApplyId()+""); // 校验核销状态