From 8e5bcf2d7601afd988ef6802985a3d0d287a638c Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 17 Sep 2025 11:59:24 +0800 Subject: [PATCH] =?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