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

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

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

@@ -2357,7 +2357,11 @@ public class OrderServiceImpl implements Orderservice {
         }
         if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
             createOrderResponse.setPaySuccess(false);
-        } else {
+        }
+        else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
+            createOrderResponse.setPaySuccess(false);
+        }
+        else {
             createOrderResponse.setPaySuccess(true);
         }
         // 推荐优惠插件用户下单数据上报
@@ -3282,7 +3286,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));
@@ -3298,7 +3302,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;
 }