Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' 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

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

@@ -2382,10 +2382,14 @@ public class OrderAdapter {
         return createOrder;
     }
 
+    public UnifiedOrderRequest convent2UnifiedOrderRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId) {
+        return convent2UnifiedOrderRequest(orderBean, paymentRequest, amount, cardAmount, transId, null);
+    }
+
     /**
      * 支付信息转换
      */
-    public UnifiedOrderRequest convent2UnifiedOrderRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId) {
+    public UnifiedOrderRequest convent2UnifiedOrderRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
         UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
         orderPayDto.setPartnerId(orderBean.getCompanyId());
         orderPayDto.setBody(paymentRequest.getPrincipalName());
@@ -2396,10 +2400,10 @@ public class OrderAdapter {
         String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
         orderPayDto.setBusinessDate(businessDate);
 //        orderPayDto.setAmount(amount);
-        orderPayDto.setAmount(1l);
         orderPayDto.setUndisAmount(1L);
         orderPayDto.setVipAmount(Long.valueOf(cardAmount));
         orderPayDto.setAppId(paymentRequest.getWxAppId());
+        orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
         List<UnifiedOrderRequest.ProductBean> productBeans = new ArrayList<UnifiedOrderRequest.ProductBean>();
         if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
             orderBean.getProductList().forEach(orderProductBean -> {

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

@@ -2132,7 +2132,8 @@ public class OrderServiceImpl implements Orderservice {
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         } else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
-            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId);
+            String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
+            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, partnerPayOvertime);
         } else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
             //svc卡支付
             orderPayResponse = svcPay(cardCode, createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo());
@@ -2236,10 +2237,10 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(), ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getMessage(), null);
     }
 
-    public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId) {
+    public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime) {
         OrderPayResponse orderPayResponse;
         try {
-            UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId);
+            UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
                 log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
@@ -2691,7 +2692,8 @@ public class OrderServiceImpl implements Orderservice {
         }
         //唤起微信支付
         if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
-            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount, fatherBeanListOne.getOid());
+            String partnerPayOvertime = this.getPartnerPayOvertime(createOrderVo.getPartnerId());
+            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount, fatherBeanListOne.getOid(), partnerPayOvertime);
             return orderPayResponse;
         }
         //储值卡支付