Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/strategy/impl/AbstractAlipayStrategy.java

 package com.liquidnet.service.dragon.channel.alipay.strategy.impl;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.channel.alipay.biz.AlipayBiz;
 import com.liquidnet.service.dragon.channel.alipay.req.AlipayTradePayReq;
@@ -40,7 +41,9 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         alipayTradePayReq.setBody(dragonPayBaseReqDto.getDetail());
         //dragon中支付编号
         alipayTradePayReq.setOutTradeNo(dragonPayBaseReqDto.getCode());
-        alipayTradePayReq.setTimeExpire(dragonPayBaseReqDto.getExpireTime());
+        //设置订单过期时间
+        String timeExpire = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(dragonPayBaseReqDto.getCreateDate()).plusMinutes(Long.parseLong(dragonPayBaseReqDto.getExpireTime())),DateUtil.Formatter.yyyyMMddHHmmss);
+        alipayTradePayReq.setTimeExpire(timeExpire);
         alipayTradePayReq.setNotifyUrl(this.getNotifyUrl());
         alipayTradePayReq.setTimestamp(dragonPayBaseReqDto.getCreateDate());
         //调用支付

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

@@ -106,7 +106,8 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         parameters.put("body", dragonPayBaseReqDto.getName());
         parameters.put("detail", dragonPayBaseReqDto.getDetail());
         parameters.put("out_trade_no", dragonPayBaseReqDto.getCode());
-        parameters.put("time_expire", "203110908103456");
+        String timeExpire = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(dragonPayBaseReqDto.getCreateDate()).plusMinutes(Long.parseLong(dragonPayBaseReqDto.getExpireTime())),DateUtil.Formatter.yyyyMMddHHmmssTrim);
+        parameters.put("time_expire", timeExpire);
         parameters.put("notify_url", this.getNotifyUrl());
         return parameters;
     };

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -47,7 +47,9 @@ public class PayController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "detail", value = "订单描述", example = "测试订单001"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderCode", value = "订单编号", example = "ORDER0001"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "clientIp", value = "客户端ip", example = "127.0.0.1"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "notifyUrl", value = "通知url", example = "testdragon.zhengzai.tv"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "notifyUrl", value = "通知url", example = "devdragon.zhengzai.tv"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "createDate", value = "订单创建时间", example = "2021-07-13 13:00:00"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "expireTime", value = "订单过期时间", example = "5"),
     })
     @ResponseBody
     public ResponseDto<DragonPayBaseRespDto> dragonPay(
@@ -65,8 +67,8 @@ public class PayController {
 //               @RequestParam(value = "quitUrl",required = false)  String quitUrl,
 //               @RequestParam(value = "showUrl",required = false)  String showUrl,
 //               @RequestParam(value = "code",required = false)  String code,
-               @RequestParam(value = "createDate",required = false)  String createDate,
-               @RequestParam(value = "expireTime",required = false)  String expireTime){
+               @RequestParam(value = "createDate",required = true)  String createDate,
+               @RequestParam(value = "expireTime",required = true)  String expireTime){
         //为什么在js和applet中才需要判断open_id?
         if(payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())){
             if(StringUtil.isEmpty(openId)){