Merge branch 'pre' into 'master'

Pre

See merge request !284

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -121,9 +121,22 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info("微信预支付报错{}",e);
+            if(dragonPayBaseReqDto.getDeviceFrom().equals(DragonConstant.DeviceFromEnum.MICROPAY.getCode())){
+                return timeOutDeal(dragonPayBaseReqDto,null);
+            }
         }
         return null;
     }
+    public ResponseDto<DragonPayBaseRespDto> timeOutDeal(DragonPayBaseReqDto dragonPayBaseReqDto,WepayPayRespDto respWepayDto){
+        DragonPayBaseRespDto respPayDto = this.buildCommonRespDto(dragonPayBaseReqDto,respWepayDto);
+        //构造自定义返回参数
+        this.buildResponseDto(respPayDto,respWepayDto);
+        respPayDto.setMsg("等待用户付款");
+        //支付订单持久化
+        dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respPayDto);
+        return ResponseDto.success(respPayDto);
+    }
 
     /**
      * 构造公共返回参数
@@ -137,15 +150,17 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         respDto.setOrderCode(dragonPayBaseReqDto.getOrderCode());
         respDto.setPayType(dragonPayBaseReqDto.getPayType());
         DragonPayBaseRespDto.PayData payData = new DragonPayBaseRespDto.PayData();
-        payData.setAppId(respWepayDto.getAppid());
         payData.setNonceStr(nonceStr);
-        payData.setPackages("prepay_id="+respWepayDto.getPrepayId());
         payData.setSignType("MD5");
         Long second = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
         payData.setTimeStamp(second+"");
-        payData.setPartnerId(respWepayDto.getMchId());
-        payData.setPrepayId(respWepayDto.getPrepayId());
         respDto.setPayData(payData);
+        if(null!=respWepayDto){
+            payData.setAppId(respWepayDto.getAppid());
+            payData.setPackages("prepay_id="+respWepayDto.getPrepayId());
+            payData.setPartnerId(respWepayDto.getMchId());
+            payData.setPrepayId(respWepayDto.getPrepayId());
+        }
         return respDto;
     }