Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of…

Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -80,9 +80,9 @@ public class OrderManagerRequest {
     private Integer timeout;
 
     /**
-     * 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
+     * 售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一 9:订单宝
      */
-    private Integer operationClient = 0;
+    private Integer operationClient;
 
     /**
      * 品牌审核售后单　不传默认无需品牌审核

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

@@ -328,15 +328,21 @@ public class OrderVerifyHandle {
         if (!canAgreeRefundStatus.contains(orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
         }
-        if("pos".equals(request.getOperator())){
-            request.setOperationClient(1);
-        }else if("小助手".equals(request.getOperator())){
-            request.setOperationClient(2);
-        }else if("开发平台".equals(request.getOperator())){
-            request.setOperationClient(3);
-        }else if("自动任务".equals(request.getOperator())){
-            request.setOperationClient(4);
+        //兜底方案
+        if (request.getOperationClient() == null) {
+            if ("pos".equals(request.getOperator())) {
+                request.setOperationClient(1);
+            } else if ("小助手".equals(request.getOperator())) {
+                request.setOperationClient(2);
+            } else if ("开发平台".equals(request.getOperator())) {
+                request.setOperationClient(3);
+            } else if ("自动任务".equals(request.getOperator())) {
+                request.setOperationClient(4);
+            }else {
+                request.setOperationClient(0);
+            }
         }
+
         //门店发起退款，需要品牌审核，则小助手不能发同意退款
         if(Objects.equals(AfterSalesType.STORE_CANCEL.getIndex(),orderBean.getAfterSalesOrderResp().getAfterSalesType())){
             //售后渠道 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一