Merge branch 'feature/2020-1104-混合支付' into qa

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

@@ -75,6 +75,7 @@ import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
 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.PayChannelType;
@@ -2373,29 +2374,6 @@ public class OrderServiceImpl implements Orderservice {
 
         boolean tigger = false;
         OrderPayResponse orderPayResponse = new OrderPayResponse();
-        /*
-        SVCCardAmountRequest svcRequest = new SVCCardAmountRequest();
-        svcRequest.setPartnerId(orderBean.getCompanyId());
-        svcRequest.setCardCodes(Arrays.asList(cardCode));
-        //查询svc卡余额
-        com.freemud.application.sdk.api.base.BaseResponse<SVCCardAmountResponse> svcCardAmount = paymentNewService.querySVCCardAmount(svcRequest, trackingNo);
-        if (svcCardAmount == null
-                || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(svcCardAmount.getCode())
-                || svcCardAmount.getData().getData() == null
-                || CollectionUtils.isEmpty(svcCardAmount.getData().getData().getCardSimpleInfos())) {
-
-            orderPayResponse.setMsg(Objects.isNull(svcCardAmount) ? "获取svc卡余额异常" : svcCardAmount.getMessage());
-            return orderPayResponse;
-        }
-
-        // 校验金额
-        Integer svcAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getAmount() ;
-        Integer svcVAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getVamount() ;
-        //todo : svc卡的金额小于订单金额
-        if(svcAmount + svcVAmount >0 && totalAmount> svcAmount + svcVAmount){
-            tigger = true;
-        }
-         */
         tigger = true;
         //混合支付
         if (tigger && StringUtils.isNotBlank(channel)) {
@@ -3362,6 +3340,17 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
             orderPayResponse.setPayMode(PayChannelType.SVC.getEbcode());
+            for (CombPayResponse.PayPlatform pt : payPlatforms) {
+                PayItem payItem = new PayItem();
+                payItem.setFmTradeNo(pt.getFmTradeNo());
+                payItem.setStoreId(storeId);
+                payItem.setPayChannelType(PayChannelType.getByEbcode(pt.getEbCode()).getIndex().intValue());
+                payItem.setPayChannelName(PayChannelType.getByEbcode(pt.getEbCode()).getName());
+                payItem.setTransId(pt.getTransId());
+                payItem.setPartnerId(combPayRequest.getPartner_id());
+                payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
+                orderPayResponse.getPayItem().add(payItem);
+            }
         }
 
         return  orderPayResponse;