authorityList;
+
+}
+
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeRuleConfigParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeRuleConfigParam.java
new file mode 100644
index 00000000..c12f8178
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeRuleConfigParam.java
@@ -0,0 +1,43 @@
+package com.hzs.activity.add.controller.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;
+
+}
diff --git 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
new file mode 100644
index 00000000..514b9bf1
--- /dev/null
+++ 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.controller.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.controller.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;
+
+/**
+ *
+ * 加购升级配置表 Mapper 接口
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcAddUpgradeConfigMapper extends BaseMapper {
+
+ List selectListByOrderType(@Param("pkId") Integer pkId,
+ @Param("orderType") Integer orderType);
+
+ List selectOrderTypeByBaseId(@Param("pkId") Integer pkId);
+
+ List queryList(AcAddUpgradeListParam param);
+}
diff --git 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
new file mode 100644
index 00000000..d27af084
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java
@@ -0,0 +1,16 @@
+package com.hzs.activity.add.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.add.vo.AcAddUpgradeRecord;
+
+/**
+ *
+ * 加购活动明细表 Mapper 接口
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcAddUpgradeRecordMapper extends BaseMapper {
+
+}
diff --git 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
new file mode 100644
index 00000000..b5f4c352
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java
@@ -0,0 +1,27 @@
+package com.hzs.activity.add.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.add.controller.param.AcAddUpgradeListParam;
+import com.hzs.activity.add.controller.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;
+
+/**
+ *
+ * 加购升级配置表 服务类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcAddUpgradeConfigService extends IService {
+
+ String onLinePetition(AcAddUpgradeParam acAddUpgradeParam);
+
+ AjaxResult getDetail(Integer pkId);
+
+ List queryList(AcAddUpgradeListParam param);
+}
diff --git 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
new file mode 100644
index 00000000..b6a5fab2
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java
@@ -0,0 +1,16 @@
+package com.hzs.activity.add.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.add.vo.AcAddUpgradeRecord;
+
+/**
+ *
+ * 加购活动明细表 服务类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcAddUpgradeRecordService extends IService {
+
+}
diff --git 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
new file mode 100644
index 00000000..4fba7174
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java
@@ -0,0 +1,198 @@
+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.controller.param.*;
+import com.hzs.activity.add.mapper.AcAddUpgradeConfigMapper;
+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.annotation.Transaction;
+import com.hzs.common.core.enums.EActType;
+import com.hzs.common.core.enums.EApprovalBusiness;
+import com.hzs.common.core.enums.EAwardsLevel;
+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.domain.activity.wares.AcWaresRuleConfig;
+import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.sale.wares.service.IBdWaresAwardsService;
+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 javax.security.auth.callback.Callback;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 加购升级配置表 服务实现类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+@Slf4j
+public class AcAddUpgradeConfigServiceImpl extends ServiceImpl 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);
+ // 新增活动目标权限
+ iActivityService.saveGoalMemberConfig(activityParam, acBaseConfig);
+ // 新增加购活动配置
+ 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 orderTypes = baseMapper.selectOrderTypeByBaseId(pkId);
+ List list = new ArrayList<>();
+ // 组装加购活动详情
+ for (Integer orderType : orderTypes) {
+ // 根据活动类型查询活动类型集合
+ List acAddUpgradeRuleConfigParams = baseMapper.selectListByOrderType(pkId, orderType);
+ list.add(new AcAddUpgradeConfigParam(orderType, acAddUpgradeRuleConfigParams));
+ }
+
+ List goalMemberConfigList = iAcGoalMemberConfigService.list(new LambdaQueryWrapper()
+ .eq(AcGoalMemberConfig::getPkBaseId, baseConfig.getPkId()));
+ activityParam.setAcAddUpgradeConfigParams(list);
+ activityParam.setGoalMemberConfigList(goalMemberConfigList);
+ activityParam.setPkBaseId(baseConfig.getPkId());
+ return AjaxResult.success(activityParam);
+ }
+
+ @Override
+ public List queryList(AcAddUpgradeListParam param) {
+ return baseMapper.queryList(param);
+ }
+
+ private void removeAddUpgradeConfig(Long pkId) {
+ // 删除活动基本配置
+ baseConfigService.removeById(pkId);
+ // 删除加购活动配置
+ baseMapper.delete(new LambdaQueryWrapper()
+ .eq(AcAddUpgradeConfig::getPkBaseId, pkId));
+ // 删除用户权限配置
+ iAcGoalMemberConfigService.remove(new LambdaQueryWrapper()
+ .eq(AcGoalMemberConfig::getPkBaseId, pkId));
+ }
+
+ private void updateAddUpgradeConfig(ActivityParam activityParam, List acAddUpgradeConfigParam) {
+ {
+ Long pkId = activityParam.getPkId();
+ // 查询基础信息
+ AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class);
+ baseConfig.setPkId(activityParam.getPkId());
+ baseConfigService.updateById(baseConfig);
+
+ // 删除活动配置
+ baseMapper.delete(new LambdaQueryWrapper()
+ .eq(AcAddUpgradeConfig::getPkBaseId, pkId));
+ // 删除用户权限配置
+ iAcGoalMemberConfigService.remove(new LambdaQueryWrapper()
+ .eq(AcGoalMemberConfig::getPkBaseId, pkId));
+ // 添加加购活动配置
+ saveAddUpgradeConfig(acAddUpgradeConfigParam,baseConfig);
+ // 添加用户权限配置
+ iActivityService.saveGoalMemberConfig(activityParam, baseConfig);
+ }
+ }
+
+ private void saveAddUpgradeConfig(List acAddUpgradeConfigParam,AcBaseConfig acBaseConfig) {
+ acAddUpgradeConfigParam.forEach(item -> {
+ List 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);
+ });
+ }
+
+ });
+ }
+}
diff --git 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
new file mode 100644
index 00000000..449eea07
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java
@@ -0,0 +1,20 @@
+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.service.IAcAddUpgradeRecordService;
+import com.hzs.activity.add.vo.AcAddUpgradeRecord;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 加购活动明细表 服务实现类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+public class AcAddUpgradeRecordServiceImpl extends ServiceImpl implements IAcAddUpgradeRecordService {
+
+}
diff --git 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
new file mode 100644
index 00000000..f05e3355
--- /dev/null
+++ 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;
+
+/**
+ *
+ * 加购升级配置表
+ *
+ *
+ * @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;
+
+
+}
diff --git 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
new file mode 100644
index 00000000..4a6ac102
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java
@@ -0,0 +1,71 @@
+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;
+
+ /**
+ * 升级年月
+ */
+ @Excel(name = "升级年月", dateFormat = "yyyy-MM-dd")
+ private String upgradeTime;
+
+}
diff --git 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
new file mode 100644
index 00000000..bfc0848e
--- /dev/null
+++ 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;
+
+/**
+ *
+ * 加购活动明细表
+ *
+ *
+ * @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;
+
+
+}
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
new file mode 100644
index 00000000..36832f65
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java
@@ -0,0 +1,113 @@
+//package com.hzs.activity.declaration.controller.manage;
+//
+//
+//import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
+//import com.hzs.activity.add.controller.param.AcAddUpgradeListParam;
+//import com.hzs.activity.add.controller.param.AcAddUpgradeParam;
+//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.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.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;
+//
+///**
+// *
+// * 前端控制器
+// *
+// *
+// * @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 acAddUpgradeParam 报单赠送活动
+// * @return AjaxResult
+// */
+// @Log(module = EOperationModule.AC_DECLARATION_GIFT_SUBMIT, business = EOperationBusiness.AC_DECLARATION_GIFT_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 = iAcDeclarationGiftConfigService.onLinePetition(acAddUpgradeParam);
+// 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 resultList = iActivityService.activityList(queryActivityParam);
+// ExcelUtil util = new ExcelUtil<>(BaseConfigVo.class);
+// util.exportExcel(response, resultList, "报单赠送导出");
+// }
+//
+// /**
+// *
+// * @param param
+// * @return
+// */
+// @Log(module = EOperationModule.AC_DECLARATION_GIFT_LIST, business = EOperationBusiness.AC_DECLARATION_GIFT_LIST, method = EOperationMethod.SELECT)
+// @GetMapping("/list")
+// public TableDataInfo directPushUpgradeList(AcAddUpgradeListParam param) {
+// startPage();
+// return getDataTable(iAcDeclarationGiftConfigService.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(AcAddUpgradeListParam param, HttpServletResponse response) {
+// startPage();
+// List list = iAcDeclarationGiftConfigService.queryList(param);
+// ExcelUtil util = new ExcelUtil<>(AcAddUpgradeListVO.class);
+// util.exportExcel(response, list, "加购升级数据导出");
+// }
+//}
diff --git 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
new file mode 100644
index 00000000..a48c1244
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java
@@ -0,0 +1,20 @@
+package com.hzs.activity.declaration.controller.manage;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 报单赠品明细表 前端控制器
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@RestController
+@RequestMapping("/manage/acDeclarationRecord")
+public class AcDeclarationGiftRecordController {
+
+}
diff --git 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
new file mode 100644
index 00000000..f86dcff4
--- /dev/null
+++ 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;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcDeclarationGiftConfigMapper extends BaseMapper {
+
+}
diff --git 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
new file mode 100644
index 00000000..bc7b4208
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java
@@ -0,0 +1,16 @@
+package com.hzs.activity.declaration.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
+
+/**
+ *
+ * 报单赠品明细表 Mapper 接口
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface AcDeclarationGiftRecordMapper extends BaseMapper {
+
+}
diff --git 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
new file mode 100644
index 00000000..cc94df08
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java
@@ -0,0 +1,16 @@
+package com.hzs.activity.declaration.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcDeclarationGiftConfigService extends IService {
+
+}
diff --git 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
new file mode 100644
index 00000000..0018ac6c
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java
@@ -0,0 +1,16 @@
+package com.hzs.activity.declaration.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
+
+/**
+ *
+ * 报单赠品明细表 服务类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+public interface IAcDeclarationGiftRecordService extends IService {
+
+}
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
new file mode 100644
index 00000000..49adaf75
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.hzs.activity.declaration.service.impl;
+
+import com.hzs.activity.declaration.mapper.AcDeclarationGiftConfigMapper;
+import com.hzs.activity.declaration.service.IAcDeclarationGiftConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl implements IAcDeclarationGiftConfigService {
+
+}
diff --git 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
new file mode 100644
index 00000000..8fc51640
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.hzs.activity.declaration.service.impl;
+
+import com.hzs.activity.declaration.mapper.AcDeclarationGiftRecordMapper;
+import com.hzs.activity.declaration.service.IAcDeclarationGiftRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 报单赠品明细表 服务实现类
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Service
+public class AcDeclarationGiftRecordServiceImpl extends ServiceImpl implements IAcDeclarationGiftRecordService {
+
+}
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
new file mode 100644
index 00000000..f627454d
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java
@@ -0,0 +1,76 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author bd
+ * @since 2025-10-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("AC_DECLARATION_GIFT_CONFIG")
+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("LEVEL")
+ private Integer level;
+
+
+}
diff --git 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
new file mode 100644
index 00000000..8f8af31b
--- /dev/null
+++ 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;
+
+/**
+ *
+ * 报单赠品明细表
+ *
+ *
+ * @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;
+
+
+}
diff --git 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
index 657531f5..a1a36e7f 100644
--- 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;
+
}
diff --git 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
new file mode 100644
index 00000000..1aceb261
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
diff --git 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
new file mode 100644
index 00000000..b08fb70b
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
diff --git 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
new file mode 100644
index 00000000..b1538475
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
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
new file mode 100644
index 00000000..ee3413b6
--- /dev/null
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
diff --git 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
index eee2c46a..c1b30085 100644
--- 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 <= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
-
diff --git 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
index 8f3af65b..58304b0d 100644
--- 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)
+
;
/**
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
index 1df60249..18683b3b 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
@@ -261,6 +261,22 @@ public enum EOperationBusiness {
AC_WARES_RULE_CONFIG("商品赠送"),
+ AC_ADD_UPGRADE_SUBMIT("加购活动"),
+
+ AC_ADD_UPGRADE_LIST("加购升级数据"),
+
+ AC_ADD_UPGRADE_LIST_EXPORT("加购升级数据"),
+
+ AC_DECLARATION_GIFT_SUBMIT("报单赠送"),
+
+ AC_DECLARATION_GIFT_DETAIL("报单赠送详情"),
+
+ AC_DECLARATION_GIFT_EXPORT("报单赠送导出"),
+
+ AC_DECLARATION_GIFT_LIST("报单赠送数据"),
+
+ AC_DECLARATION_GIFT_LIST_EXPORT("报单赠送数据导出"),
+
AC_TOURISM_CONFIG("旅游活动"),
TICKET_GIVE("门票活动"),
@@ -368,8 +384,8 @@ public enum EOperationBusiness {
CU_MEMBER_RETAIL_REGION("会员收益区域配置"),
NOT_USED_REGION_AREA("未使用收益区域"),
- ;
-
+ AC_ADD_UPGRADE_DETAIL("加购升级详情"),
+ AC_ADD_UPGRADE_EXPORT("加购升级导出");
/**
* 显示标签
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
index 967ea00b..e6cf0722 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
@@ -367,6 +367,28 @@ 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_SUBMIT("报单赠送"),
+
+ AC_DECLARATION_GIFT_DETAIL("报单赠送详情"),
+
+ AC_DECLARATION_GIFT_EXPORT("报单赠送导出"),
+
+ AC_DECLARATION_GIFT_LIST("报单赠送数据"),
+
+ AC_DECLARATION_GIFT_LIST_EXPORT("报单赠送数据导出"),
+
+
+
///////////////////////////统计分析////////////////////////////
STATISTIC_ANALYSIS("统计分析"),
diff --git 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
index f101cc4c..388e7dcf 100644
--- 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;
+
}
diff --git a/code-util/src/test/java/com/CodeGenerator.java b/code-util/src/test/java/com/CodeGenerator.java
index f8d215f5..fe0cc4e8 100644
--- 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);