填坑

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -136,6 +136,7 @@ public class OrderSdkAdapter {
         CancelOrderRequest var1 = new CancelOrderRequest();
         var1.setOrderId(orderBean.getOid());
         var1.setReason(reason);
+        var1.setOrderClient(Integer.parseInt(orderBean.getOrderClient()));
         var1.setPartnerId(orderBean.getCompanyId());
         if (orderBean.getRefundList() != null && orderBean.getRefundList().size() != 0) {
             //新订单服务需要售后单code

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

@@ -1035,13 +1035,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         AfterSalesOperateReq request = new AfterSalesOperateReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setPartnerId(baseQueryOrderRequest.getPartnerId());
-        // 这里是因为基础服务使用orderClient字段做了业务判断，之前写死的2， 现在要根据订单实际信息来传，但是无法确定直接使用订单的orderClient的影响有多大，
-        // 测试来不及回归，暂时只改动收银买单的情况
-        if (OrderClientType.CASHIER.getIndex().toString().equals(baseQueryOrderRequest.getOrderClient())) {
-            request.setOrderClient(OrderClientType.CASHIER.getIndex());
-        } else {
-            request.setOrderClient(OrderClientType.SAAS.getIndex());
-        }
+        request.setOrderClient(Integer.parseInt(baseQueryOrderRequest.getOrderClient()));
         request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
@@ -1068,7 +1062,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         AfterSalesOperateReq request = new AfterSalesOperateReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setPartnerId(baseQueryOrderRequest.getPartnerId());
-        request.setOrderClient(OrderClientType.SAAS.getIndex());
+        request.setOrderClient(Integer.parseInt(baseQueryOrderRequest.getOrderClient()));
         request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
@@ -1080,7 +1074,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public BaseOrderResponse orderRefundReject(CancelOrderRequest cancelOrderRequest) {
         AfterSalesOperateReq request = new AfterSalesOperateReq();
-        request.setOrderClient(OrderClientType.SAAS.getIndex());
+        request.setOrderClient(cancelOrderRequest.getOrderClient());
         request.setPartnerId(cancelOrderRequest.getPartnerId());
         request.setOrderCode(cancelOrderRequest.getOrderId());
         request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode());