From 46edfadd29ba72e88b5154f87ba1947c223c3f84 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 14 Oct 2025 10:32:46 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/AcDeclarationGiftConfigController.java | 10 +++++++--- .../declaration/param/AcDeclarationConfigParam.java | 2 +- .../declaration/param/AcDeclarationParam.java | 7 +------ .../declaration/param/AcDeclarationPkIdParam.java | 12 ++++++++++++ .../impl/AcDeclarationGiftConfigServiceImpl.java | 4 ++-- .../impl/AcDeclarationGiftRecordServiceImpl.java | 8 +++++++- .../declaration/vo/AcDeclarationGiftConfig.java | 4 ++-- .../activity/declaration/vo/AcDeclarationListVO.java | 12 +++++++++++- .../declaration/AcDeclarationGiftRecordMapper.xml | 8 +++++--- 9 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationPkIdParam.java diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java index febafbbe..6efc7a5c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java @@ -5,6 +5,7 @@ import com.hzs.activity.base.param.QueryActivityParam; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.base.vo.BaseConfigVo; import com.hzs.activity.declaration.param.AcDeclarationParam; +import com.hzs.activity.declaration.param.AcDeclarationPkIdParam; import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.enums.EActType; @@ -83,13 +84,16 @@ public class AcDeclarationGiftConfigController extends BaseController { /** * * 报单赠送活动删除 - * @param pkId 报单赠送删除 + * @param acDeclarationPkIdParam 报单赠送删除 * @return AjaxResult */ @Log(module = EOperationModule.AC_DECLARATION_GIFT_DELETE, business = EOperationBusiness.AC_DECLARATION_GIFT_DELETE, method = EOperationMethod.DELETE, remark = "报单赠送删除") @PostMapping("/delete") - public AjaxResult declarationConfigDelete(@RequestBody Long pkId) { - String str = iAcDeclarationGiftConfigService.deleteConfig(pkId); + public AjaxResult declarationConfigDelete(@RequestBody AcDeclarationPkIdParam acDeclarationPkIdParam) { + if (acDeclarationPkIdParam.getPkId() == null) { + return AjaxResult.error(); + } + String str = iAcDeclarationGiftConfigService.deleteConfig(acDeclarationPkIdParam.getPkId()); if (str != null) { return AjaxResult.error(str); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationConfigParam.java index 7ef60951..6d1c5644 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationConfigParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationConfigParam.java @@ -42,7 +42,7 @@ public class AcDeclarationConfigParam { /** * 指定等级 */ - private Integer level; + private Integer specifyLevel; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java index 2e0cbf09..17fe8734 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationParam.java @@ -19,11 +19,6 @@ public class AcDeclarationParam { */ private Long pkBaseId; - /** - * 操作类型（1=新增,2=修改,3=删除） - */ - private Integer controlType; - /** * 国家 */ @@ -46,7 +41,7 @@ public class AcDeclarationParam { private ActivityParam activityParam; /** - * 加购升级信息 + * 报单赠送信息 */ private List acDeclarationConfigParams; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationPkIdParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationPkIdParam.java new file mode 100644 index 00000000..f5141a85 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationPkIdParam.java @@ -0,0 +1,12 @@ +package com.hzs.activity.declaration.param; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcDeclarationPkIdParam { + private Long pkId; +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java index 1cb9d127..989f811c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java @@ -124,7 +124,7 @@ public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl queryList(AcDeclarationListParam param) { - return baseMapper.queryList(param); + List acDeclarationListVOS = baseMapper.queryList(param); + acDeclarationListVOS.forEach(item->{ + // 将注册权限实际值注入 + item.setRegisterAuthorityVal(ERegistrationAuthority.getEnumByValue(item.getRegisterAuthority()).getLabel()); + }); + return acDeclarationListVOS; } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java index 99845ca2..373005bd 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java @@ -71,8 +71,8 @@ public class AcDeclarationGiftConfig extends BaseEntity { /** * 指定等级 */ - @TableField("LEVEL") - private Integer level; + @TableField("SPECIFY_LEVEL") + private Integer specifyLevel; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java index 964b566e..beba0c4f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationListVO.java @@ -29,6 +29,16 @@ public class AcDeclarationListVO { @Excel(name = "会员名称") private String memberName; + /** + * 注册权限 + */ + private Integer registerAuthority; + /** + * 注册权限实际值 + */ + @Excel(name = "注册权限") + private String registerAuthorityVal; + /** * 活动开始时间 @@ -61,5 +71,5 @@ public class AcDeclarationListVO { private Integer quantity; @Excel(name = "指定等级") - private String levelVal; + private String specifyLevelVal; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml index 295b6c74..a670f477 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml @@ -28,22 +28,24 @@ PK_COUNTRY, PK_ID, PK_BASE_ID, PK_RULE_ID, PK_MEMBER, PK_PRODUCT, QUANTITY - SELECT abc.ACT_NAME, cm.member_code, cm.member_name, - BG.GRADE_NAME AS levelVal, + adgc.REGISTER_AUTHORITY + BG.GRADE_NAME AS specifyLevelVal, abc.ACT_START_DATE, abc.ACT_END_DATE, bp.PRODUCT_NAME, adgr.* FROM AC_DECLARATION_GIFT_RECORD adgr + LEFT JOIN AC_DECLARATION_GIFT_CONFIG adgc ON adgr.PK_RULE_ID = adgc.PK_ID LEFT JOIN BD_PRODUCT bp ON adgr.PK_PRODUCT = bp.PK_ID LEFT JOIN AC_BASE_CONFIG abc ON adgr.PK_BASE_ID = abc.PK_ID LEFT JOIN CU_MEMBER cm ON adgr.PK_MEMBER = cm.PK_ID - LEFT JOIN BD_GRADE BG ON adgr.LEVEL = BG.PK_ID + LEFT JOIN BD_GRADE BG ON adgr.SPECIFY_LEVEL = BG.PK_ID WHERE adgr.DEL_FLAG = 0