入机失败保存到remark

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -804,6 +804,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
             request.setOrderClient(OrderClientType.SAAS.getIndex());
             request.setCancelReason(cancelOrderRequest.getReason());
+            request.setReqRemark(request.getReqRemark());
             request.setAfterSalesReason(cancelOrderRequest.getReason());
             //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
             request.setCreateEvent(4);
@@ -822,6 +823,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
                     request.setAdultRemark(cancelOrderRequest.getReason());
                     request.setOperator(cancelOrderRequest.getOperator());
+                    request.setAdultRemark(cancelOrderRequest.getReqRemark());
                     com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, cancelOrderRequest.getTrackingNo());
                     return orderSdkAdapter.convent2BaseOrderResponse(response);
                 }

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

@@ -75,8 +75,15 @@ public class OrderManagerController {
         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));
+        if(StringUtils.isNotEmpty(reason)) {
+            if(reason.length() > 50) {
+                orderManagerRequest.setReason("");
+            }
+            if(reason.length() > 200) {
+                orderManagerRequest.setRemark(reason.substring(reason.length()-200));
+            } else {
+                orderManagerRequest.setRemark(reason);
+            }
         }
         McCafeOperateType byOpType = McCafeOperateType.getByOpType(request.getOperateType());
         if (byOpType==null){

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

@@ -59,4 +59,6 @@ public class OrderManagerRequest {
      * 麦咖啡专用
      */
     private String pickUpGoodsNo;
+
+    private String remark;
 }

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -162,6 +162,7 @@ public class SaasOrderHandle {
     public BaseResponse mcCafeOrderReject(OrderManagerRequest request, PayRefundResponse refundResponse, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //作废订单
         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
+        cancelOrderRequest.setReqRemark(request.getRemark());
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.mcCafeOrderReject(cancelOrderRequest, orderBean);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);