混合支付Beta

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.2.21109-SNAPSHOT</version>
+    <version>2.2.21110-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.2002.SNAPSHOT</version>
+            <version>1.3.2003.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java

@@ -69,5 +69,6 @@ public class CombPayRequest {
     private String cardCode;
     private Boolean disable_service_goods_tag = false;
     private String request_source ="V1";
+    private String ver ="10";
 
 }

order-application-service/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-orderdistributor-sdk</artifactId>
-            <version>2.2.2-SNAPSHOT</version>
+            <version>2.2.2.20201109-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.2.21109-SNAPSHOT</version>
+            <version>2.2.21110-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -119,7 +119,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.1.1-SNAPSHOT</version>
+            <version>5.2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

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

@@ -51,10 +51,7 @@ import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
 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.OrderSettlementType;
-import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
@@ -3597,10 +3594,11 @@ public class OrderAdapter {
         payBean.setSign(payPlatform.getPaySign());
         payBean.setSignType(payPlatform.getPaySignType());
         payBean.setTimestamp(payPlatform.getTimestamp());
-        //payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
+        payBean.setAliPayOrder(payPlatform.getAliPayOrder());
         responseDto.setPayOrder(payBean);
         responseDto.setPayTransId(payPlatform.getTransId());
         responseDto.setFmId(payPlatform.getFmTradeNo());
+        //供修改订单
         for (CombPayResponse.PayPlatform pt : payPlatforms) {
             PayItem payItem = new PayItem();
             payItem.setFmTradeNo(pt.getFmTradeNo());

order-application-service/src/main/java/cn/freemud/entities/dto/pay/CombPayResponse.java

@@ -81,5 +81,7 @@ public class CombPayResponse {
 
         @ApiModelProperty(value = "间联单号")
         private String transId;
+        @ApiModelProperty(value = "支付宝秘钥参数")
+        private String aliPayOrder;
     }
 }

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

@@ -43,6 +43,7 @@ import com.freemud.application.sdk.api.membercenter.response.GetSvcInfoByMemberI
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
+import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;

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

@@ -76,6 +76,7 @@ import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 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;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
@@ -3142,7 +3143,7 @@ public class OrderServiceImpl implements Orderservice {
         }
 
         String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
-        orderPayResponse = comPayOrder(paymentRequest,createPrepayRequestDto,partnerPayOvertime);
+        orderPayResponse = comPayOrder(paymentRequest,createPrepayRequestDto,partnerPayOvertime,LogThreadLocal.getTrackingNo());
 
         if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
             return failPreOrderPay(LogThreadLocal.getTrackingNo()
@@ -3192,16 +3193,18 @@ public class OrderServiceImpl implements Orderservice {
      */
     private OrderPayResponse comPayOrder(PaymentRequest paymentRequest
             , CreatePrepayRequestDto createPrepayRequestDto
-            , String partnerPayOvertime) {
+            , String partnerPayOvertime
+            , String trackingNo) {
 
         OrderPayResponse orderPayResponse = null;
+        CombPayResponse responseBase      = null;
+        CombPayRequest combPayRequest      = null;
         try {
 
-            CombPayRequest request = orderAdapter.convent2CombPayOrderRequest(paymentRequest,createPrepayRequestDto,partnerPayOvertime);
-            CombPayResponse responseBase = comPayClient.combPay(request,request.getPartner_id());
-            if (!ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(responseBase.getCode())
-                    || responseBase.getData().getPayPlatformResponseList().size()==0) {
-                log.info("混合支付返回信息错误,trackingNo:{} request:{} response:{}", "", JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
+            combPayRequest = orderAdapter.convent2CombPayOrderRequest(paymentRequest,createPrepayRequestDto,partnerPayOvertime);
+            responseBase = comPayClient.combPay(combPayRequest,combPayRequest.getPartner_id());
+            if (!ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(responseBase.getCode())|| responseBase.getData().getPayPlatformResponseList().size()==0) {
+                log.info("混合支付返回信息错误,trackingNo:{} request:{} response:{}",trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(responseBase));
                 orderPayResponse = new OrderPayResponse();
                 orderPayResponse.setMsg(responseBase.getMsg());
             }
@@ -3225,7 +3228,7 @@ public class OrderServiceImpl implements Orderservice {
                     orderPayResponse.setOrderId(createPrepayRequestDto.getTransId());
 
                     /**
-                     * todo:加入轮训队列
+                     * 加入轮训队列
                      */
                     //putDelMq(createPrepayRequestDto.getPartnerId()
                     //        , createPrepayRequestDto.getStoreId()
@@ -3238,7 +3241,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         catch (Exception e) {
             //TODO 邮件告警
-            //LogUtil.error("comPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest), e);
+            LogUtil.error("comPay_error", JSONObject.toJSONString(responseBase), JSONObject.toJSONString(paymentRequest), e);
             orderPayResponse = new OrderPayResponse();
             orderPayResponse.setMsg("comPay_error");
         }

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.2002.SNAPSHOT</version>
+    <version>1.3.2003.SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

order-application-service/src/main/java/cn/freemud/enums/PayChannelType.java → ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java

-package cn.freemud.enums;
+package com.freemud.application.sdk.api.ordercenter.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;