|
@@ -232,6 +232,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
|
|
|
|
|
|
|
Order order = iOrderService.selectOrderBySn(cancelReq.getOrderSn(), cancelReq.getOutOrderSn());
|
|
|
+ order.setCancelType(cancelReq.getCancelType());
|
|
|
|
|
|
if (Objects.isNull(order)) {
|
|
|
return ResponseResult.error(ResponseResultCodeEnum.ORDER_NOT_EXIST);
|
|
@@ -253,6 +254,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
|
|| order.getDeliveryStatus().equals(DeliveryStatusEnum.IN_DELIVERY.status);
|
|
|
if (flag) {
|
|
|
if (redisTemplate.hasKey(order.getOrderSn() + "_cancel")) {
|
|
|
+ cancelOrder(order, cancelReq.getCancelReason(), orderStatus);
|
|
|
Long size = redisTemplate.opsForList().size(order.getOrderSn() + "_cancel");
|
|
|
if (size != null) {
|
|
|
for (long i = 0; i < size; i++) {
|