Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop

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

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

@@ -3782,7 +3782,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);
@@ -3790,6 +3789,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

@@ -210,7 +210,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

@@ -156,6 +156,7 @@ import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
 public class OrderServiceImpl implements Orderservice {
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
+
     private static Gson gson = new Gson();
 
     @Value("${saas.reverseNotifyiDcUrl}")
@@ -324,7 +325,8 @@ public class OrderServiceImpl implements Orderservice {
         ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
         // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
-        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
+
         boolean svcPay = checkOrder.checkSvcPay(createOrderVo, shoppingCartGoodsDto, trackingNo);
         //1.9.2套餐需求同步优化创建订单代码
         BaseResponse createOrderOperateDtoResponse = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
@@ -359,7 +361,7 @@ public class OrderServiceImpl implements Orderservice {
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
         //1.5.4版本，商品库存校验与扣库存
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
-        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
+        OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
         //下单并支付
         return this.createOrderAndPay(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto, extInfo);
     }
@@ -614,7 +616,20 @@ public class OrderServiceImpl implements Orderservice {
         message.setPlatformMchId(newMessage.getPlatformMchId());
         message.setTerminalId(newMessage.getAppId());
         message.setRuleId(newMessage.getRuleId());
-        return orderAdapterService.paySuccessCallback(message);
+        String res = orderAdapterService.paySuccessCallback(message);
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        if (jsonObject.containsKey("code")) {
+            Integer code = (Integer) jsonObject.get("code");
+            if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
+                log.info("调用券码核销=="+newMessage.getTransId());
+                verificationCoupon(newMessage.getTransId());
+                log.info("调用券码结束=="+newMessage.getTransId());
+                return newSendPaySuccessNoticeMessage();
+            } else {
+                return newSendPayFaileMessage();
+            }
+        }
+        return newSendPayFaileMessage();
     }
 
     private BaseResponse verificationCoupon(String transId){
@@ -1681,7 +1696,6 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
                 cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
-//                cancelOrderRequest.setAfterSalesReason(orderRefundVo.getReason());
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
@@ -1733,7 +1747,6 @@ public class OrderServiceImpl implements Orderservice {
         }
         cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
         cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
-//        cancelOrderRequest.setAfterSalesReason(orderRefundVo.getReason());
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
         if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
@@ -3218,9 +3231,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();
@@ -3238,7 +3250,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);
@@ -3253,14 +3265,14 @@ public class OrderServiceImpl implements Orderservice {
                     orderPayResponse.setPartnerId(createPrepayRequestDto.getPartnerId());
                     orderPayResponse.setOrderId(createPrepayRequestDto.getTransId());
 
-                    /**
-                     * 加入轮训队列
-                     */
-                    //putDelMq(createPrepayRequestDto.getPartnerId()
-                    //        , createPrepayRequestDto.getStoreId()
-                    //        , orderPayResponse.getFmId()
-                    //        ,createPrepayRequestDto.getTransId()
-                    //        , PayChannelType.getByEbcode(payPlatform.getEbCode()).getIndex().intValue());
+                    //隐射关系
+                    redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(createPrepayRequestDto.getTransId()),payPlatform.getTransId(),1L,TimeUnit.DAYS);
+                    //加入轮训队列
+                    putDelMq(createPrepayRequestDto.getPartnerId()
+                            , createPrepayRequestDto.getStoreId()
+                            , orderPayResponse.getFmId()
+                            , createPrepayRequestDto.getTransId()
+                            , PayChannelType.getByEbcode(payPlatform.getEbCode()).getIndex().intValue());
 
                 }
             }