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

## 撤单激活处理（168）；

This commit is contained in:
cabbage 2025-06-11 16:28:57 +08:00
parent e8bba0ae80
commit 68827b97f2
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,17 +170,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
private IOrderBusinessService orderBusinessService; private IOrderBusinessService orderBusinessService;
@Autowired @Autowired
private ISaOrderChargeLogService saOrderChargeLogService; private ISaOrderChargeLogService saOrderChargeLogService;
@Autowired
private RedisService redisService; private RedisService redisService;
@Autowired @Autowired
private IBdWaresDetailService bdWaresDetailService; private IBdWaresDetailService bdWaresDetailService;
@Autowired
public void setRedisService(RedisService redisService) {
this.redisService = redisService;
}
@Override @Override
public List<CuMemberExt> queryMemberExtByCondition(CuMember cuMember) { public List<CuMemberExt> queryMemberExtByCondition(CuMember cuMember) {
return memberServiceApi.getMemberInfo(cuMember).getData(); return memberServiceApi.getMemberInfo(cuMember).getData();
@ -2529,14 +2524,15 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} else if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) { } else if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) {
// 复购订单存在盒数商品撤单，需要处理降级操作 // 复购订单存在盒数商品撤单，需要处理降级操作
if (saOrderExt.getBoxNum() > 0) { if (saOrderExt.getBoxNum() > 0) {
Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId()); // TODO 目前只有注册、升级才能激活，复购不进行处理
if (null == firstDate) { // Date firstDate = baseMapper.getFirstPayTime(cuMember.getPkId());
// 盒数商品订单最早的时间为空，则会员未激活 // if (null == firstDate) {
cuMember.setPayTime(null); // // 盒数商品订单最早的时间为空，则会员未激活
cuMember.setPayStatus(EPayStatus.UNPAID.getValue()); // cuMember.setPayTime(null);
cuMember.setIsActivate(EYesNo.NO.getIntValue()); // cuMember.setPayStatus(EPayStatus.UNPAID.getValue());
saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); // cuMember.setIsActivate(EYesNo.NO.getIntValue());
} // saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue());
// }
// TODO 恢复升级专区，复购专区不需要处理等级问题 // TODO 恢复升级专区，复购专区不需要处理等级问题
// // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验 // // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验

2
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -1543,7 +1543,7 @@
where so.del_flag = 0 where so.del_flag = 0
and so.order_status = 1 and so.order_status = 1
and so.pk_member = #{pkMember} and so.pk_member = #{pkMember}
and so.order_type in (41, 42, 43) and so.order_type in (41, 42)
and so.box_num != 0 and so.box_num != 0
</select> </select>