## 报单赠送

## 加购升级功能,报单赠送功能
2025-10-14 10:33:46 +08:00 · 2025-10-14 10:33:45 +08:00 · 2025-10-14 10:33:45 +08:00 · 2025-10-14 10:33:44 +08:00
45 changed files with 2302 additions and 14 deletions
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java
@ -0,0 +1,94 @@
+package com.hzs.activity.add.controller.manage;
+
+
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.param.AcAddUpgradeParam;
+import com.hzs.activity.add.service.IAcAddUpgradeConfigService;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.activity.base.param.QueryActivityParam;
+import com.hzs.activity.base.service.IActivityService;
+import com.hzs.activity.base.vo.BaseConfigVo;
+import com.hzs.common.core.annotation.Log;
+import com.hzs.common.core.enums.EActType;
+import com.hzs.common.core.enums.EOperationBusiness;
+import com.hzs.common.core.enums.EOperationMethod;
+import com.hzs.common.core.enums.EOperationModule;
+import com.hzs.common.core.utils.poi.ExcelUtil;
+import com.hzs.common.core.web.controller.BaseController;
+import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.core.web.page.TableDataInfo;
+import com.hzs.common.security.service.UserTokenService;
+import com.hzs.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+import static com.hzs.common.core.utils.PageUtils.startPage;
+
+/**
+ * <p>
+ * 加购升级配置表 前端控制器
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@RestController
+@RequestMapping("/manage/addUpgradeConfig")
+public class AcAddUpgradeConfigController extends BaseController {
+
+    @Autowired
+    private UserTokenService userTokenService;
+
+    @Autowired
+    private IAcAddUpgradeConfigService  iAcAddUpgradeConfigService;
+
+    @Autowired
+    private IActivityService iActivityService;
+    /**
+     * 加购升级活动操作
+     *
+     * @param acAddUpgradeParam 加购升级活动
+     * @return AjaxResult
+     */
+    @Log(module = EOperationModule.AC_ADD_UPGRADE_SUBMIT, business = EOperationBusiness.AC_ADD_UPGRADE_SUBMIT, method = EOperationMethod.INSERT, remark = "加购活动")
+    @PostMapping("/submit")
+    public AjaxResult onLinePetition(@RequestBody AcAddUpgradeParam acAddUpgradeParam) {
+        acAddUpgradeParam.setPkCountry(SecurityUtils.getPkCountry());
+        acAddUpgradeParam.setPkMember(SecurityUtils.getUserId());
+        acAddUpgradeParam.setLoginUser(userTokenService.getLoginUser());
+        String str = iAcAddUpgradeConfigService.onLinePetition(acAddUpgradeParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 加购升级活动操作
+     *
+     * @param pkId 加购升级活动
+     * @return AjaxResult
+     */
+    @Log(module = EOperationModule.AC_ADD_UPGRADE_DETAIL, business = EOperationBusiness.AC_ADD_UPGRADE_DETAIL, method = EOperationMethod.SELECT, remark = "加购升级详情")
+    @GetMapping("/get-detail")
+    public AjaxResult getDetail(Integer pkId) {
+        return iAcAddUpgradeConfigService.getDetail(pkId);
+    }
+
+    /**
+     * 加购升级导出
+     */
+    @Log(module = EOperationModule.AC_ADD_UPGRADE_EXPORT, business = EOperationBusiness.AC_ADD_UPGRADE_DETAIL, method = EOperationMethod.EXPORT, remark = "加购升级导出")
+    @PostMapping("/export")
+    public void export(QueryActivityParam queryActivityParam, HttpServletResponse response) {
+        queryActivityParam.setActType(EActType.ADD_UPGRADE.getValue());
+        queryActivityParam.setPkCountry(SecurityUtils.getPkCountry());
+        List<BaseConfigVo> resultList = iActivityService.activityList(queryActivityParam);
+        ExcelUtil<BaseConfigVo> util = new ExcelUtil<>(BaseConfigVo.class);
+        util.exportExcel(response, resultList, "加购升级导出");
+    }
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java
@ -0,0 +1,60 @@
+package com.hzs.activity.add.controller.manage;
+
+
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.service.IAcAddUpgradeConfigService;
+import com.hzs.activity.add.service.IAcAddUpgradeRecordService;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.common.core.annotation.Log;
+import com.hzs.common.core.enums.EOperationBusiness;
+import com.hzs.common.core.enums.EOperationMethod;
+import com.hzs.common.core.enums.EOperationModule;
+import com.hzs.common.core.utils.poi.ExcelUtil;
+import com.hzs.common.core.web.controller.BaseController;
+import com.hzs.common.core.web.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * <p>
+ * 加购活动明细表 前端控制器
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@RestController
+@RequestMapping("/manage/addUpgradeRecord")
+public class AcAddUpgradeRecordController extends BaseController {
+
+    @Autowired
+    private IAcAddUpgradeRecordService acAddUpgradeRecordService;
+    /**
+     *
+     * @param param
+     * @return
+     */
+    @Log(module = EOperationModule.AC_ADD_UPGRADE_LIST, business = EOperationBusiness.AC_ADD_UPGRADE_LIST, method = EOperationMethod.SELECT)
+    @GetMapping("/list")
+    public TableDataInfo directPushUpgradeList(AcAddUpgradeListParam param) {
+        startPage();
+        return getDataTable(acAddUpgradeRecordService.queryList(param));
+    }
+
+    @Log(module = EOperationModule.AC_ADD_UPGRADE_LIST_EXPORT, business = EOperationBusiness.AC_ADD_UPGRADE_LIST_EXPORT, method = EOperationMethod.SELECT)
+    @PostMapping("/listExport")
+    public void export(AcAddUpgradeListParam param, HttpServletResponse response) {
+        startPage();
+        List<AcAddUpgradeListVO> list = acAddUpgradeRecordService.queryList(param);
+        ExcelUtil<AcAddUpgradeListVO> util = new ExcelUtil<>(AcAddUpgradeListVO.class);
+        util.exportExcel(response, list, "加购升级数据导出");
+    }
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java
@ -0,0 +1,28 @@
+package com.hzs.activity.add.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam;
+import com.hzs.activity.add.vo.AcAddUpgradeConfig;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 加购升级配置表 Mapper 接口
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcAddUpgradeConfigMapper extends BaseMapper<AcAddUpgradeConfig> {
+
+    List<AcAddUpgradeRuleConfigParam> selectListByOrderType(@Param("pkId") Integer pkId,
+                                                            @Param("orderType") Integer orderType);
+
+    List<Integer> selectOrderTypeByBaseId(@Param("pkId") Integer pkId);
+
+    List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param);
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java
@ -0,0 +1,21 @@
+package com.hzs.activity.add.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.activity.add.vo.AcAddUpgradeRecord;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 加购活动明细表 Mapper 接口
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcAddUpgradeRecordMapper extends BaseMapper<AcAddUpgradeRecord> {
+
+    List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param);
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeConfigParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeConfigParam.java
@ -0,0 +1,19 @@
+package com.hzs.activity.add.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcAddUpgradeConfigParam {
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+
+    private List<AcAddUpgradeRuleConfigParam> acAddUpgradeRuleConfigParams;
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeDetailParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeDetailParam.java
@ -0,0 +1,123 @@
+package com.hzs.activity.add.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcAddUpgradeDetailParam implements Serializable {
+
+    private static final long serialVersionUID = 5874438017657659289L;
+    /**
+     * 活动主键
+     */
+    private Long pkId;
+    /**
+     * 基础主键
+     */
+    private Long pkBaseId;
+
+    /**
+     * 业务单号
+     */
+    private String businessCode;
+
+    /**
+     * 活动名称
+     */
+    private String actName;
+
+    /**
+     * 活动类型
+     */
+    private Integer actType;
+
+    /**
+     * 活动说明
+     */
+    private String actExplain;
+
+    /**
+     * 活动开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actStartDate;
+
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actEndDate;
+
+
+    /**
+     * 显示开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date disStartDate;
+
+    /**
+     * 显示结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date disEndDate;
+    /**
+     * 活动封面图
+     */
+    private String actCover;
+
+    /**
+     * 国家
+     */
+    private Integer pkCountry;
+
+    /**
+     * 会员ID
+     */
+    private Long pkCreator;
+
+    /**
+     * 活动模块
+     */
+    private List<Integer> atcModuleList;
+
+
+    /**
+     * 活动模块
+     */
+    private Integer atcModule;
+
+
+    /**
+     * 加购升级参数
+     */
+    private List<AcAddUpgradeConfigParam> acAddUpgradeConfigParams;
+
+    /**
+     * 目标群体配置列表
+     */
+    private List<AcGoalMemberConfig> goalMemberConfigList;
+
+    /**
+     * 是否强制弹框 0 是  1 否
+     */
+    private Integer isStrongAlert;
+
+    /**
+     * 提货天数
+     */
+    private Integer deliveryDays;
+
+    /**
+     * 时间参数
+     */
+    private String startDate;
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeListParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeListParam.java
@ -0,0 +1,42 @@
+package com.hzs.activity.add.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcAddUpgradeListParam {
+
+    /**
+     * 活动名称
+     */
+    private String actName;
+
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+
+
+    /**
+     * 开始活动开始时间
+     */
+    private String startActStartDate;
+
+    /**
+     * 开始活动结束时间
+     */
+    private String startActEndDate;
+
+    /**
+     * 结束活动开始时间
+     */
+    private String endActStartDate;
+
+    /**
+     * 结束活动结束时间
+     */
+    private String endActEndDate;
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeParam.java
@ -0,0 +1,58 @@
+package com.hzs.activity.add.param;
+
+
+import com.hzs.activity.base.param.ActivityParam;
+import com.hzs.common.domain.activity.base.AcBaseAuthority;
+import com.hzs.system.sys.dto.LoginUser;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 加购升级参数
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcAddUpgradeParam implements Serializable {
+    /**
+     * 活动基本配置主键
+     */
+    private Long pkBaseId;
+
+    /**
+     * 操作类型（1=新增,2=修改,3=删除）
+     */
+    private Integer controlType;
+
+    /**
+     * 国家
+     */
+    private Integer pkCountry;
+
+    /**
+     * 会员ID
+     */
+    private Long pkMember;
+
+
+    /**
+     * 登录用户信息
+     */
+    private LoginUser loginUser;
+
+    /**
+     * 基本信息
+     */
+    private ActivityParam activityParam;
+
+    /**
+     * 加购升级信息
+     */
+    private List<AcAddUpgradeConfigParam> acAddUpgradeConfigParam;
+
+}
+
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeRuleConfigParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/param/AcAddUpgradeRuleConfigParam.java
@ -0,0 +1,43 @@
+package com.hzs.activity.add.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcAddUpgradeRuleConfigParam  {
+    /**
+     * 订单类型 来源于枚举：所属专区
+     */
+    private Integer orderType;
+
+    /**
+     * 商品主键
+     */
+    private Integer pkWares;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 原等级
+     */
+    private Integer originalLevel;
+    /**
+     * 原等级实际值
+     */
+    private String originalLevelVal;
+    /**
+     * 升级等级
+     */
+    private Integer upgradeLevel;
+    /**
+     * 升级等级实际值
+     */
+    private String upgradeLevelVal;
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java
@ -0,0 +1,25 @@
+package com.hzs.activity.add.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.param.AcAddUpgradeParam;
+import com.hzs.activity.add.vo.AcAddUpgradeConfig;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.common.core.web.domain.AjaxResult;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 加购升级配置表 服务类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcAddUpgradeConfigService extends IService<AcAddUpgradeConfig> {
+
+    String onLinePetition(AcAddUpgradeParam acAddUpgradeParam);
+
+    AjaxResult getDetail(Integer pkId);
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java
@ -0,0 +1,21 @@
+package com.hzs.activity.add.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.activity.add.vo.AcAddUpgradeRecord;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 加购活动明细表 服务类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcAddUpgradeRecordService extends IService<AcAddUpgradeRecord> {
+
+    List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param);
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
@ -0,0 +1,177 @@
+package com.hzs.activity.add.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper;
+import com.hzs.activity.add.param.*;
+import com.hzs.activity.add.service.IAcAddUpgradeConfigService;
+import com.hzs.activity.add.vo.AcAddUpgradeConfig;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.activity.base.param.ActivityParam;
+import com.hzs.activity.base.service.IAcBaseConfigService;
+import com.hzs.activity.base.service.IAcGoalMemberConfigService;
+import com.hzs.activity.base.service.IActivityService;
+import com.hzs.common.core.enums.EActType;
+import com.hzs.common.core.enums.EApprovalBusiness;
+import com.hzs.common.core.enums.EControlType;
+import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.domain.activity.base.AcBaseConfig;
+import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
+import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 加购升级配置表 服务实现类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+@Slf4j
+public class AcAddUpgradeConfigServiceImpl extends ServiceImpl<AcAddUpgradeConfigMapper, AcAddUpgradeConfig> implements IAcAddUpgradeConfigService {
+
+    @Autowired
+    private IActivityService iActivityService;
+
+    @Autowired
+    private IAcBaseConfigService baseConfigService;
+
+    @Autowired
+    private IAcGoalMemberConfigService iAcGoalMemberConfigService;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String onLinePetition(AcAddUpgradeParam acAddUpgradeParam) {
+        log.info("加购升级入参{}", acAddUpgradeParam);
+        EApprovalBusiness approvalBusiness = null;
+        if (acAddUpgradeParam.getControlType() == EControlType.SAVE.getValue()) {
+            approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_ADD;
+        } else if (acAddUpgradeParam.getControlType() == EControlType.MODIFY.getValue()) {
+            approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_UPDATE;
+        } else if (acAddUpgradeParam.getControlType() == EControlType.DELETE.getValue()) {
+            approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_REMOVE;
+        }
+
+        LoginUser loginUser = acAddUpgradeParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (acAddUpgradeParam.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = acAddUpgradeParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.ADD_UPGRADE.getValue());
+            // 新增活动基本配置
+            AcBaseConfig acBaseConfig = iActivityService.saveBaseConfig(activityParam);
+            // 新增加购活动配置
+            saveAddUpgradeConfig(acAddUpgradeParam.getAcAddUpgradeConfigParam(),acBaseConfig);
+        } else if (acAddUpgradeParam.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = acAddUpgradeParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.ADD_UPGRADE.getValue());
+            updateAddUpgradeConfig(activityParam, acAddUpgradeParam.getAcAddUpgradeConfigParam());
+        } else if (acAddUpgradeParam.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = acAddUpgradeParam.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            removeAddUpgradeConfig(pkId);
+        }
+        //日志
+        ActivityParam activityParam = acAddUpgradeParam.getActivityParam();
+        activityParam.setPkCountry(SecurityUtils.getPkCountry());
+        activityParam.setPkCreator(SecurityUtils.getUserId());
+        activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
+        activityParam.setBusinessCode(acAddUpgradeParam.getActivityParam().getBusinessCode());
+        iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
+        return null;
+    }
+
+    @Override
+    public AjaxResult getDetail(Integer pkId) {
+        AcBaseConfig baseConfig = baseConfigService.getById(pkId);
+        AcAddUpgradeDetailParam activityParam = BeanUtil.copyProperties(baseConfig, AcAddUpgradeDetailParam.class);
+
+        List<Integer> orderTypes = baseMapper.selectOrderTypeByBaseId(pkId);
+        List<AcAddUpgradeConfigParam> list = new ArrayList<>();
+        // 组装加购活动详情
+        for (Integer orderType : orderTypes) {
+            // 根据活动类型查询活动类型集合
+            List<AcAddUpgradeRuleConfigParam> acAddUpgradeRuleConfigParams = baseMapper.selectListByOrderType(pkId, orderType);
+            list.add(new AcAddUpgradeConfigParam(orderType, acAddUpgradeRuleConfigParams));
+        }
+
+        List<AcGoalMemberConfig> goalMemberConfigList = iAcGoalMemberConfigService.list(new LambdaQueryWrapper<AcGoalMemberConfig>()
+                .eq(AcGoalMemberConfig::getPkBaseId, baseConfig.getPkId()));
+        activityParam.setAcAddUpgradeConfigParams(list);
+        activityParam.setGoalMemberConfigList(goalMemberConfigList);
+        activityParam.setPkBaseId(baseConfig.getPkId());
+        return AjaxResult.success(activityParam);
+    }
+
+
+    private void removeAddUpgradeConfig(Long pkId) {
+        // 删除活动基本配置
+        baseConfigService.removeById(pkId);
+        // 删除加购活动配置
+        baseMapper.delete(new LambdaQueryWrapper<AcAddUpgradeConfig>()
+                .eq(AcAddUpgradeConfig::getPkBaseId, pkId));
+    }
+
+    private void updateAddUpgradeConfig(ActivityParam activityParam, List<AcAddUpgradeConfigParam> acAddUpgradeConfigParam) {
+        {
+            Long pkId = activityParam.getPkId();
+            // 查询基础信息
+            AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class);
+            baseConfig.setPkId(activityParam.getPkId());
+            baseConfigService.updateById(baseConfig);
+
+            // 删除活动配置
+            baseMapper.delete(new LambdaQueryWrapper<AcAddUpgradeConfig>()
+                    .eq(AcAddUpgradeConfig::getPkBaseId, pkId));
+            // 添加加购活动配置
+            saveAddUpgradeConfig(acAddUpgradeConfigParam,baseConfig);
+        }
+    }
+
+    private void saveAddUpgradeConfig(List<AcAddUpgradeConfigParam> acAddUpgradeConfigParam,AcBaseConfig acBaseConfig) {
+        acAddUpgradeConfigParam.forEach(item -> {
+            List<AcAddUpgradeRuleConfigParam> acAddUpgradeRuleConfigParams = item.getAcAddUpgradeRuleConfigParams();
+            if (acAddUpgradeRuleConfigParams != null) {
+                acAddUpgradeRuleConfigParams.forEach(ac -> {
+                    // 校验升级等级是否小于原等级
+                    if (ac.getUpgradeLevel() < ac.getOriginalLevel()) {
+                        throw new IllegalArgumentException(
+                                String.format("原等级 [%d] 大于升级等级 [%d]，不允许插入！",
+                                        ac.getOriginalLevel(), ac.getUpgradeLevel())
+                        );
+                    }
+                    AcAddUpgradeConfig build = AcAddUpgradeConfig.builder()
+                            .pkBaseId(acBaseConfig.getPkId())
+                            .orderType(item.getOrderType())
+                            .pkWares(ac.getPkWares())
+                            .quantity(ac.getQuantity())
+                            .originalLevel(ac.getOriginalLevel())
+                            .upgradeLevel(ac.getUpgradeLevel())
+                            .build();
+                    build.setPkCountry(acBaseConfig.getPkCountry());
+                    build.setCreationTime(acBaseConfig.getCreationTime());
+                    build.setPkCreator(acBaseConfig.getPkCreator());
+                    build.setDelFlag(0);
+                    baseMapper.insert(build);
+                });
+            }
+
+        });
+    }
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java
@ -0,0 +1,29 @@
+package com.hzs.activity.add.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.service.IAcAddUpgradeRecordService;
+import com.hzs.activity.add.vo.AcAddUpgradeListVO;
+import com.hzs.activity.add.vo.AcAddUpgradeRecord;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ * 加购活动明细表 服务实现类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+public class AcAddUpgradeRecordServiceImpl extends ServiceImpl<AcAddUpgradeRecordMapper, AcAddUpgradeRecord> implements IAcAddUpgradeRecordService {
+
+    @Override
+    public List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param) {
+        return baseMapper.queryList(param);
+    }
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java
@ -0,0 +1,74 @@
+package com.hzs.activity.add.vo;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hzs.common.core.web.domain.BaseEntity;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 加购升级配置表
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("AC_ADD_UPGRADE_CONFIG")
+@KeySequence("AC_ADD_UPGRADE_CONFIG_SEQ")
+@Builder
+public class AcAddUpgradeConfig extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("PK_ID")
+    private Long pkId;
+
+    /**
+     * 活动基本配置主键
+     */
+    @TableField("PK_BASE_ID")
+    private Long pkBaseId;
+
+    /**
+     * 订单类型 来源于枚举：所属专区
+     */
+    @TableField("ORDER_TYPE")
+    private Integer orderType;
+
+    /**
+     * 商品主键
+     */
+    @TableField("PK_WARES")
+    private Integer pkWares;
+
+    /**
+     * 数量
+     */
+    @TableField("QUANTITY")
+    private Integer quantity;
+
+    /**
+     * 原等级
+     */
+    @TableField("ORIGINAL_LEVEL")
+    private Integer originalLevel;
+
+    /**
+     * 升级等级
+     */
+    @TableField("UPGRADE_LEVEL")
+    private Integer upgradeLevel;
+
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java
@ -0,0 +1,66 @@
+package com.hzs.activity.add.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hzs.common.core.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcAddUpgradeListVO {
+
+    /**
+     * 活动名称
+     */
+    @Excel(name = "活动名称")
+    private String actName;
+    /**
+     * 会员编号
+     */
+    @Excel(name = "会员编号")
+    private String memberCode;
+    /**
+     * 会员名称
+     */
+    @Excel(name = "会员名称")
+    private String memberName;
+
+    /**
+     * 原等级实际值
+     */
+    @Excel(name = "原等级")
+    private String originalLevelVal;
+
+    /**
+     * 升级等级实际值
+     */
+    @Excel(name = "新等级")
+    private String upgradeLevelVal;
+
+    /**
+     * 活动开始时间
+     */
+    @Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actStartDate;
+
+    /**
+     * 活动结束时间
+     */
+    @Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actEndDate;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date creationTime;
+
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java
@ -0,0 +1,72 @@
+package com.hzs.activity.add.vo;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hzs.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 加购活动明细表
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("AC_ADD_UPGRADE_RECORD")
+@KeySequence("AC_ADD_UPGRADE_RECORD_SEQ")
+public class AcAddUpgradeRecord extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("PK_ID")
+    private Long pkId;
+
+    /**
+     * 活动基本配置主键
+     */
+    @TableField("PK_BASE_ID")
+    private Long pkBaseId;
+
+    /**
+     * 规则主键
+     */
+    @TableField("PK_RULE_ID")
+    private Long pkRuleId;
+
+    /**
+     * 会员ID
+     */
+    @TableField("PK_MEMBER")
+    private Long pkMember;
+
+    /**
+     * 原等级
+     */
+    @TableField("PK_ORIGIN_GRADE")
+    private Integer pkOriginGrade;
+
+    /**
+     * 升级后等级
+     */
+    @TableField("PK_UPGRADE_GRADE")
+    private Integer pkUpgradeGrade;
+
+    /**
+     * 订单ID
+     */
+    @TableField("PK_ORDER_ID")
+    private Long pkOrderId;
+
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/vo/BaseConfigVo.java
@ -48,27 +48,27 @@ public class BaseConfigVo implements Serializable {
    /**
     * 活动开始时间
     */
-    @Excel(name = "开始日期", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始日期", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date actStartDate;

    /**
     * 活动结束时间
     */
-    @Excel(name = "结束日期", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "结束日期", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date actEndDate;

    /**
     * 显示开始时间
     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date disStartDate;

    /**
     * 显示结束时间
     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date disEndDate;

    /**
@ -93,8 +93,8 @@ public class BaseConfigVo implements Serializable {
    /**
     * 创建时间
     */
-    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date creationTime;
    /**
     * 目标群体配置列表
--- 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
@ -0,0 +1,128 @@
+package com.hzs.activity.declaration.controller.manage;
+
+
+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;
+import com.hzs.common.core.enums.EOperationBusiness;
+import com.hzs.common.core.enums.EOperationMethod;
+import com.hzs.common.core.enums.EOperationModule;
+import com.hzs.common.core.utils.poi.ExcelUtil;
+import com.hzs.common.core.web.controller.BaseController;
+import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.security.service.UserTokenService;
+import com.hzs.common.security.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@RestController
+@RequestMapping("/manage/acDeclarationConfig")
+public class AcDeclarationGiftConfigController extends BaseController {
+
+    @Autowired
+    private UserTokenService userTokenService;
+
+    @Autowired
+    private IActivityService iActivityService;
+
+    @Autowired
+    private IAcDeclarationGiftConfigService iAcDeclarationGiftConfigService;
+    /**
+     *
+     * 报单赠送活动操作
+     * @param acDeclarationParam 报单赠送活动
+     * @return AjaxResult
+     */
+    @Log(module = EOperationModule.AC_DECLARATION_GIFT_SAVE, business = EOperationBusiness.AC_DECLARATION_GIFT_SAVE, method = EOperationMethod.INSERT, remark = "报单赠送添加")
+    @PostMapping("/save")
+    public AjaxResult declarationConfigSave(@RequestBody AcDeclarationParam acDeclarationParam) {
+        acDeclarationParam.setPkCountry(SecurityUtils.getPkCountry());
+        acDeclarationParam.setPkMember(SecurityUtils.getUserId());
+        acDeclarationParam.setLoginUser(userTokenService.getLoginUser());
+        String str = iAcDeclarationGiftConfigService.saveConfig(acDeclarationParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
+    }
+    /**
+     *
+     * 报单赠送活动更新
+     * @param acDeclarationParam 报单赠送更新
+     * @return AjaxResult
+     */
+    @Log(module = EOperationModule.AC_DECLARATION_GIFT_UPDATE, business = EOperationBusiness.AC_DECLARATION_GIFT_UPDATE, method = EOperationMethod.UPDATE, remark = "报单赠送修改")
+    @PostMapping("/update")
+    public AjaxResult declarationConfigUpdate(@RequestBody AcDeclarationParam acDeclarationParam) {
+        acDeclarationParam.setPkCountry(SecurityUtils.getPkCountry());
+        acDeclarationParam.setPkMember(SecurityUtils.getUserId());
+        acDeclarationParam.setLoginUser(userTokenService.getLoginUser());
+        String str = iAcDeclarationGiftConfigService.updateConfig(acDeclarationParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
+    }
+
+
+    /**
+     *
+     * 报单赠送活动删除
+     * @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 AcDeclarationPkIdParam acDeclarationPkIdParam) {
+        if (acDeclarationPkIdParam.getPkId() == null) {
+            return AjaxResult.error();
+        }
+        String str = iAcDeclarationGiftConfigService.deleteConfig(acDeclarationPkIdParam.getPkId());
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 报单赠送活动详情
+     *
+     * @param pkId 报单赠送活动详情
+     * @return AjaxResult
+     */
+    @Log(module = EOperationModule.AC_DECLARATION_GIFT_DETAIL, business = EOperationBusiness.AC_DECLARATION_GIFT_DETAIL, method = EOperationMethod.SELECT, remark = "加购升级详情")
+    @GetMapping("/get-detail")
+    public AjaxResult getDetail(Integer pkId) {
+        return iAcDeclarationGiftConfigService.getDetail(pkId);
+    }
+
+    /**
+     * 报单赠送导出
+     */
+    @Log(module = EOperationModule.AC_DECLARATION_GIFT_EXPORT, business = EOperationBusiness.AC_DECLARATION_GIFT_DETAIL, method = EOperationMethod.EXPORT, remark = "加购升级导出")
+    @PostMapping("/export")
+    public void export(QueryActivityParam queryActivityParam, HttpServletResponse response) {
+        queryActivityParam.setActType(EActType.DECLARATION_GIFT.getValue());
+        queryActivityParam.setPkCountry(SecurityUtils.getPkCountry());
+        List<BaseConfigVo> resultList = iActivityService.activityList(queryActivityParam);
+        ExcelUtil<BaseConfigVo> util = new ExcelUtil<>(BaseConfigVo.class);
+        util.exportExcel(response, resultList, "报单赠送导出");
+    }
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java
@ -0,0 +1,59 @@
+package com.hzs.activity.declaration.controller.manage;
+
+
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.declaration.param.AcDeclarationListParam;
+import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService;
+import com.hzs.activity.declaration.vo.AcDeclarationListVO;
+import com.hzs.common.core.annotation.Log;
+import com.hzs.common.core.enums.EOperationBusiness;
+import com.hzs.common.core.enums.EOperationMethod;
+import com.hzs.common.core.enums.EOperationModule;
+import com.hzs.common.core.utils.poi.ExcelUtil;
+import com.hzs.common.core.web.controller.BaseController;
+import com.hzs.common.core.web.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * <p>
+ * 报单赠品明细表 前端控制器
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@RestController
+@RequestMapping("/manage/acDeclarationRecord")
+public class AcDeclarationGiftRecordController extends BaseController {
+
+    @Autowired
+    private IAcDeclarationGiftRecordService acDeclarationGiftRecordService;
+    /**
+     *
+     * @param param
+     * @return
+     */
+    @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST, method = EOperationMethod.SELECT)
+    @GetMapping("/list")
+    public TableDataInfo directPushUpgradeList(AcDeclarationListParam param) {
+        startPage();
+        return getDataTable(acDeclarationGiftRecordService.queryList(param));
+    }
+
+    @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST_EXPORT, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST_EXPORT, method = EOperationMethod.SELECT)
+    @PostMapping("/listExport")
+    public void export(AcDeclarationListParam param, HttpServletResponse response) {
+        startPage();
+        List<AcDeclarationListVO> list = acDeclarationGiftRecordService.queryList(param);
+        ExcelUtil<AcDeclarationListVO> util = new ExcelUtil<>(AcDeclarationListVO.class);
+        util.exportExcel(response, list, "报单赠送数据导出");
+    }
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java
@ -0,0 +1,16 @@
+package com.hzs.activity.declaration.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcDeclarationGiftConfigMapper extends BaseMapper<AcDeclarationGiftConfig> {
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java
@ -0,0 +1,22 @@
+package com.hzs.activity.declaration.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.declaration.param.AcDeclarationListParam;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
+import com.hzs.activity.declaration.vo.AcDeclarationListVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报单赠品明细表 Mapper 接口
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcDeclarationGiftRecordMapper extends BaseMapper<AcDeclarationGiftRecord> {
+
+    List<AcDeclarationListVO> queryList(AcDeclarationListParam param);
+}
--- 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
@ -0,0 +1,49 @@
+package com.hzs.activity.declaration.param;
+
+
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcDeclarationConfigParam {
+
+
+    /**
+     * 报单等级
+     */
+    private Integer registerAuthority;
+
+    /**
+     * 产品主键
+     */
+    private Integer pkProduct;
+
+    /**
+     * 产品规格（逗号分隔）
+     */
+    private String specsName;
+
+    /**
+     * 产品规格id（逗号分隔）
+     */
+    private String specsNameId;
+
+    /**
+     * 数量
+     */
+    private Long quantity;
+
+    /**
+     * 指定等级
+     */
+    private Integer specifyLevel;
+
+
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationDetailParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationDetailParam.java
@ -0,0 +1,125 @@
+package com.hzs.activity.declaration.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hzs.activity.add.param.AcAddUpgradeConfigParam;
+import com.hzs.common.domain.activity.base.AcBaseConfig;
+import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcDeclarationDetailParam implements Serializable {
+
+    private static final long serialVersionUID = 5874438017657659289L;
+    /**
+     * 活动主键
+     */
+    private Long pkId;
+    /**
+     * 基础主键
+     */
+    private Long pkBaseId;
+
+    /**
+     * 业务单号
+     */
+    private String businessCode;
+
+    /**
+     * 活动名称
+     */
+    private String actName;
+
+    /**
+     * 活动类型
+     */
+    private Integer actType;
+
+    /**
+     * 活动说明
+     */
+    private String actExplain;
+
+    /**
+     * 活动开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actStartDate;
+
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actEndDate;
+
+
+    /**
+     * 显示开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date disStartDate;
+
+    /**
+     * 显示结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date disEndDate;
+    /**
+     * 活动封面图
+     */
+    private String actCover;
+
+    /**
+     * 国家
+     */
+    private Integer pkCountry;
+
+    /**
+     * 会员ID
+     */
+    private Long pkCreator;
+
+    /**
+     * 活动模块
+     */
+    private List<Integer> atcModuleList;
+
+
+    /**
+     * 活动模块
+     */
+    private Integer atcModule;
+
+
+    /**
+     * 报单赠送参数
+     */
+    private List<AcDeclarationConfigParam> acDeclarationConfigParams;
+
+    /**
+     * 目标群体配置列表
+     */
+    private List<AcGoalMemberConfig> goalMemberConfigList;
+
+    /**
+     * 是否强制弹框 0 是  1 否
+     */
+    private Integer isStrongAlert;
+
+    /**
+     * 提货天数
+     */
+    private Integer deliveryDays;
+
+    /**
+     * 时间参数
+     */
+    private String startDate;
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationListParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/param/AcDeclarationListParam.java
@ -0,0 +1,42 @@
+package com.hzs.activity.declaration.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcDeclarationListParam {
+
+    /**
+     * 活动名称
+     */
+    private String actName;
+
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+
+
+    /**
+     * 开始活动开始时间
+     */
+    private String startActStartDate;
+
+    /**
+     * 开始活动结束时间
+     */
+    private String startActEndDate;
+
+    /**
+     * 结束活动开始时间
+     */
+    private String endActStartDate;
+
+    /**
+     * 结束活动结束时间
+     */
+    private String endActEndDate;
+}
--- 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
@ -0,0 +1,49 @@
+package com.hzs.activity.declaration.param;
+
+
+import com.hzs.activity.base.param.ActivityParam;
+import com.hzs.common.domain.activity.base.AcBaseAuthority;
+import com.hzs.system.sys.dto.LoginUser;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcDeclarationParam {
+    /**
+     * 活动基本配置主键
+     */
+    private Long pkBaseId;
+
+    /**
+     * 国家
+     */
+    private Integer pkCountry;
+
+    /**
+     * 会员ID
+     */
+    private Long pkMember;
+
+
+    /**
+     * 登录用户信息
+     */
+    private LoginUser loginUser;
+
+    /**
+     * 基本信息
+     */
+    private ActivityParam activityParam;
+
+    /**
+     * 报单赠送信息
+     */
+    private List<AcDeclarationConfigParam> acDeclarationConfigParams;
+
+
+}
--- 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
@ -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;
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java
@ -0,0 +1,27 @@
+package com.hzs.activity.declaration.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.add.param.AcAddUpgradeParam;
+import com.hzs.activity.declaration.param.AcDeclarationParam;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig;
+import com.hzs.common.core.web.domain.AjaxResult;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcDeclarationGiftConfigService extends IService<AcDeclarationGiftConfig> {
+
+
+    AjaxResult getDetail(Integer pkId);
+
+    String saveConfig(AcDeclarationParam acDeclarationParam);
+
+    String updateConfig(AcDeclarationParam acDeclarationParam);
+
+    String deleteConfig(Long pkId);
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java
@ -0,0 +1,22 @@
+package com.hzs.activity.declaration.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.declaration.param.AcDeclarationListParam;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
+import com.hzs.activity.declaration.vo.AcDeclarationListVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 报单赠品明细表 服务类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcDeclarationGiftRecordService extends IService<AcDeclarationGiftRecord> {
+
+    List<AcDeclarationListVO> queryList(AcDeclarationListParam param);
+}
--- 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
@ -0,0 +1,175 @@
+package com.hzs.activity.declaration.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.hzs.activity.add.param.AcAddUpgradeConfigParam;
+import com.hzs.activity.add.param.AcAddUpgradeDetailParam;
+import com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam;
+import com.hzs.activity.add.vo.AcAddUpgradeConfig;
+import com.hzs.activity.base.param.ActivityParam;
+import com.hzs.activity.base.service.IAcBaseConfigService;
+import com.hzs.activity.base.service.IAcGoalMemberConfigService;
+import com.hzs.activity.base.service.IActivityService;
+import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper;
+import com.hzs.activity.declaration.param.AcDeclarationConfigParam;
+import com.hzs.activity.declaration.param.AcDeclarationDetailParam;
+import com.hzs.activity.declaration.param.AcDeclarationParam;
+import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig;
+import com.hzs.common.core.enums.EActType;
+import com.hzs.common.core.enums.EApprovalBusiness;
+import com.hzs.common.core.enums.EControlType;
+import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.domain.activity.base.AcBaseConfig;
+import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
+import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+@Slf4j
+public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl<AcDeclarationGiftConfigMapper, AcDeclarationGiftConfig> implements IAcDeclarationGiftConfigService {
+
+    @Autowired
+    private IActivityService iActivityService;
+
+    @Autowired
+    private IAcBaseConfigService baseConfigService;
+
+    @Autowired
+    private IAcGoalMemberConfigService iAcGoalMemberConfigService;
+
+    @Override
+    public AjaxResult getDetail(Integer pkId) {
+        AcBaseConfig baseConfig = baseConfigService.getById(pkId);
+        AcDeclarationDetailParam activityParam = BeanUtil.copyProperties(baseConfig, AcDeclarationDetailParam.class);
+
+        List<AcDeclarationGiftConfig> list = baseMapper.selectList(new LambdaQueryWrapper<AcDeclarationGiftConfig>()
+                .eq(AcDeclarationGiftConfig::getPkBaseId,pkId)
+                .eq(AcDeclarationGiftConfig::getDelFlag,0));
+        List<AcDeclarationConfigParam> collect = list.stream()
+                .map(i -> BeanUtil.copyProperties(i, AcDeclarationConfigParam.class))
+                .collect(Collectors.toList());
+
+        List<AcGoalMemberConfig> goalMemberConfigList = iAcGoalMemberConfigService.list(new LambdaQueryWrapper<AcGoalMemberConfig>()
+                .eq(AcGoalMemberConfig::getPkBaseId, baseConfig.getPkId()));
+        activityParam.setAcDeclarationConfigParams(collect);
+        activityParam.setGoalMemberConfigList(goalMemberConfigList);
+        activityParam.setPkBaseId(baseConfig.getPkId());
+        return AjaxResult.success(activityParam);
+    }
+
+    @Override
+    public String saveConfig(AcDeclarationParam acDeclarationParam) {
+        LoginUser loginUser = acDeclarationParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        ActivityParam activityParam = acDeclarationParam.getActivityParam();
+        activityParam.setPkCountry(loginUser.getDataCountry());
+        activityParam.setPkCreator(loginUser.getUserId());
+        activityParam.setActType(EActType.DECLARATION_GIFT.getValue());
+        // 新增活动基本配置
+        AcBaseConfig acBaseConfig = iActivityService.saveBaseConfig(activityParam);
+        // 新增加购活动配置
+        saveDeclarationConfig(acDeclarationParam.getAcDeclarationConfigParams(), acBaseConfig);
+        //日志
+        activityParam.setBusinessCode(acDeclarationParam.getActivityParam().getBusinessCode());
+        iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, EApprovalBusiness.AC_DECLARATION_GIFT_ADD.getValue(), false);
+        return null;
+    }
+
+    @Override
+    public String updateConfig(AcDeclarationParam acDeclarationParam) {
+        LoginUser loginUser = acDeclarationParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        ActivityParam activityParam = acDeclarationParam.getActivityParam();
+        activityParam.setPkCountry(loginUser.getDataCountry());
+        activityParam.setPkCreator(loginUser.getUserId());
+        activityParam.setActType(EActType.DECLARATION_GIFT.getValue());
+        updateDeclarationConfig(activityParam, acDeclarationParam.getAcDeclarationConfigParams());
+        iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, EApprovalBusiness.AC_DECLARATION_GIFT_UPDATE.getValue(), false);
+        return null;
+    }
+
+    @Override
+    public String deleteConfig(Long pkId) {
+        Long userId = SecurityUtils.getUserId();
+        if (userId == null) {
+            log.error("登录用户信息为空");
+            return "登录信息用户为空";
+        }
+        AcBaseConfig baseConfig = baseConfigService.getById(pkId);
+        ActivityParam activityParam = BeanUtil.copyProperties(baseConfig, ActivityParam.class);
+        removeDeclarationConfig(pkId);
+        iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, EApprovalBusiness.AC_DECLARATION_GIFT_REMOVE.getValue(), false);
+        return null;
+    }
+
+    private void removeDeclarationConfig(Long pkId) {
+        // 删除活动基本配置
+        baseConfigService.removeById(pkId);
+        // 删除加购活动配置
+        baseMapper.delete(new LambdaQueryWrapper<AcDeclarationGiftConfig>()
+                .eq(AcDeclarationGiftConfig::getPkBaseId, pkId));
+    }
+
+    private void updateDeclarationConfig(ActivityParam activityParam, List<AcDeclarationConfigParam> acDeclarationConfigParams) {
+        {
+            Long pkId = activityParam.getPkId();
+            // 查询基础信息
+            AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class);
+            baseConfig.setPkId(activityParam.getPkId());
+            baseConfigService.updateById(baseConfig);
+
+            // 删除活动配置
+            baseMapper.delete(new LambdaQueryWrapper<AcDeclarationGiftConfig>()
+                    .eq(AcDeclarationGiftConfig::getPkBaseId, pkId));
+            // 添加加购活动配置
+            saveDeclarationConfig(acDeclarationConfigParams,baseConfig);
+        }
+    }
+
+    private void saveDeclarationConfig(List<AcDeclarationConfigParam> acDeclarationConfigParams, AcBaseConfig acBaseConfig) {
+        acDeclarationConfigParams.forEach(item -> {
+            if (item != null) {
+                AcDeclarationGiftConfig build = AcDeclarationGiftConfig.builder()
+                        .pkBaseId(acBaseConfig.getPkId())
+                        .registerAuthority(item.getRegisterAuthority())
+                        .pkProduct(item.getPkProduct())
+                        .specsName(item.getSpecsName())
+                        .specsNameId(item.getSpecsNameId())
+                        .quantity(item.getQuantity())
+                        .specifyLevel(item.getSpecifyLevel())
+                        .build();
+                build.setPkCountry(acBaseConfig.getPkCountry());
+                build.setCreationTime(acBaseConfig.getCreationTime());
+                build.setPkCreator(acBaseConfig.getPkCreator());
+                build.setDelFlag(0);
+                baseMapper.insert(build);
+            }
+        });
+    }
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java
@ -0,0 +1,36 @@
+package com.hzs.activity.declaration.service.impl;
+
+import com.hzs.activity.add.param.AcAddUpgradeListParam;
+import com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper;
+import com.hzs.activity.declaration.param.AcDeclarationListParam;
+import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
+import com.hzs.activity.declaration.vo.AcDeclarationListVO;
+import com.hzs.common.core.enums.ERegistrationAuthority;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ * 报单赠品明细表 服务实现类
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+public class AcDeclarationGiftRecordServiceImpl extends ServiceImpl<AcDeclarationGiftRecordMapper, AcDeclarationGiftRecord> implements IAcDeclarationGiftRecordService {
+
+    @Override
+    public List<AcDeclarationListVO> queryList(AcDeclarationListParam param) {
+        List<AcDeclarationListVO> acDeclarationListVOS = baseMapper.queryList(param);
+        acDeclarationListVOS.forEach(item->{
+            // 将注册权限实际值注入
+            item.setRegisterAuthorityVal(ERegistrationAuthority.getEnumByValue(item.getRegisterAuthority()).getLabel());
+        });
+        return acDeclarationListVOS;
+    }
+}
--- 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
@ -0,0 +1,78 @@
+package com.hzs.activity.declaration.vo;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hzs.common.core.web.domain.BaseEntity;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("AC_DECLARATION_GIFT_CONFIG")
+@KeySequence("AC_DECLARATION_GIFT_CONFIG_SEQ")
+@Builder
+public class AcDeclarationGiftConfig extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("PK_ID")
+    private Long pkId;
+
+    /**
+     * 活动基本配置主键
+     */
+    @TableField("PK_BASE_ID")
+    private Long pkBaseId;
+
+    /**
+     * 注册权限（0=普通用户,1=报单中心,2=服务中心）
+     */
+    @TableField("REGISTER_AUTHORITY")
+    private Integer registerAuthority;
+
+    /**
+     * 产品主键
+     */
+    @TableField("PK_PRODUCT")
+    private Integer pkProduct;
+
+    /**
+     * 产品规格（逗号分隔）
+     */
+    @TableField("SPECS_NAME")
+    private String specsName;
+
+    /**
+     * 产品规格id（逗号分隔）
+     */
+    @TableField("SPECS_NAME_ID")
+    private String specsNameId;
+
+    /**
+     * 数量
+     */
+    @TableField("QUANTITY")
+    private Long quantity;
+
+    /**
+     * 指定等级
+     */
+    @TableField("SPECIFY_LEVEL")
+    private Integer specifyLevel;
+
+
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java
@ -0,0 +1,64 @@
+package com.hzs.activity.declaration.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hzs.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 报单赠品明细表
+ * </p>
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("AC_DECLARATION_GIFT_RECORD")
+public class AcDeclarationGiftRecord extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("PK_ID")
+    private Long pkId;
+
+    /**
+     * 活动基本配置主键
+     */
+    @TableField("PK_BASE_ID")
+    private Long pkBaseId;
+
+    /**
+     * 规则主键
+     */
+    @TableField("PK_RULE_ID")
+    private Long pkRuleId;
+
+    /**
+     * 会员ID
+     */
+    @TableField("PK_MEMBER")
+    private Long pkMember;
+
+    /**
+     * 赠品产品ID
+     */
+    @TableField("PK_PRODUCT")
+    private Integer pkProduct;
+
+    /**
+     * 赠品数量
+     */
+    @TableField("QUANTITY")
+    private Integer quantity;
+
+
+}
--- 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
@ -0,0 +1,75 @@
+package com.hzs.activity.declaration.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hzs.common.core.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcDeclarationListVO {
+
+    /**
+     * 活动名称
+     */
+    @Excel(name = "活动名称")
+    private String actName;
+    /**
+     * 会员编号
+     */
+    @Excel(name = "会员编号")
+    private String memberCode;
+    /**
+     * 会员名称
+     */
+    @Excel(name = "会员名称")
+    private String memberName;
+
+    /**
+     * 注册权限
+     */
+    private Integer registerAuthority;
+    /**
+     * 注册权限实际值
+     */
+    @Excel(name = "注册权限")
+    private String registerAuthorityVal;
+
+
+    /**
+     * 活动开始时间
+     */
+    @Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actStartDate;
+
+    /**
+     * 活动结束时间
+     */
+    @Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date actEndDate;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date creationTime;
+
+    /**
+     * 产品名称
+     */
+    @Excel(name = "产品名称")
+    private String productName;
+
+    @Excel(name = "数量")
+    private Integer quantity;
+
+    @Excel(name = "指定等级")
+    private String specifyLevelVal;
+}
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java
@ -253,4 +253,9 @@ public class ProductParams implements Serializable {
     */
    private String wmsCode;

+    /**
+     * 提货基数
+     */
+    private Integer deliveryQuantity;
+
 }
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hzs.activity.add.vo.AcAddUpgradeConfig">
+        <id column="PK_ID" property="pkId"/>
+        <result column="DEL_FLAG" property="delFlag"/>
+        <result column="CREATION_TIME" property="creationTime"/>
+        <result column="PK_CREATOR" property="pkCreator"/>
+        <result column="MODIFIED_TIME" property="modifiedTime"/>
+        <result column="PK_MODIFIED" property="pkModified"/>
+        <result column="PK_COUNTRY" property="pkCountry"/>
+        <result column="PK_BASE_ID" property="pkBaseId"/>
+        <result column="ORDER_TYPE" property="orderType"/>
+        <result column="PK_WARES" property="pkWares"/>
+        <result column="QUANTITY" property="quantity"/>
+        <result column="ORIGINAL_LEVEL" property="originalLevel"/>
+        <result column="UPGRADE_LEVEL" property="upgradeLevel"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEL_FLAG
+        ,
+        CREATION_TIME,
+        PK_CREATOR,
+        MODIFIED_TIME,
+        PK_MODIFIED,
+        PK_COUNTRY,
+        PK_ID, PK_BASE_ID, ORDER_TYPE, PK_WARES, QUANTITY, ORIGINAL_LEVEL, UPGRADE_LEVEL
+    </sql>
+    <select id="selectListByOrderType"
+            resultType="com.hzs.activity.add.param.AcAddUpgradeRuleConfigParam">
+        SELECT aauc.ORDER_TYPE,
+               aauc.PK_WARES,
+               aauc.QUANTITY,
+               aauc.ORIGINAL_LEVEL,
+               aauc.UPGRADE_LEVEL,
+               bg.GRADE_NAME  AS originalLevelVal,
+               bgg.GRADE_NAME AS upgradeLevelVal
+        FROM AC_ADD_UPGRADE_CONFIG aauc
+                 LEFT JOIN BD_GRADE bg ON aauc.ORIGINAL_LEVEL = bg.PK_ID
+                 LEFT JOIN BD_GRADE bgg ON aauc.UPGRADE_LEVEL = bgg.PK_ID
+        WHERE aauc.PK_BASE_ID = #{pkId}
+          AND aauc.DEL_FLAG = 0
+    </select>
+    <select id="selectOrderTypeByBaseId" resultType="java.lang.Integer">
+        SELECT DISTINCT ORDER_TYPE
+        FROM AC_ADD_UPGRADE_CONFIG
+        WHERE PK_BASE_ID = #{pkId}
+          AND DEL_FLAG = 0
+    </select>
+    <select id="queryList" resultType="com.hzs.activity.add.vo.AcAddUpgradeListVO">
+        SELECT
+        abc.ACT_NAME,
+        cm.member_code,
+        cm.member_name,
+        BG.GRADE_NAME AS originalLevelVal,
+        BGG.GRADE_NAME AS upgradeLevelVal,
+        abc.ACT_START_DATE,
+        abc.ACT_END_DATE,
+        aaur.*
+        FROM
+        AC_ADD_UPGRADE_RECORD aaur
+        LEFT JOIN AC_BASE_CONFIG abc ON aaur.PK_BASE_ID = abc.PK_ID
+        LEFT JOIN CU_MEMBER cm ON aaur.PK_MEMBER = cm.PK_ID
+        LEFT JOIN BD_GRADE BG ON aaur.PK_ORIGIN_GRADE = BG.PK_ID
+        LEFT JOIN BD_GRADE BGG ON aaur.PK_UPGRADE_GRADE = BGG.PK_ID
+        WHERE
+        aaur.DEL_FLAG = 0
+        <if test="actName != null and actName != ''">
+            AND abc.ACT_NAME = #{actName}
+        </if>
+        <if test="memberCode != null and memberCode != ''">
+            AND cm.member_code = #{memberCode}
+        </if>
+        <if test="startActStartDate != null and startActStartDate != ''">
+            AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="startActEndDate != null and startActEndDate != ''">
+            AND abc.ACT_START_DATE &lt;= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="endActStartDate != null and endActStartDate != ''">
+            AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="endActEndDate != null and endActEndDate != ''">
+            AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
+        </if>
+    </select>
+
+</mapper>
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml
@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzs.activity.add.mapper.AcAddUpgradeRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hzs.activity.add.vo.AcAddUpgradeRecord">
+        <id column="PK_ID" property="pkId" />
+    <result column="DEL_FLAG" property="delFlag" />
+    <result column="CREATION_TIME" property="creationTime" />
+    <result column="PK_CREATOR" property="pkCreator" />
+    <result column="MODIFIED_TIME" property="modifiedTime" />
+    <result column="PK_MODIFIED" property="pkModified" />
+    <result column="PK_COUNTRY" property="pkCountry" />
+        <result column="PK_BASE_ID" property="pkBaseId" />
+        <result column="PK_RULE_ID" property="pkRuleId" />
+        <result column="PK_MEMBER" property="pkMember" />
+        <result column="PK_ORIGIN_GRADE" property="pkOriginGrade" />
+        <result column="PK_UPGRADE_GRADE" property="pkUpgradeGrade" />
+        <result column="PK_ORDER_ID" property="pkOrderId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEL_FLAG,
+        CREATION_TIME,
+        PK_CREATOR,
+        MODIFIED_TIME,
+        PK_MODIFIED,
+        PK_COUNTRY,
+        PK_ID, PK_BASE_ID, PK_RULE_ID, PK_MEMBER, PK_ORIGIN_GRADE, PK_UPGRADE_GRADE, PK_ORDER_ID
+    </sql>
+    <select id="queryList" resultType="com.hzs.activity.add.vo.AcAddUpgradeListVO">
+        SELECT
+        abc.ACT_NAME,
+        cm.member_code,
+        cm.member_name,
+        BG.GRADE_NAME AS originalLevelVal,
+        BGG.GRADE_NAME AS upgradeLevelVal,
+        abc.ACT_START_DATE,
+        abc.ACT_END_DATE,
+        aaur.*
+        FROM
+        AC_ADD_UPGRADE_RECORD aaur
+        LEFT JOIN AC_BASE_CONFIG abc ON aaur.PK_BASE_ID = abc.PK_ID
+        LEFT JOIN CU_MEMBER cm ON aaur.PK_MEMBER = cm.PK_ID
+        LEFT JOIN BD_GRADE BG ON aaur.PK_ORIGIN_GRADE = BG.PK_ID
+        LEFT JOIN BD_GRADE BGG ON aaur.PK_UPGRADE_GRADE = BGG.PK_ID
+        WHERE
+        aaur.DEL_FLAG = 0
+        <if test="actName != null and actName != ''">
+            AND abc.ACT_NAME = #{actName}
+        </if>
+        <if test="memberCode != null and memberCode != ''">
+            AND cm.member_code = #{memberCode}
+        </if>
+        <if test="startActStartDate != null and startActStartDate != ''">
+            AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="startActEndDate != null and startActEndDate != ''">
+            AND abc.ACT_START_DATE &lt;= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="endActStartDate != null and endActStartDate != ''">
+            AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="endActEndDate != null and endActEndDate != ''">
+            AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
+        </if>
+    </select>
+
+</mapper>
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hzs.activity.declaration.vo.AcDeclarationGiftConfig">
+        <id column="PK_ID" property="pkId" />
+    <result column="DEL_FLAG" property="delFlag" />
+    <result column="CREATION_TIME" property="creationTime" />
+    <result column="PK_CREATOR" property="pkCreator" />
+    <result column="MODIFIED_TIME" property="modifiedTime" />
+    <result column="PK_MODIFIED" property="pkModified" />
+    <result column="PK_COUNTRY" property="pkCountry" />
+        <result column="PK_BASE_ID" property="pkBaseId" />
+        <result column="REGISTER_AUTHORITY" property="registerAuthority" />
+        <result column="PK_PRODUCT" property="pkProduct" />
+        <result column="SPECS_NAME" property="specsName" />
+        <result column="SPECS_NAME_ID" property="specsNameId" />
+        <result column="QUANTITY" property="quantity" />
+        <result column="LEVEL" property="level" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEL_FLAG,
+        CREATION_TIME,
+        PK_CREATOR,
+        MODIFIED_TIME,
+        PK_MODIFIED,
+        PK_COUNTRY,
+        PK_ID, PK_BASE_ID, REGISTER_AUTHORITY, PK_PRODUCT, SPECS_NAME, SPECS_NAME_ID, QUANTITY, LEVEL
+    </sql>
+
+</mapper>
--- 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
@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hzs.activity.declaration.vo.AcDeclarationGiftRecord">
+        <id column="PK_ID" property="pkId" />
+    <result column="DEL_FLAG" property="delFlag" />
+    <result column="CREATION_TIME" property="creationTime" />
+    <result column="PK_CREATOR" property="pkCreator" />
+    <result column="MODIFIED_TIME" property="modifiedTime" />
+    <result column="PK_MODIFIED" property="pkModified" />
+    <result column="PK_COUNTRY" property="pkCountry" />
+        <result column="PK_BASE_ID" property="pkBaseId" />
+        <result column="PK_RULE_ID" property="pkRuleId" />
+        <result column="PK_MEMBER" property="pkMember" />
+        <result column="PK_PRODUCT" property="pkProduct" />
+        <result column="QUANTITY" property="quantity" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DEL_FLAG,
+        CREATION_TIME,
+        PK_CREATOR,
+        MODIFIED_TIME,
+        PK_MODIFIED,
+        PK_COUNTRY,
+        PK_ID, PK_BASE_ID, PK_RULE_ID, PK_MEMBER, PK_PRODUCT, QUANTITY
+    </sql>
+    <select id="queryList" resultType="com.hzs.activity.declaration.vo.AcDeclarationListVO">
+        SELECT
+        abc.ACT_NAME,
+        cm.member_code,
+        cm.member_name,
+        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.SPECIFY_LEVEL = BG.PK_ID
+        WHERE
+        adgr.DEL_FLAG = 0
+        <if test="actName != null and actName != ''">
+            AND abc.ACT_NAME = #{actName}
+        </if>
+        <if test="memberCode != null and memberCode != ''">
+            AND cm.member_code = #{memberCode}
+        </if>
+        <if test="startActStartDate != null and startActStartDate != ''">
+            AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="startActEndDate != null and startActEndDate != ''">
+            AND abc.ACT_START_DATE &lt;= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="endActStartDate != null and endActStartDate != ''">
+            AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD')
+        </if>
+        <if test="endActEndDate != null and endActEndDate != ''">
+            AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
+        </if>
+    </select>
+
+</mapper>
--- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
@ -98,5 +98,4 @@
            AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
        </if>
    </select>
-
 </mapper>
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java
@ -45,6 +45,16 @@ public enum EActType {
     */
    RECOMMEND_UPGRADE(30, "直推升级", 0),

+    /**
+     * 加购升级
+     */
+    ADD_UPGRADE(31,"加购升级",0),
+
+    /**
+     * 报单赠送
+     */
+    DECLARATION_GIFT(32,"报单赠送",0)
+
    ;

    /**
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java
@ -408,6 +408,34 @@ public enum EApprovalBusiness {
     */
    MEMBER_CONSUME_GIFT_REMOVE(751, "会员消费赠送删除", EnumsPrefixConstants.APPROVAL_BUSINESS + "751"),

+    /**
+     * 会员消费赠送添加
+     */
+    AC_ADD_UPGRADE_CONFIG_ADD(752, "加购升级活动添加", EnumsPrefixConstants.APPROVAL_BUSINESS + "752"),
+    /**
+     * 会员消费赠送修改
+     */
+    AC_ADD_UPGRADE_CONFIG_UPDATE(753, "加购升级活动修改", EnumsPrefixConstants.APPROVAL_BUSINESS + "753"),
+
+    /**
+     * 会员消费赠送删除
+     */
+    AC_ADD_UPGRADE_CONFIG_REMOVE(754, "加购升级活动删除", EnumsPrefixConstants.APPROVAL_BUSINESS + "754"),
+
+    /**
+     * 报单赠送添加
+     */
+    AC_DECLARATION_GIFT_ADD(755, "报单赠送添加", EnumsPrefixConstants.APPROVAL_BUSINESS + "755"),
+    /**
+     * 报单赠送修改
+     */
+    AC_DECLARATION_GIFT_UPDATE(756, "报单赠送修改", EnumsPrefixConstants.APPROVAL_BUSINESS + "756"),
+
+    /**
+     * 报单赠送删除
+     */
+    AC_DECLARATION_GIFT_REMOVE(757, "报单赠送删除", EnumsPrefixConstants.APPROVAL_BUSINESS + "757"),
+
    ;

    /**
--- 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
@ -261,6 +261,25 @@ public enum EOperationBusiness {

    AC_WARES_RULE_CONFIG("商品赠送"),

+    AC_ADD_UPGRADE_SUBMIT("加购活动"),
+
+    AC_ADD_UPGRADE_LIST("加购升级数据"),
+
+    AC_ADD_UPGRADE_LIST_EXPORT("加购升级数据"),
+
+
+    AC_DECLARATION_GIFT_SAVE("报单赠送新增"),
+    AC_DECLARATION_GIFT_UPDATE("报单修改"),
+    AC_DECLARATION_GIFT_DELETE("报单删除"),
+
+    AC_DECLARATION_GIFT_DETAIL("报单赠送详情"),
+
+    AC_DECLARATION_GIFT_EXPORT("报单赠送导出"),
+
+    AC_DECLARATION_GIFT_LIST("报单赠送数据"),
+
+    AC_DECLARATION_GIFT_LIST_EXPORT("报单赠送数据导出"),
+
    AC_TOURISM_CONFIG("旅游活动"),

    TICKET_GIVE("门票活动"),
@ -368,8 +387,8 @@ public enum EOperationBusiness {
    CU_MEMBER_RETAIL_REGION("会员收益区域配置"),

    NOT_USED_REGION_AREA("未使用收益区域"),
-    ;
-
+    AC_ADD_UPGRADE_DETAIL("加购升级详情"),
+    AC_ADD_UPGRADE_EXPORT("加购升级导出");

    /**
     * 显示标签
--- 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
@ -367,6 +367,29 @@ public enum EOperationModule {

    DELETE_DEAD_LOCK("删除死点"),

+    AC_ADD_UPGRADE_SUBMIT("加购活动"),
+
+    AC_ADD_UPGRADE_DETAIL("加购升级详情"),
+
+    AC_ADD_UPGRADE_EXPORT("加购升级导出"),
+
+    AC_ADD_UPGRADE_LIST("加购升级数据"),
+
+    AC_ADD_UPGRADE_LIST_EXPORT("加购升级数据导出"),
+
+    AC_DECLARATION_GIFT_SAVE("报单赠送新增"),
+    AC_DECLARATION_GIFT_UPDATE("报单修改"),
+    AC_DECLARATION_GIFT_DELETE("报单删除"),
+
+    AC_DECLARATION_GIFT_DETAIL("报单赠送详情"),
+
+    AC_DECLARATION_GIFT_EXPORT("报单赠送导出"),
+
+    AC_DECLARATION_GIFT_LIST("报单赠送数据"),
+
+    AC_DECLARATION_GIFT_LIST_EXPORT("报单赠送数据导出"),
+
+
    ///////////////////////////统计分析////////////////////////////

    STATISTIC_ANALYSIS("统计分析"),
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductExtend.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductExtend.java
@ -104,4 +104,10 @@ public class BdProductExtend extends BaseEntity {
    @TableField("IS_PUT_ON")
    private Integer isPutOn;

+    /**
+     * 提货基数
+     */
+    @TableField("DELIVERY_QUANTITY")
+    private Integer deliveryQuantity;
+
 }
--- a/code-util/src/test/java/com/CodeGenerator.java
+++ b/code-util/src/test/java/com/CodeGenerator.java
@ -20,7 +20,7 @@ public class CodeGenerator {
        // 模块名称（包名）
        String moduleName = "com.hzs.common.domain";
        // 表名
-        String[] tables = {"CU_MEMBER_BONUS_DELAY", "CU_MEMBER_BONUS_DELAY_DETAIL"};
+        String[] tables = {"AC_ADD_UPGRADE_CONFIG", "AC_ADD_UPGRADE_RECORD","AC_DECLARATION_GIFT_CONFIG","AC_DECLARATION_GIFT_RECORD"};
        // 生成实体是否继承统一父类
        boolean superBool = true;

@ -50,8 +50,8 @@ public class CodeGenerator {
        // dsc.setSchemaName("public");
        dataSourceConfig.setUrl("jdbc:oracle:thin:@101.201.51.180:1521/orcl")
                .setDriverName("oracle.jdbc.driver.OracleDriver")
-                .setUsername("cloud_1")
-                .setPassword("pwCloud1Test180")
+                .setUsername("cloud_2")
+                .setPassword("pwCloud2Test180")
                .setDbType(DbType.ORACLE);
        mpg.setDataSource(dataSourceConfig);
Author	SHA1	Message	Date
zhangheng	46edfadd29	## 报单赠送	2025-10-14 10:33:46 +08:00
zhangheng	8204bde68f	## 加购升级功能,报单赠送功能	2025-10-14 10:33:45 +08:00
zhangheng	7b66f67e54	## 加购升级功能,报单赠送功能	2025-10-14 10:33:45 +08:00
zhangheng	e46bc82dd6	## 加购升级功能新增	2025-10-14 10:33:44 +08:00