增加 确认订单状态 接口

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayDataVo.java

@@ -22,4 +22,6 @@ public class PayDataVo implements Serializable {
 
     private long timestamp;
 
+    private String redirect_url;
+    private String order_str;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayResultVo.java

@@ -18,6 +18,10 @@ public class PayResultVo implements Serializable {
 
     private String order_id;
 
+    private String showUrl;
+
+    private String returnUrl;
+
     private BigDecimal price;
 
     private PayDataVo pay_data;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -154,13 +154,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
 
             //快递票判断
-            if (payOrderParam.getIsExpress() == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeExpressEnd) == 1) {
-                lock.unlock();
-                return ResponseDto.failure("已超过快递票截止时间");//快递票不卖
-            }
-            if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressId().isEmpty()) {
-                lock.unlock();
-                return ResponseDto.failure("快递票未填写收货地址");//快递票未填写收货地址
+            if(payOrderParam.getIsExpress()!=null) {
+                if (payOrderParam.getIsExpress() == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeExpressEnd) == 1) {
+                    lock.unlock();
+                    return ResponseDto.failure("已超过快递票截止时间");//快递票不卖
+                }
+                if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressId().isEmpty()) {
+                    lock.unlock();
+                    return ResponseDto.failure("快递票未填写收货地址");//快递票未填写收货地址
+                }
             }
             //实名判断
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() <= 0) {
@@ -464,6 +466,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         payResultVo.setOrder_id(orderTicketId);
         payResultVo.setPrice(orderTickets.getPriceActual());
         orderTickets.setPayCode(payResultVo.getCode());
+        if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
+            payResultVo.setShowUrl(payOrderParam.getShowUrl());
+            payResultVo.setReturnUrl(payOrderParam.getReturnUrl());
+        }
         // 生成vo
         KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
         orderTicketVo.setOrderTicket(orderTickets);