fix

virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/OrderInfo.java

@@ -60,7 +60,7 @@ public class OrderInfo {
     private String codeUrl;
 
     /**
-     * 订单二维码过期时间
+     * 订单支付过期时间
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date codeUrlFailureTime;
@@ -70,12 +70,6 @@ public class OrderInfo {
      */
     private String prepayId;
 
-    /**
-     * 订单预支付交易会话标识过期时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date prepayIdFailureTime;
-
     /**
      * 订单支付状态
      */
@@ -232,14 +226,6 @@ public class OrderInfo {
         this.prepayId = prepayId;
     }
 
-    public Date getPrepayIdFailureTime() {
-        return prepayIdFailureTime;
-    }
-
-    public void setPrepayIdFailureTime(Date prepayIdFailureTime) {
-        this.prepayIdFailureTime = prepayIdFailureTime;
-    }
-
     public String getOrderStatus() {
         return orderStatus;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/WxPayJsApiService.java

@@ -67,7 +67,7 @@ public class WxPayJsApiService {
      * 创建订单，调用JSAPI支付接口
      */
     @Transactional(rollbackFor = Exception.class)
-    public WechatPayDto jsapiPay(String orderNo, String openid) {
+    public WechatPayDto jsapiPay(String orderNo, String openid) throws Exception{
         log.info("获取订单");
 
         // 生成订单
@@ -75,7 +75,7 @@ public class WxPayJsApiService {
         String prepayId = orderInfo.getPrepayId();
         if (orderInfo != null && !StringUtils.isEmpty(prepayId)) {
             log.info("订单已存在，prepay_id 已保存");
-            return getWechatPayDto(prepayId, orderInfo.getPrepayIdFailureTime());
+            return getWechatPayDto(prepayId, orderInfo.getCodeUrlFailureTime());
         }
 
         log.info("调用统一下单API");
@@ -114,7 +114,7 @@ public class WxPayJsApiService {
         quartzService.executeWxPayCloseOrderTask(orderInfo1);
 
         //将 WechatPayDto 中的值返回小程序就可以唤起支付页面 也就是输入密码页面
-        return getWechatPayDto(prepayId, orderInfo1.getPrepayIdFailureTime());
+        return getWechatPayDto(prepayId, orderInfo1.getCodeUrlFailureTime());
 
     }
 

virgo.api/src/main/resources/mapper/OrderInfoMapper.xml

@@ -16,7 +16,6 @@
         <result column="codeUrl" property="codeUrl"/>
         <result column="codeUrlFailureTime" property="codeUrlFailureTime"/>
         <result column="prepayId" property="prepayId"/>
-        <result column="prepayIdFailureTime" property="prepayIdFailureTime"/>
         <result column="orderStatus" property="orderStatus"/>
         <result column="status" property="status"/>
         <result column="paymentType" property="paymentType"/>
@@ -211,7 +210,6 @@
             <if test="codeUrl!=null">codeUrl=#{codeUrl},</if>
             <if test="codeUrlFailureTime!=null">codeUrlFailureTime=#{codeUrlFailureTime},</if>
             <if test="prepayId!=null">prepayId=#{prepayId},</if>
-            <if test="prepayIdFailureTime !=null">prepayIdFailureTime=#{prepayIdFailureTime},</if>
             <if test="orderStatus!=null">orderStatus=#{orderStatus},</if>
             <if test="paymentType!=null">paymentType=#{paymentType},</if>
             <if test="updateTime==null">updateTime=now(),</if>