angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 升级订单撤单处理逻辑调整；

This commit is contained in:
cabbage 2025-06-10 14:57:29 +08:00
parent cfcfa585e5
commit 2d14f67f21
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -804,10 +804,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
try { try {
log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
//计算奖金，通过mq分发消息，异步处理 // 推送秒结数据
log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
@ -932,6 +930,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
throw new ServiceException("保存会员失败!!!"); throw new ServiceException("保存会员失败!!!");
} }
try { try {
// 推送秒结数据
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
@ -1018,9 +1017,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
* *
* @param saOrderExt 订单 * @param saOrderExt 订单
* @param cuMemberAccountExt 会员账户 * @param cuMemberAccountExt 会员账户
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/26 11:29
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -1061,12 +1057,10 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
/** /**
* 封装整个订单
*
* @param orderParam 参数 * @param orderParam 参数
* @param cuMember 会员 * @param cuMember 会员
* @Description: 封装整个订单
* @return: SaOrderExt
* @Author: sui q
* @Date: 2022/9/26 10:36
*/ */
private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) { private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) {
// 获取订单编号 // 获取订单编号
@ -2283,13 +2277,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
} }
/**
* @description:
* @author: zhang jing
* @date: 2023/11/27 11:50
* @param: [nowDate, userId, chargeType, businessCode, saOrder, approvalStatus]
* @return: com.hzs.common.domain.sale.order.SaOrderChargeLog
**/
private SaOrderChargeLog packageSaOrderChargeLog(Date nowDate, Long userId, Integer chargeType, String businessCode, private SaOrderChargeLog packageSaOrderChargeLog(Date nowDate, Long userId, Integer chargeType, String businessCode,
MyOrderVO saOrder, Integer approvalStatus) { MyOrderVO saOrder, Integer approvalStatus) {
SaOrderChargeLog saOrderChargeLog = new SaOrderChargeLog(); SaOrderChargeLog saOrderChargeLog = new SaOrderChargeLog();
@ -2537,12 +2524,11 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 存在手动升级 // 存在手动升级
cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel()); cuMember.setPkSettleGrade(cuMemberLevel.getNewLevel());
} }
} else {
// 传的订单是当前撤的订单
GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt);
cuMember.setPkSettleGrade(gradeDTO.getPkId());
} }
// else {
// // 累计升级制，传的订单是当前撤的订单
// GradeDTO gradeDTO = calculateRetailCancelGrade(cuMember, saOrderExt);
// cuMember.setPkSettleGrade(gradeDTO.getPkId());
// }
Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId()); Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId());
if (null == firstDate) { if (null == firstDate) {