取消订单退款状态和渠道对接

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -63,11 +63,6 @@ public class CancelOrderRequest extends BaseConfig {
      */
     private Integer createEvent;
 
-    /**
-     * 售后退款状态 0:未定义（存量数据） 1:未退款 2:退款中 3:退款失败 4:已退款
-     */
-    private Integer refundState;
-
     private Integer orderClient= OrderClientType.SAAS.getIndex();
 
     //操作人
@@ -85,6 +80,16 @@ public class CancelOrderRequest extends BaseConfig {
     private Integer statusV2;
 
     /**
+     * 操作来源客户端 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
+     */
+    private Integer operationClient;
+
+    /**
+     * 售后退款状态 0:未定义（存量数据） 1:未退款 2:退款中 3:退款失败 4:已退款
+     */
+    private Integer refundState;
+
+    /**
      * 售后单拓展信息
      */
     private AfterSalesOrderExtInfoReq extInfoReq;

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

@@ -886,6 +886,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setOrderTask(orderTask);
         }
         request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount());
+        request.setRefundState(cancelOrderRequest.getRefundState());
+        request.setOperationClient(cancelOrderRequest.getOperationClient());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2228,8 +2228,11 @@ public class OrderAdapter {
         cancelOrderRequest.setReason(reason);
         cancelOrderRequest.setTrackingNo(trackingNo);
         cancelOrderRequest.setRefundSerialNo(refundId);
+        //操作来源客户端 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
+        cancelOrderRequest.setOperationClient(5);
         if (AfterSalesType.SYSTEM_CANCEL.getIndex().equals(afterSalesType.getIndex())) {
             cancelOrderRequest.setOperator("admin");
+            cancelOrderRequest.setOperationClient(6);
         }
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         cancelOrderRequest.setCreateEvent(4);

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2048,6 +2048,8 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
                 cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
+                cancelOrderRequest.setRefundState(1);
+                cancelOrderRequest.setOperationClient(5);
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
@@ -2089,12 +2091,13 @@ public class OrderServiceImpl implements Orderservice {
                 partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
         cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
-
+        cancelOrderRequest.setRefundState(4);
         if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
             //退款成功
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
         } else if (Objects.equals(PayRefundStatus.RUNNING.getCode(), state)) {
             cancelOrderRequest.setCreateEvent(null);
+            cancelOrderRequest.setRefundState(2);
         }else {
             // 其他退款失败的情况 不生成售后单
             return ResponseUtil.error(ResponseResult.MULTIORDER__ERRORREFUND.getCode(), "multiOrderRefund_failed");