angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 加购升级功能新增

This commit is contained in:
zhangheng 2025-10-13 15:35:31 +08:00
parent 53c795a6f2
commit 110f14a4cf
37 changed files with 1591 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeConfigController.java Normal file
View File

@ -0,0 +1,115 @@
package com.hzs.activity.add.controller.manage;
import com.hzs.activity.add.controller.param.AcAddUpgradeListParam;
import com.hzs.activity.add.controller.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.activity.recommend.param.AcDirectPushUpgradeListParam;
import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO;
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, "加购升级导出");
}
/**
*
* @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(iAcAddUpgradeConfigService.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 = iAcAddUpgradeConfigService.queryList(param);
ExcelUtil<AcAddUpgradeListVO> util = new ExcelUtil<>(AcAddUpgradeListVO.class);
util.exportExcel(response, list, "加购升级数据导出");
}
}

20
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/manage/AcAddUpgradeRecordController.java Normal file
View File

@ -0,0 +1,20 @@
package com.hzs.activity.add.controller.manage;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 加购活动明细表 前端控制器
* </p>
*
* @author bd
* @since 2025-10-13
*/
@RestController
@RequestMapping("/manage/addUpgradeRecord")
public class AcAddUpgradeRecordController {
}

20
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeConfigParam.java Normal file
View File

@ -0,0 +1,20 @@
package com.hzs.activity.add.controller.param;
import com.hzs.activity.base.param.WaresRuleConfigParam;
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;
}

131
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeDetailParam.java Normal file
View File

@ -0,0 +1,131 @@
package com.hzs.activity.add.controller.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hzs.activity.base.param.AcDrawRuleConfigParam;
import com.hzs.activity.base.param.ConsumeRuleConfigParam;
import com.hzs.activity.base.param.WaresConfigParam;
import com.hzs.activity.draw.vo.AcDrawGiftRuleConfigVo;
import com.hzs.common.domain.activity.base.AcGoalMemberConfig;
import com.hzs.common.domain.activity.base.AcPickUpConfig;
import com.hzs.common.domain.activity.consume.ext.AcConsumeShieldConfigExt;
import com.hzs.common.domain.activity.consume.ext.AcMemberConsumeRuleExt;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
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;
}

42
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeListParam.java Normal file
View File

@ -0,0 +1,42 @@
package com.hzs.activity.add.controller.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;
}

68
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeParam.java Normal file
View File

@ -0,0 +1,68 @@
package com.hzs.activity.add.controller.param;
import com.hzs.activity.base.param.ActivityParam;
import com.hzs.activity.recommend.vo.AcRecommendSharVO;
import com.hzs.activity.recommend.vo.AcRecommendUpgradeVO;
import com.hzs.activity.recommend.vo.AcRepurchaseCouponsShowVO;
import com.hzs.common.core.web.domain.BaseApprovalEntity;
import com.hzs.common.domain.activity.base.AcBaseAuthority;
import com.hzs.system.sys.dto.LoginUser;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
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;
/**
* 权限配置列表
*/
private List<AcBaseAuthority> authorityList;
}

43
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/controller/param/AcAddUpgradeRuleConfigParam.java Normal file
View File

@ -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;
}

28
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeConfigMapper.java Normal file
View File

@ -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;
/**
* <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);
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/mapper/AcAddUpgradeRecordMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.hzs.activity.add.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.add.vo.AcAddUpgradeRecord;
/**
* <p>
* 加购活动明细表 Mapper 接口
* </p>
*
* @author bd
* @since 2025-10-13
*/
public interface AcAddUpgradeRecordMapper extends BaseMapper<AcAddUpgradeRecord> {
}

27
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeConfigService.java Normal file
View File

@ -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;
/**
* <p>
* 加购升级配置表 服务类
* </p>
*
* @author bd
* @since 2025-10-13
*/
public interface IAcAddUpgradeConfigService extends IService<AcAddUpgradeConfig> {
String onLinePetition(AcAddUpgradeParam acAddUpgradeParam);
AjaxResult getDetail(Integer pkId);
List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param);
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/IAcAddUpgradeRecordService.java Normal file
View File

@ -0,0 +1,16 @@
package com.hzs.activity.add.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.add.vo.AcAddUpgradeRecord;
/**
* <p>
* 加购活动明细表 服务类
* </p>
*
* @author bd
* @since 2025-10-13
*/
public interface IAcAddUpgradeRecordService extends IService<AcAddUpgradeRecord> {
}

198
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeConfigServiceImpl.java Normal file
View File

@ -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;
/**
* <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);
// 新增活动目标权限
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<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);
}
@Override
public List<AcAddUpgradeListVO> queryList(AcAddUpgradeListParam param) {
return baseMapper.queryList(param);
}
private void removeAddUpgradeConfig(Long pkId) {
// 删除活动基本配置
baseConfigService.removeById(pkId);
// 删除加购活动配置
baseMapper.delete(new LambdaQueryWrapper<AcAddUpgradeConfig>()
.eq(AcAddUpgradeConfig::getPkBaseId, pkId));
// 删除用户权限配置
iAcGoalMemberConfigService.remove(new LambdaQueryWrapper<AcGoalMemberConfig>()
.eq(AcGoalMemberConfig::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));
// 删除用户权限配置
iAcGoalMemberConfigService.remove(new LambdaQueryWrapper<AcGoalMemberConfig>()
.eq(AcGoalMemberConfig::getPkBaseId, pkId));
// 添加加购活动配置
saveAddUpgradeConfig(acAddUpgradeConfigParam,baseConfig);
// 添加用户权限配置
iActivityService.saveGoalMemberConfig(activityParam, 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);
});
}
});
}
}

20
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/service/impl/AcAddUpgradeRecordServiceImpl.java Normal file
View File

@ -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;
/**
* <p>
* 加购活动明细表 服务实现类
* </p>
*
* @author bd
* @since 2025-10-13
*/
@Service
public class AcAddUpgradeRecordServiceImpl extends ServiceImpl<AcAddUpgradeRecordMapper, AcAddUpgradeRecord> implements IAcAddUpgradeRecordService {
}

74
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeConfig.java Normal file
View File

@ -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;
}

71
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeListVO.java Normal file
View File

@ -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;
}

72
bd-business/bd-business-sale/src/main/java/com/hzs/activity/add/vo/AcAddUpgradeRecord.java Normal file
View File

@ -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;
}

113
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftConfigController.java Normal file
View File

@ -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;
//
///**
// * <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 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<BaseConfigVo> resultList = iActivityService.activityList(queryActivityParam);
// ExcelUtil<BaseConfigVo> 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<AcAddUpgradeListVO> list = iAcDeclarationGiftConfigService.queryList(param);
// ExcelUtil<AcAddUpgradeListVO> util = new ExcelUtil<>(AcAddUpgradeListVO.class);
// util.exportExcel(response, list, "加购升级数据导出");
// }
//}

20
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/controller/manage/AcDeclarationGiftRecordController.java Normal file
View File

@ -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;
/**
* <p>
* 报单赠品明细表 前端控制器
* </p>
*
* @author bd
* @since 2025-10-13
*/
@RestController
@RequestMapping("/manage/acDeclarationRecord")
public class AcDeclarationGiftRecordController {
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftConfigMapper.java Normal file
View File

@ -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> {
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/mapper/AcDeclarationGiftRecordMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.hzs.activity.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
/**
* <p>
* 报单赠品明细表 Mapper 接口
* </p>
*
* @author bd
* @since 2025-10-13
*/
public interface AcDeclarationGiftRecordMapper extends BaseMapper<AcDeclarationGiftRecord> {
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftConfigService.java Normal file
View File

@ -0,0 +1,16 @@
package com.hzs.activity.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.declaration.vo.AcDeclarationGiftConfig;
/**
* <p>
* 服务类
* </p>
*
* @author bd
* @since 2025-10-13
*/
public interface IAcDeclarationGiftConfigService extends IService<AcDeclarationGiftConfig> {
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/IAcDeclarationGiftRecordService.java Normal file
View File

@ -0,0 +1,16 @@
package com.hzs.activity.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.activity.declaration.vo.AcDeclarationGiftRecord;
/**
* <p>
* 报单赠品明细表 服务类
* </p>
*
* @author bd
* @since 2025-10-13
*/
public interface IAcDeclarationGiftRecordService extends IService<AcDeclarationGiftRecord> {
}

20
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftConfigServiceImpl.java Normal file
View File

@ -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;
/**
* <p>
* 服务实现类
* </p>
*
* @author bd
* @since 2025-10-13
*/
@Service
public class AcDeclarationGiftConfigServiceImpl extends ServiceImpl<AcDeclarationGiftConfigMapper, AcDeclarationGiftConfig> implements IAcDeclarationGiftConfigService {
}

20
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/service/impl/AcDeclarationGiftRecordServiceImpl.java Normal file
View File

@ -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;
/**
* <p>
* 报单赠品明细表 服务实现类
* </p>
*
* @author bd
* @since 2025-10-13
*/
@Service
public class AcDeclarationGiftRecordServiceImpl extends ServiceImpl<AcDeclarationGiftRecordMapper, AcDeclarationGiftRecord> implements IAcDeclarationGiftRecordService {
}

76
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftConfig.java Normal file
View File

@ -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;
/**
* <p>
*
* </p>
*
* @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;
}

64
bd-business/bd-business-sale/src/main/java/com/hzs/activity/declaration/vo/AcDeclarationGiftRecord.java Normal file
View File

@ -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;
}

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/manage/params/ProductParams.java
View File

@ -253,4 +253,9 @@ public class ProductParams implements Serializable {
*/
private String wmsCode;
/**
* 提货基数
*/
private Integer deliveryQuantity;
}

90
bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeConfigMapper.xml Normal file
View File

@ -0,0 +1,90 @@
<?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.controller.param.AcAddUpgradeRuleConfigParam">
SELECT aauc.ORDER_TYPE,
aauc.PK_WARES,
aauc.QUANTITY,
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>

33
bd-business/bd-business-sale/src/main/resources/mapper/activity/add/AcAddUpgradeRecordMapper.xml Normal file
View File

@ -0,0 +1,33 @@
<?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>
</mapper>

34
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftConfigMapper.xml Normal file
View File

@ -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>

32
bd-business/bd-business-sale/src/main/resources/mapper/activity/declaration/AcDeclarationGiftRecordMapper.xml Normal file
View File

@ -0,0 +1,32 @@
<?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>
</mapper>

1
bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
View File

@ -98,5 +98,4 @@
AND abc.ACT_END_DATE &lt;= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD')
</if>
</select>
</mapper>

10
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java
View File

@ -45,6 +45,16 @@ public enum EActType {
*/
RECOMMEND_UPGRADE(30, "直推升级", 0),
/**
* 加购升级
*/
ADD_UPGRADE(31,"加购升级",0),
/**
* 报单赠送
*/
DECLARATION_GIFT(32,"报单赠送",0)
;
/**

20
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
View File

@ -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("加购升级导出");
/**
* 显示标签

22
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
View File

@ -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("统计分析"),

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductExtend.java
View File

@ -104,4 +104,10 @@ public class BdProductExtend extends BaseEntity {
@TableField("IS_PUT_ON")
private Integer isPutOn;
/**
* 提货基数
*/
@TableField("DELIVERY_QUANTITY")
private Integer deliveryQuantity;
}

6
code-util/src/test/java/com/CodeGenerator.java
View File

@ -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);