取消类型修改

lb-app/src/main/java/com/ydd/app/service/impl/OpenApiOrderServiceImpl.java

@@ -244,12 +244,12 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
                     if (size != null) {
                         for (long i = 0; i < size; i++) {
                             OrderResultVo vo = (OrderResultVo) redisTemplate.opsForList().rightPop(order.getOrderSn() + "_cancel");
-                            responseResult = cancelThirdOrder(order, vo.getDeliveryId(), count, vo.getAptOrderId(), vo.getPhone(), null, cancelReq.getCancelReason());
+                            responseResult = cancelThirdOrder(order, vo.getDeliveryId(), count, vo.getAptOrderId(), vo.getPhone(), OrderCancelTypeEnum.MERCHANT_CANCEL.getType(), cancelReq.getCancelReason());
                         }
                     }
                 } else if (order.getDeliveryStatus().intValue() >= DeliveryStatusEnum.TO_BE_DELIVERED.status.intValue()) {
                     cancelOrder(order, cancelReq.getCancelReason(), orderStatus);
-                    responseResult = cancelThirdOrder(order,order.getDeliveryId(),count,order.getAptOrderId(),order.getAptPhone(),null,order.getCancelReason());
+                    responseResult = cancelThirdOrder(order,order.getDeliveryId(),count,order.getAptOrderId(),order.getAptPhone(),OrderCancelTypeEnum.MERCHANT_CANCEL.getType(),order.getCancelReason());
                 } else if (order.getDeliveryStatus().intValue() == DeliveryStatusEnum.ORDERS_TO_BE_BILLED.status.intValue()) {
                     cancelOrder(order, cancelReq.getCancelReason(), orderStatus);
                 } else if (order.getDeliveryStatus().equals(DeliveryStatusEnum.ORDERS_TO_BE_RECEIVED.status)) {
@@ -257,7 +257,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
                     List<OrderDelivery> list = iOrderDeliveryService.list(new QueryWrapper<OrderDelivery>().eq("order_sn", order.getOrderSn()).ne("delivery_id",19).ge("delivery_status",DeliveryStatusEnum.ORDERS_TO_BE_RECEIVED.status));
                     if(CollectionUtils.isNotEmpty(list)){
                         for(OrderDelivery orderDelivery:list){
-                            responseResult = cancelThirdOrder(order,orderDelivery.getDeliveryId(),count,null,null,null,cancelReq.getCancelReason());
+                            responseResult = cancelThirdOrder(order,orderDelivery.getDeliveryId(),count,null,null,OrderCancelTypeEnum.MERCHANT_CANCEL.getType(),cancelReq.getCancelReason());
                         }
                     }
                 }
@@ -371,7 +371,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
 
         CancelOrderDto dto = new CancelOrderDto();
         dto.setOrderSn(orderNo);
-        dto.setReason(OrderCancelTypeEnum.getNameByType(cancelType));
+        dto.setReason(OrderCancelTypeEnum.MERCHANT_CANCEL.getName());
         dto.setCancelCode(cancelType);
         dto.setCancenlResonMsg(cancenlResonMsg);
         dto.setOutTradeNo(outTradeNo);