入机失败原因

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

 package cn.freemud.management.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.order.McCafeOrderManagerRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.enums.McCafeOperateType;
 import cn.freemud.management.enums.OperateType;
@@ -11,6 +12,8 @@ import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -68,16 +71,22 @@ public class OrderManagerController {
     @ApiAnnotation(logMessage = "麦咖啡订单入机")
     @ApiOperation(value = "麦咖啡订单入机", notes = "麦咖啡订单入机", produces = "application/json")
     @PostMapping("/mcCafe/statusOperate")
-    public BaseResponse mcCafeDeliveryCreate(@Validated @LogParams @RequestBody OrderManagerRequest request) {
+    public BaseResponse mcCafeDeliveryCreate(@Validated @LogParams @RequestBody McCafeOrderManagerRequest request) {
+        OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
+        BeanUtils.copyProperties(request, orderManagerRequest);
+        String reason = request.getReason();
+        if(StringUtils.isNotEmpty(reason) && reason.length() > 50) {
+            orderManagerRequest.setReason(reason.substring(reason.length() - 50));
+        }
         McCafeOperateType byOpType = McCafeOperateType.getByOpType(request.getOperateType());
         if (byOpType==null){
             return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }
         switch (byOpType) {
             case ORDER_SUCCESS:
-                return orderManagerAdapter.orderConfirmTake(request);
+                return orderManagerAdapter.orderConfirmTake(orderManagerRequest);
             case ORDER_REFUND:
-                return orderManagerAdapter.orderReject(request);
+                return orderManagerAdapter.orderReject(orderManagerRequest);
             default:
                 return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }

order-management/src/main/java/cn/freemud/management/entities/dto/request/order/McCafeOrderManagerRequest.java

-/*
 package cn.freemud.management.entities.dto.request.order;
 
 import cn.freemud.management.enums.OperateType;
@@ -9,56 +8,54 @@ import javax.validation.constraints.Size;
 
 @Data
 public class McCafeOrderManagerRequest {
-
-    */
-/**
+    /**
      * 商户号
-     *//*
-
+     */
     @NotEmpty(message = "商户号不允许为null")
     private String partnerId;
 
-    */
-/**
+    /**
      * 门店号
-     *//*
-
+     */
     private String storeId;
 
-    */
-/**
-     * 取餐码
-     *//*
-
-    private String pickUpGoodsNo;
-
-    */
-/**
+    /**
      * 订单号
-     *//*
-
+     */
     @NotEmpty(message = "订单号不允许为nul")
     private String orderId;
 
-    */
-/**
+    /**
+     * 退款原因
+     */
+    private String reason;
+
+    /**
+     * 退款原因code
+     * 用于平台外卖（美团、饿了么）
+     */
+    private Integer reason_code;
+
+    /**
      * 订单操作类型
      * @see OperateType
-     *//*
-
+     */
     @NotEmpty(message = "操作类型不能为空")
     private String operateType;
 
-    */
-/**
+    /**
      * 操作人
      * pos
      * 开放平台
      * 小助手
      * 系统自动履单
-     *//*
-
+     */
     @NotEmpty(message = "操作人不能为空")
     private String operator;
+
+    /**
+     * 取餐码
+     * 麦咖啡专用
+     */
+    private String pickUpGoodsNo;
 }
-*/