Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of…

Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

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

@@ -1791,6 +1791,7 @@ public class OrderSdkAdapter {
         return orderStatus;
     }
 
+    @Deprecated //使用订单枚举OrderStatusV1装换
     public Integer getNewOrderStatus(Integer orderStatus) {
         if (orderStatus == null) {
             return null;

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

@@ -3639,9 +3639,7 @@ public class OrderAdapter {
         if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) {
             List<Integer> orderStatus = new ArrayList<>();
             for (Integer orderStatuses : queryOrdersDto.getOrderStatuses()) {
-//                OrderStatusV1.getNewCode(orderStatuses);
-//                orderStatus.add(orderSdkAdapter.getNewOrderStatus(orderStatuses));
-                orderStatus.add(this.getNewOrderStatus(orderStatuses));
+                orderStatus.add(OrderStatusV1.getNewCode(orderStatuses));
             }
             queryOrdersDto.setOrderStatuses(orderStatus);
         }
@@ -3973,34 +3971,5 @@ public class OrderAdapter {
         return true;
     }
 
-    public Integer getNewOrderStatus(Integer orderStatus) {
-        if (orderStatus == null) {
-            return null;
-        }
-        //新订单服务 订单状态 1:待支付 2:下单 3:已接单 4:制作完成(待发货) 5:配送中 6:已完 7:已关闭
-        switch (orderStatus) {
-            case 1:
-                orderStatus = 2;
-                break;
-            case 2:
-                orderStatus = 1;
-                break;
-            case 4:
-                orderStatus = 5;
-                break;
-            case 5:
-                orderStatus = 6;
-                break;
-            case 6:
-                orderStatus = 7;
-                break;
-            case 31:
-                orderStatus = 4;
-                break;
-            default:
-                break;
-        }
-        return orderStatus;
-    }
 
 }

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

@@ -38,6 +38,7 @@ import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
@@ -427,7 +428,7 @@ public class SaasMallOrderService extends UniversalOrderService {
         request.setThirdOrderCode(requestVO.getThirdOrderCode());
         request.setPayChannelType(requestVO.getPayChannelType());
         if (requestVO.getOrderStatus() != null) {
-            request.setOrderState(orderSdkAdapter.getNewOrderStatus(requestVO.getOrderStatus().getCode()));
+            request.setOrderState(OrderStatusV1.getNewCode((requestVO.getOrderStatus().getCode())));
         }
         if (requestVO.getPayStatus() != null) {
             request.setPayState(requestVO.getPayStatus().getCode());