add#交易序列号和订单号对照

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.20201109-SNAPSHOT</version>
+            <version>2.4.4-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.21110-SNAPSHOT</version>
+            <version>2.1.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -44,7 +44,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @EnableSwagger2
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud", "com.freemud"})
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",

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

@@ -3534,7 +3534,6 @@ public class OrderAdapter {
         orderPayDto.setBody(paymentRequest.getPrincipalName());
         orderPayDto.setNotify_url(paymentRequest.getReverseNotifyiDcUrl());
         orderPayDto.setStore_id(createPrepayRequestDto.getStoreId());
-        //orderPayDto.setStore_id("999999998");
         orderPayDto.setOpen_id(paymentRequest.getOpenId());
         String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
         orderPayDto.setBusiness_date(businessDate);
@@ -3542,6 +3541,7 @@ public class OrderAdapter {
         orderPayDto.setVip_amount(0L);
         orderPayDto.setAppId(paymentRequest.getWxAppId());
         orderPayDto.setPayCode(paymentRequest.getPayCode());
+        orderPayDto.setVer("V1");
         orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
         List<ProductVO> productVOS = new ArrayList<ProductVO>();
         if (CollectionUtils.isNotEmpty(createPrepayRequestDto.getFatherOrderBean().getProductList())) {

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

@@ -177,7 +177,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         }
         try {
             ConfirmOrderDto confirmOrderDto = orderAdapter.convent2ConfirmOrderDto(message);
-            // 蜜雪专用：通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
+            // 蜜雪+混合支付专用：通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
             String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(confirmOrderDto.getOrderId()));
             if (StringUtils.isNotBlank(orderId)) {
                 log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);

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

@@ -3202,9 +3202,8 @@ public class OrderServiceImpl implements Orderservice {
         OrderPayResponse orderPayResponse = null;
         CombPayResponse responseBase      = null;
         CombPayRequest combPayRequest      = null;
+        CombPayResponse.PayPlatform payPlatform = null;
         try {
-
-
             String orderClient = this.getPayCodeByChanel(createPrepayRequestDto);
             if (StringUtils.isBlank(orderClient)) {
                 orderPayResponse = new OrderPayResponse();
@@ -3222,7 +3221,7 @@ public class OrderServiceImpl implements Orderservice {
                 /**
                  * 生成预支付参数
                  */
-                CombPayResponse.PayPlatform payPlatform = responseBase.getData().getPayPlatformResponseList()
+                payPlatform = responseBase.getData().getPayPlatformResponseList()
                         .stream()
                         .filter(f -> !PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
                         .orElse(null);
@@ -3237,9 +3236,9 @@ public class OrderServiceImpl implements Orderservice {
                     orderPayResponse.setPartnerId(createPrepayRequestDto.getPartnerId());
                     orderPayResponse.setOrderId(createPrepayRequestDto.getTransId());
 
-                    /**
-                     * 加入轮训队列
-                     */
+                    //隐射关系
+                    redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(createPrepayRequestDto.getTransId()),payPlatform.getTransId(),1L,TimeUnit.DAYS);
+                    //加入轮训队列
                     putDelMq(createPrepayRequestDto.getPartnerId()
                             , createPrepayRequestDto.getStoreId()
                             , orderPayResponse.getFmId()