修改支付接口

ms-biz/src/main/java/com/ms/biz/service/DsApiService.java

@@ -20,7 +20,7 @@ public interface DsApiService {
     BatchAddDsPurchaseConfirmLogResponseDTO batchAddPurchaseConfirmLog(Long shopId, BatchAddPurchaseConfirmLogRequestDTO request);
     CommonResponseDTO cancelPurchaseOrderRelate(String platform, Long shopId, String orderId, List<Long> skuIds);
     CommonResponseDTO cancelPurchaseOrder(String platform, Long shopId, String orderId, String purchaseOrderSn);
-    GetPurchaseOrderPayUrlResponseDTO getPurchaseOrderPayUrl(List<String> sourceOrderId, Long shopId);
+    GetPurchaseOrderPayUrlResponseDTO getPurchaseOrderPayUrl(Long shopId, List<String> sourceOrderIds, String payPlatformType);
     GetPlatformAuthUrlResponseDTO getPlatformAuthUrl(ShopBO shopBO);
     GetSourceItemInfosResponseDTO getSourceItemInfos(Long shopId, List<String> sourceItemIds);
     GetAuthInfoResponseDTO getAuthInfo(Long shopId);

ms-biz/src/main/java/com/ms/biz/service/impl/DistributionOrderServiceImpl.java

@@ -472,24 +472,28 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
         List<PaymentResult> paymentResults = new ArrayList<>();
         for (BatchPayParam.Param p: param.getParams()) {
-            GetPurchaseOrderPayUrlResponseDTO response = dsApiService.getPurchaseOrderPayUrl(Collections.singletonList(purchaseOrder.getPurchaseOrderSn()), p.getShopId());
+            List<String> sourceOrderIds = Collections.singletonList(purchaseOrder.getPurchaseOrderSn());
-            if (response.isSuccess()) {
+            GetPurchaseOrderPayUrlResponseDTO response1 = dsApiService.getPurchaseOrderPayUrl(p.getShopId(), sourceOrderIds, "PC");
-                PaymentResult paymentResult = new PaymentResult();
+            GetPurchaseOrderPayUrlResponseDTO response2 = dsApiService.getPurchaseOrderPayUrl(p.getShopId(), sourceOrderIds, "WIRELESS");
-                PaymentResult.PayUrl payUrl = new PaymentResult.PayUrl();
+            if (!response1.isSuccess()) {
-                payUrl.setH5Url(response.getPayUrl());
+                throw new RuntimeException(response1.getReason());
-                payUrl.setPcUrl(response.getPayUrl());
-
-                paymentResult.setPayUrl(payUrl);
-                paymentResult.setPurOrderId(p.getPurOrderId());
-                paymentResults.add(paymentResult);
-
-                platformPurchaseOrder.setPayPcUrl(response.getPayUrl());
-                platformPurchaseOrder.setPayH5Url(response.getPayUrl());
-                platformPurchaseOrderMapper.updateByPrimaryKeySelective(platformPurchaseOrder);
-
-            } else {
-                throw new RuntimeException(response.getReason());
             }
+            if (!response2.isSuccess()) {
+                throw new RuntimeException(response2.getReason());
+            }
+            PaymentResult paymentResult = new PaymentResult();
+            PaymentResult.PayUrl payUrl = new PaymentResult.PayUrl();
+
+            payUrl.setPcUrl(response1.getPayUrl());
+            payUrl.setH5Url(response2.getPayUrl());
+
+            paymentResult.setPayUrl(payUrl);
+            paymentResult.setPurOrderId(p.getPurOrderId());
+            paymentResults.add(paymentResult);
+
+            platformPurchaseOrder.setPayPcUrl(response1.getPayUrl());
+            platformPurchaseOrder.setPayH5Url(response2.getPayUrl());
+            platformPurchaseOrderMapper.updateByPrimaryKeySelective(platformPurchaseOrder);
         }
         data.setPaymentResults(paymentResults);
     }

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

@@ -103,11 +103,12 @@ public class DsApiServiceImpl implements DsApiService {
     }
 
     @Override
-    public GetPurchaseOrderPayUrlResponseDTO getPurchaseOrderPayUrl(List<String> sourceOrderId, Long shopId) {
+    public GetPurchaseOrderPayUrlResponseDTO getPurchaseOrderPayUrl(Long shopId, List<String> sourceOrderIds, String payPlatformType) {
         OperateInfoDTO operateInfo = createOperateInfo(shopId);
         Map<String, Object> params = new HashMap<>();
-        params.put("sourceOrderId", sourceOrderId);
+        params.put("sourceOrderId", sourceOrderIds);
         params.put("operateInfo", operateInfo);
+        params.put("payPlatformType", payPlatformType);
         String resp = execute("/order/getPurchaseOrderPayUrl", params);
         return JSON.parseObject(resp, GetPurchaseOrderPayUrlResponseDTO.class);
     }