|
@@ -542,7 +542,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
}
|
|
|
//删除缓存中的订单
|
|
|
deleteTheCacheInTheCacheManager(orders.getEmail() + "-" + orders.getProductId() + "-" + orders.getPayment());
|
|
|
- deleteTheCacheInTheCacheManager(orders.getUserId() + "-" + orders.getProductId() + "-" + orders.getPayment());
|
|
|
+ // 会员订单,通过userId
|
|
|
+ deleteTheCacheInTheCacheManager(orders.getUserId() + "-" + orders.getProductId() + "-" + orders.getPayment() + "-" + orders.getPayNumber());
|
|
|
// 检查订单优惠券
|
|
|
productApi.refundCouponByOrderId(orderId);
|
|
|
}
|
|
@@ -553,7 +554,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
if(CollectionUtils.isEmpty(orderByUser)){
|
|
|
return;
|
|
|
}
|
|
|
- log.info("关闭用户相同订单:{}", orderByUser);
|
|
|
+ log.info("关闭会员用户相同订单:{}", orderByUser);
|
|
|
for (OrdersVO orders : orderByUser) {
|
|
|
log.info("当前订单信息:{}", orders);
|
|
|
if (ObjectUtils.isNotEmpty(orders.getStatus()) && orders.getStatus().equals(OrderConstant.CREATED)) {
|
|
@@ -563,8 +564,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
this.baseMapper.updateById(order);
|
|
|
}
|
|
|
//删除缓存中的订单
|
|
|
- deleteTheCacheInTheCacheManager(orders.getEmail() + "-" + orders.getProductId() + "-" + orders.getPayment());
|
|
|
- deleteTheCacheInTheCacheManager(orders.getUserId() + "-" + orders.getProductId() + "-" + orders.getPayment());
|
|
|
+ deleteTheCacheInTheCacheManager(orders.getUserId() + "-" + orders.getProductId() + "-" + orders.getPayment() + "-" + orders.getPayNumber());
|
|
|
// 检查订单优惠券
|
|
|
productApi.refundCouponByOrderId(orders.getId());
|
|
|
}
|