yh

ms-biz/src/main/java/com/ms/api/service/impl/DsApiServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ms.api.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.ms.api.consts.CommonConst;
 import com.ms.api.dto.dsapi.request.*;
 import com.ms.api.dto.dsapi.response.*;
 import com.ms.api.service.DsApiService;
@@ -35,7 +36,7 @@ public class DsApiServiceImpl implements DsApiService {
 
     @Override
     public BatchCreateDistributionOrdersResponseDTO batchCreateDistributionOrders(Long shopId, BatchCreateDistributionOrdersRequestDTO request) {
-        request.setPlatform("dd");
+        request.setPlatform(CommonConst.PLATFORM);
         request.setOperateInfo(createOperateInfo(shopId));
         for (PlatformOrderDTO platformOrder: request.getPlatformOrders()) {
             platformOrder.setShopId(SecurityTool.encodeByAES(String.valueOf(shopId)));
@@ -61,7 +62,7 @@ public class DsApiServiceImpl implements DsApiService {
 
     @Override
     public BatchAddDsPurchaseConfirmLogResponseDTO batchAddPurchaseConfirmLog(Long shopId, BatchAddPurchaseConfirmLogRequestDTO request) {
-        request.setPlatform("dd");
+        request.setPlatform(CommonConst.PLATFORM);
         request.setUserId(SecurityTool.encodeByAES(String.valueOf(shopId)));
         request.setOperateInfo(createOperateInfo(shopId));
         for (PlatformOrderDTO platformOrder: request.getPlatformOrders()) {

ms-biz/src/main/java/com/ms/api/service/impl/OpOrderDsServiceImpl.java

@@ -158,7 +158,7 @@ public class OpOrderDsServiceImpl implements OpOrderDsService {
         if (opOrderDs == null) {
             throw new RuntimeException("分销订单不存在");
         }
-        updateOpOrderDsFilterStatus(opOrder.getOrderId(), "dd");
+        updateOpOrderDsFilterStatus(opOrder.getOrderId(), PurchaseOrderConst.PURCHASE_PLATFORM1688_D_S);
     }
 
     @Override

ms-biz/src/main/java/com/ms/api/spi/order/SaveDsManualSelectedSkuService.java

@@ -7,6 +7,7 @@ import com.jinritemai.cloud.base.api.ExtensionServiceHandler;
 import com.ms.api.common.R;
 import com.ms.api.common.Ret;
 import com.ms.api.common.SPIBaseService;
+import com.ms.api.consts.CommonConst;
 import com.ms.api.dto.dsapi.request.OperateInfoDTO;
 import com.ms.api.dto.dsapi.request.SavePlatformManualSelectedSkuRequestDTO;
 import com.ms.api.dto.dsapi.response.CommonResponseDTO;
@@ -31,7 +32,7 @@ public class SaveDsManualSelectedSkuService extends SPIBaseService implements Ex
             dto.setPlatformItemId(SecurityTool.encodeByAES(dto.getPlatformItemId()));
             dto.setUserId(shopId);
             dto.setOperateInfo(new OperateInfoDTO(shopId));
-            dto.setPlatform("dd");
+            dto.setPlatform(CommonConst.PLATFORM);
             CommonResponseDTO responseDTO = dsApiService.saveDsManualSelectedSku(dto);
             if (!responseDTO.isSuccess()) {
                 throw new RuntimeException(responseDTO.getReason());

ms-biz/src/main/java/com/ms/api/util/PurchaseOrderUtil.java

@@ -12,10 +12,7 @@ import com.ms.api.bo.MatchSourceSkuInfoResultBO;
 import com.ms.api.bo.OrderItemSkuInfoBO;
 import com.ms.api.common.ApiResult;
 import com.ms.api.common.MSException;
-import com.ms.api.consts.DsOrderConst;
-import com.ms.api.consts.OrderConst;
-import com.ms.api.consts.PurchaseOrderConst;
-import com.ms.api.consts.StatusConst;
+import com.ms.api.consts.*;
 import com.ms.api.dto.dsapi.request.*;
 import com.ms.api.dto.dsapi.response.BatchCreateDistributionOrdersResponseDTO;
 import com.ms.api.dto.dsapi.response.DsErrorRetDTO;
@@ -338,7 +335,7 @@ public class PurchaseOrderUtil {
             GetPurchaseOrderItemsAndSourceItemsRequestDTO requestParams = new GetPurchaseOrderItemsAndSourceItemsRequestDTO();
             List<String> shopIds = new ArrayList<>();
             shopIds.add(SecurityTool.encodeByAES(String.valueOf(orderInfo.getShopId())));
-            requestParams.setPlatform("dd");
+            requestParams.setPlatform(CommonConst.PLATFORM);
             requestParams.setShopIds(shopIds);
             requestParams.setPlatformItemIds(productIds);
             requestParams.setPlatformOrderIds(null);