diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 9f36458e..2242e9dc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -804,10 +804,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl } try { - log.info("生产活动消息,activity.exchange:{}", JSONUtil.toJsonStr(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); if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { @@ -932,6 +930,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl throw new ServiceException("保存会员失败!!!"); } try { + // 推送秒结数据 rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); @@ -1018,9 +1017,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl * * @param saOrderExt 订单 * @param cuMemberAccountExt 会员账户 - * @return: Boolean - * @Author: sui q - * @Date: 2022/9/26 11:29 */ @Override @Transactional(rollbackFor = Exception.class) @@ -1061,12 +1057,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl } /** + * 封装整个订单 + * * @param orderParam 参数 * @param cuMember 会员 - * @Description: 封装整个订单 - * @return: SaOrderExt - * @Author: sui q - * @Date: 2022/9/26 10:36 */ private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) { // 获取订单编号 @@ -2283,13 +2277,6 @@ public class SaOrderServiceImpl extends ServiceImpl 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, MyOrderVO saOrder, Integer approvalStatus) { SaOrderChargeLog saOrderChargeLog = new SaOrderChargeLog(); @@ -2537,12 +2524,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 存在手动升级 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()); if (null == firstDate) {