取消订单增加取消类型

lb-app/src/main/java/com/ydd/app/dto/OrderCancelReq.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -33,7 +34,14 @@ public class OrderCancelReq extends BaseDto implements Serializable {
     private String orderSn;
 
     /**
-     * 订单备注
+     * 取消类型
+     */
+    @NotNull(message = "取消类型不能为空")
+    @ApiModelProperty(required = true, value = "取消类型：1->商家取消，4->用户取消")
+    private Integer cancelType;
+
+    /**
+     * 取消原因
      */
     @NotBlank(message = "取消原因不能为空")
     @Size(max = 200, message = "取消原因不能超过200个字符")

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(), OrderCancelTypeEnum.MERCHANT_CANCEL.getType(), cancelReq.getCancelReason());
+                            responseResult = cancelThirdOrder(order, vo.getDeliveryId(), count, vo.getAptOrderId(), vo.getPhone(), cancelReq.getCancelType(), 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(),OrderCancelTypeEnum.MERCHANT_CANCEL.getType(),order.getCancelReason());
+                    responseResult = cancelThirdOrder(order,order.getDeliveryId(),count,order.getAptOrderId(),order.getAptPhone(), cancelReq.getCancelType(),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,OrderCancelTypeEnum.MERCHANT_CANCEL.getType(),cancelReq.getCancelReason());
+                            responseResult = cancelThirdOrder(order,orderDelivery.getDeliveryId(),count,null,null, cancelReq.getCancelType(),cancelReq.getCancelReason());
                         }
                     }
                 }
@@ -371,7 +371,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
 
         CancelOrderDto dto = new CancelOrderDto();
         dto.setOrderSn(orderNo);
-        dto.setReason(OrderCancelTypeEnum.MERCHANT_CANCEL.getName());
+        dto.setReason(OrderCancelTypeEnum.getNameByType(cancelType));
         dto.setCancelCode(cancelType);
         dto.setCancenlResonMsg(cancenlResonMsg);
         dto.setOutTradeNo(outTradeNo);