fix:补充完整信息

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

@@ -3505,8 +3505,7 @@ public class OrderAdapter {
             , String orderClient
             , String channel
             , Integer totalAmount
-            , Integer svcAmount
-            , Integer svcVAmount) {
+            , Integer svcAmount) {
         CombPayRequest orderPayDto = new CombPayRequest();
         orderPayDto.setEbCode(paymentRequest.getPayCode());
         orderPayDto.setPartner_id(orderBean.getCompanyId());
@@ -3537,7 +3536,7 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productVOS);
         List<PayPlatformVO> platforms = new ArrayList<>();
-        Long svc = svcAmount.longValue()+svcVAmount.longValue();
+        Long svc = svcAmount.longValue();
         PayPlatformVO payPlatformVO = new PayPlatformVO();
         payPlatformVO.setClientCode(PayChannelType.SVC.getEbcode());
         payPlatformVO.setEbcode(PayChannelType.SVC.getEbcode());
@@ -3562,7 +3561,11 @@ public class OrderAdapter {
      * @param payPlatforms
      * @return
      */
-    public OrderPayResponse convent2OrderCombPayResponse(List<CombPayResponse.PayPlatform> payPlatforms,String partnerId) {
+    public OrderPayResponse convent2OrderCombPayResponse(List<CombPayResponse.PayPlatform> payPlatforms
+            ,String partnerId
+            ,String storeId
+            ,Integer totalAmount
+            ,Integer svcAmount) {
         CombPayResponse.PayPlatform payPlatform = payPlatforms
                 .stream()
                 .filter(f -> !PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
@@ -3587,13 +3590,21 @@ public class OrderAdapter {
             responseDto.setPayOrder(payBean);
         }
         //供修改订单
+        Integer cashAmount = totalAmount - svcAmount;
         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.setPayChannelName(PayChannelType.getByEbcode(pt.getEbCode()).getName());
             payItem.setTransId(pt.getTransId());
             payItem.setPartnerId(partnerId);
+            if (pt.getEbCode().equals(PayChannel.SVC.getCode())) {
+                payItem.setPayAmount(new BigDecimal(svcAmount));
+            }
+            else {
+                payItem.setPayAmount(new BigDecimal(cashAmount));
+            }
             responseDto.getPayItem().add(payItem);
         }
         return responseDto;

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

@@ -3199,7 +3199,7 @@ public class OrderServiceImpl implements Orderservice {
             return orderPayResponse;
         }
 
-        CombPayRequest combPayRequest = orderAdapter.convent2CombPayOrderRequest(cardNo, orderBean, paymentRequest, partnerPayOvertime, ebCode, channel, totalAmount, svcAmount, svcVAmount);
+        CombPayRequest combPayRequest = orderAdapter.convent2CombPayOrderRequest(cardNo, orderBean, paymentRequest, partnerPayOvertime, ebCode, channel, totalAmount, svcAmount+svcVAmount);
         CombPayResponse combPayResponse = comPayClient.combPay(combPayRequest, combPayRequest.getPartner_id());
         if (!ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(combPayResponse.getCode())|| combPayResponse.getData().getPayPlatformResponseList().size()==0) {
             log.info("混合支付返回信息错误,trackingNo:{} request:{} response:{}",trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(combPayResponse));
@@ -3215,7 +3215,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setMsg("支付:现金支付错误");
             return orderPayResponse;
         }
-        orderPayResponse = orderAdapter.convent2OrderCombPayResponse(combPayResponse.getData().getPayPlatformResponseList(),orderBean.getCompanyId());
+        orderPayResponse = orderAdapter.convent2OrderCombPayResponse(combPayResponse.getData().getPayPlatformResponseList(),orderBean.getCompanyId(),storeId,totalAmount, svcAmount+svcVAmount);
         orderPayResponse.setOpenId(paymentRequest.getOpenId());
         orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
         orderPayResponse.setPartnerId(orderBean.getCompanyId());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/PayItem.java

@@ -3,6 +3,8 @@ package com.freemud.application.sdk.api.ordercenter.entities;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -26,4 +28,6 @@ public  class PayItem {
     private String outOrderNo;
     private String platformTradeNo;
     private String endTransTradeNo;
+    private String storeId;
+    private BigDecimal payAmount;
 }