From 8e5bcf2d7601afd988ef6802985a3d0d287a638c Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 17 Sep 2025 11:59:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E9=85=8D=E7=BD=AE,=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E8=B5=A0=E9=80=81,=E6=97=85=E6=B8=B8=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AD=BE=E5=91=88=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/IActivityService.java | 2 +- .../service/impl/ActivityServiceImpl.java | 40 +++++++++++++++++-- .../AcDrawGiftRuleConfigController.java | 8 +++- .../service/IAcDrawGiftRuleConfigService.java | 2 +- .../impl/AcDrawGiftRuleConfigServiceImpl.java | 32 ++++++++++++++- .../AcRecommendConfigController.java | 8 +++- .../IAcRepurCouponsRuleConfigService.java | 2 +- .../AcRepurCouponsRuleConfigServiceImpl.java | 17 ++++++-- .../manage/AcTourismController.java | 8 +++- 9 files changed, 101 insertions(+), 18 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java index d40d489c..fc0bbc0c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java @@ -109,7 +109,7 @@ public interface IActivityService { * @param recommendParam * @return */ - Boolean onLinePetition(AcRecommendParam recommendParam); + String onLinePetition(AcRecommendParam recommendParam); /** * 活动签呈审核通过 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java index 56746b95..ec0d661f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java @@ -631,7 +631,8 @@ public class ActivityServiceImpl implements IActivityService { * @return */ @Override - public Boolean onLinePetition(AcRecommendParam recommendParam) { + public String onLinePetition(AcRecommendParam recommendParam) { + log.info("旅游活动新增参数{}",JSONUtil.toJsonStr(recommendParam)); //业务单号 String code = CommonUtil.createSerialNumber(EOrderPrefix.ACTIVITY_CODE.getValue()); EApprovalBusiness approvalBusiness = null; @@ -643,7 +644,40 @@ public class ActivityServiceImpl implements IActivityService { approvalBusiness = EApprovalBusiness.TOURISM_DELETE; } recommendParam.getActivityParam().setBusinessCode(code); - Boolean b = submitApproval(recommendParam, approvalBusiness); + Integer controlType = recommendParam.getControlType(); + if (controlType.equals(EControlType.SAVE.getValue())) { + ActivityParam activityParam = recommendParam.getActivityParam(); + activityParam.setPkCountry(recommendParam.getPkCountry()); + activityParam.setPkCreator(recommendParam.getPkMember()); + activityParam.setActType(EActType.TOURISM.getValue()); + + // 增加基础配置 + AcBaseConfig baseConfig = saveBaseConfig(activityParam); + // 目标群体配置 + saveGoalMemberConfig(activityParam, baseConfig); + } else if (controlType.equals(EControlType.MODIFY.getValue())) { + ActivityParam activityParam = recommendParam.getActivityParam(); + activityParam.setActType(EActType.TOURISM.getValue()); + activityParam.setPkCountry(recommendParam.getPkCountry()); + activityParam.setPkCreator(recommendParam.getPkMember()); + //目标用户群删除 + LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); + qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId()); + goalMemberConfigService.remove(qe); + // 增加基础配置 + AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class); + baseConfigService.updateById(baseConfig); + // 目标群体配置 + saveGoalMemberConfig(activityParam, baseConfig); + } else if (controlType.equals(EControlType.DELETE.getValue())) { + ActivityParam activityParam = recommendParam.getActivityParam(); + //目标用户群删除 + LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); + qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId()); + goalMemberConfigService.remove(qe); + baseConfigService.removeById(activityParam.getPkId()); + drawGiftConfigService.removeDrawGiftConfig(activityParam.getPkId().intValue()); + } //日志 ActivityParam activityParam = recommendParam.getActivityParam(); activityParam.setPkCountry(SecurityUtils.getPkCountry()); @@ -651,7 +685,7 @@ public class ActivityServiceImpl implements IActivityService { activityParam.setActType(EActType.TOURISM.getValue()); activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode()); this.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false); - return b; + return null; } /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java index b6c66f9f..5b20c88c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java @@ -86,7 +86,7 @@ public class AcDrawGiftRuleConfigController extends BaseController { * @return AjaxResult */ @Log(module = EOperationModule.AC_RECOMMEEND_CONFIG, method = EOperationMethod.INSERT, remark = "抽奖在线配置") - @PostMapping("/online-petition") + @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { if (recommendParam.getActivityParam().getDrawGiftConfigList() != null) { for (AcDrawGiftRuleConfigVo acDrawGiftRuleConfigVo : recommendParam.getActivityParam().getDrawGiftConfigList()) { @@ -99,7 +99,11 @@ public class AcDrawGiftRuleConfigController extends BaseController { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); recommendParam.setPkMember(SecurityUtils.getUserId()); recommendParam.setLoginUser(userTokenService.getLoginUser()); - return toAjax(drawGiftConfigService.onLinePetition(recommendParam)); + String str = drawGiftConfigService.onLinePetition(recommendParam); + if (str != null) { + return AjaxResult.error(str); + } + return AjaxResult.success(); } /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java index 050d3239..94a9b3bc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java @@ -62,5 +62,5 @@ public interface IAcDrawGiftRuleConfigService extends IService implements IAcDrawGiftRuleConfigService { @Autowired @@ -181,7 +184,9 @@ public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl recommendUpgradeList = recommendParam.getRecommendUpgradeList(); @@ -113,12 +114,20 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl Date: Thu, 18 Sep 2025 09:05:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AD=BE=E5=91=88=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/AcConsumeRuleConfigController.java | 7 ++-- .../manage/AcMemberConsumeRuleController.java | 7 ++-- .../service/IAcConsumeRuleConfigService.java | 2 +- .../service/IAcMemberConsumeRuleService.java | 2 +- .../impl/AcConsumeRuleConfigServiceImpl.java | 32 +++++++++++++++-- .../impl/AcMemberConsumeRuleServiceImpl.java | 35 +++++++++++++++++-- .../manage/WaresRuleConfigController.java | 7 ++-- .../service/IAcWaresRuleConfigService.java | 2 +- .../impl/AcWaresRuleConfigServiceImpl.java | 34 ++++++++++++++++-- 9 files changed, 110 insertions(+), 18 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java index 389f40d1..3b143642 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java @@ -173,12 +173,15 @@ public class AcConsumeRuleConfigController extends BaseController { * @return AjaxResult */ @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") - @PostMapping("/online-petition") + @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); recommendParam.setPkMember(SecurityUtils.getUserId()); recommendParam.setLoginUser(userTokenService.getLoginUser()); - consumeRuleConfigService.onLinePetition(recommendParam); + String str = consumeRuleConfigService.onLinePetition(recommendParam); + if (str != null) { + return AjaxResult.error(str); + } return AjaxResult.success(); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java index d5a1638d..b19c5675 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java @@ -112,10 +112,13 @@ public class AcMemberConsumeRuleController extends BaseController { * @return AjaxResult */ @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") - @PostMapping("/online-petition") + @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) { memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser()); - iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo); + String str = iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo); + if (str != null) { + return AjaxResult.error(str); + } return AjaxResult.success(); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java index 707de3bd..28cf19c9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java @@ -38,7 +38,7 @@ public interface IAcConsumeRuleConfigService extends IService implements IAcConsumeRuleConfigService { @Autowired @@ -106,7 +108,9 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl implements IAcMemberConsumeRuleService { @Autowired @@ -80,7 +82,9 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl { * * @param recommendParam */ - Boolean onLinePetition(AcRecommendParam recommendParam); + String onLinePetition(AcRecommendParam recommendParam); /** * 商品赠送 审核规则 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java index f7d1e9b1..0f75c255 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java @@ -30,9 +30,11 @@ import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.LoginUser; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -43,6 +45,7 @@ import java.util.List; * @since 2023-04-20 */ @Service +@Slf4j public class AcWaresRuleConfigServiceImpl extends ServiceImpl implements IAcWaresRuleConfigService { @Autowired @@ -108,7 +111,9 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl Date: Thu, 18 Sep 2025 09:36:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?##=20=E5=85=85=E5=80=BC=E5=B7=B2=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E6=AC=A1=E6=95=B0,=E5=85=85=E5=80=BC=E6=9C=AA?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=AC=A1=E6=95=B0=E5=8F=96=E6=B6=88=E7=AD=BE?= =?UTF-8?q?=E5=91=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AcDrawRewardNumServiceImpl.java | 60 ++++++++++++++++--- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java index dcd3acb7..1d250921 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java @@ -39,6 +39,7 @@ import com.hzs.member.detail.ICuMemberServiceLogServiceApi; import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalSubmitDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,6 +56,7 @@ import java.util.concurrent.TimeUnit; * @since 2023-04-21 */ @Service +@Slf4j public class AcDrawRewardNumServiceImpl extends ServiceImpl implements IAcDrawRewardNumService { @Autowired @@ -239,10 +241,32 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl memberDto = memberServiceApi.getMember(memberCode); + Long pkMember = memberDto.getData().getPkId(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId); + queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember); + AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper); + if (drawRewardNum != null) { + baseMapper.updatePurchasedTimesByBaseId(pkMember, num, pkBaseId); + } else { + drawRewardNum = new AcDrawRewardNum(); + drawRewardNum.setPkBaseId(pkBaseId); + drawRewardNum.setPkMember(pkMember); + drawRewardNum.setTotalUsedNum(num); + drawRewardNum.setAvailableNum(num); + drawRewardNum.setTotalNum(num); + drawRewardNum.setAvailableSurplusNum(num); + drawRewardNum.setCreationTime(DateUtils.currentDateTime()); + drawRewardNum.setPkCreator(memberDto.getData().getPkCreator()); + drawRewardNum.setPkCountry(memberDto.getData().getPkCountry()); + this.save(drawRewardNum); + } } /** @@ -364,10 +388,30 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl memberDto = memberServiceApi.getMember(memberCode); + Long pkMember = memberDto.getData().getPkId(); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId); + queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember); + AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper); + if (drawRewardNum != null) { + baseMapper.updateUnpurchasedTimesByPkbaseId(pkMember, num, pkBaseId); + } else { + drawRewardNum = new AcDrawRewardNum(); + drawRewardNum.setPkBaseId(pkBaseId); + drawRewardNum.setPkMember(pkMember); + drawRewardNum.setTotalNum(num); + drawRewardNum.setTotalSurplusNum(num); + drawRewardNum.setCreationTime(DateUtils.currentDateTime()); + drawRewardNum.setPkCreator(memberDto.getData().getPkCreator()); + drawRewardNum.setPkCountry(memberDto.getData().getPkCountry()); + this.save(drawRewardNum); + } } /** From 60bae2af968fd2d40c2d3717392c9680f717dd99 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 18 Sep 2025 10:33:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/AcConsumeRuleConfigController.java | 2 +- .../controller/manage/AcMemberConsumeRuleController.java | 2 +- .../draw/controller/manage/AcDrawRewardRecordController.java | 2 ++ .../wares/controller/manage/WaresRuleConfigController.java | 2 +- .../java/com/hzs/common/core/enums/EOperationBusiness.java | 4 ++++ .../main/java/com/hzs/common/core/enums/EOperationModule.java | 4 ++++ 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java index 3b143642..4552ac5b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java @@ -172,7 +172,7 @@ public class AcConsumeRuleConfigController extends BaseController { * @param recommendParam 消费赠送参数 * @return AjaxResult */ - @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "消费赠送") @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java index b19c5675..3a36d6f9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java @@ -111,7 +111,7 @@ public class AcMemberConsumeRuleController extends BaseController { * @param memberConsumeRuleVo 会员消费赠送参数 * @return AjaxResult */ - @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "会员消费赠送") @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) { memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java index bcf7ce39..2fd67f2f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java @@ -118,6 +118,7 @@ public class AcDrawRewardRecordController extends BaseController { * 充值已购买次数按钮 (审批) */ @PostMapping("/purchased-times") + @Log(module = EOperationModule.DRAW_PURCHASED,business = EOperationBusiness.DRAW_PURCHASED,method = EOperationMethod.INSERT,remark = "充值已购买次数") public AjaxResult purchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) { Integer pkCountry = SecurityUtils.getPkCountry(); if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) { @@ -145,6 +146,7 @@ public class AcDrawRewardRecordController extends BaseController { * 充值未购买次数 (走审批) */ @PostMapping("/unpurchased-times") + @Log(module = EOperationModule.DRAW_UNPURCHASED,business = EOperationBusiness.DRAW_UNPURCHASED,method = EOperationMethod.INSERT,remark = "充值未购买次数") public AjaxResult unpurchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) { Integer pkCountry = SecurityUtils.getPkCountry(); if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java index 6bac0df9..633f5207 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java @@ -163,7 +163,7 @@ public class WaresRuleConfigController extends BaseController { * @param recommendParam 商品赠送参数 * @return AjaxResult */ - @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "商品赠送") @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index 0892c8bd..5e361a04 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -302,6 +302,10 @@ public enum EOperationBusiness { DRAW_DETAIL("抽奖明细"), + DRAW_PURCHASED("充值已购买次数"), + + DRAW_UNPURCHASED("充值未购买次数"), + AC_RECOMMEEND_CONFIG("直推赠送"), AC_WARES_RULE_CONFIG("商品赠送"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index fe0ae054..edf9620f 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -206,6 +206,10 @@ public enum EOperationModule { DRAW_DETAIL("抽奖明细"), + DRAW_PURCHASED("充值已购买次数"), + + DRAW_UNPURCHASED("充值未购买次数"), + RECOMMEND_GIVE("直推赠送"), BENEFITS_GIVE("权益赠送"), BENEFITS_GIVE_LOG("权益赠送记录"),