默认更改列表

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/CloseOrderController.java

@@ -72,6 +72,14 @@ public class CloseOrderController extends ApiController {
         }
 
         ClosePayOrderRS bizRes = new ClosePayOrderRS();
+
+        // 订单生成状态  直接修改订单状态
+        if (payOrder.getState() == PayOrder.STATE_INIT) {
+            payOrderService.updateInit2Close(payOrder.getPayOrderId());
+            bizRes.setChannelRetMsg(ChannelRetMsg.confirmSuccess(null));
+            return ApiRes.okWithSign(bizRes, configContextQueryService.queryMchApp(rq.getMchNo(), rq.getAppId()).getAppSecret());
+        }
+
         try {
 
             String payOrderId = payOrder.getPayOrderId();

jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java

@@ -90,12 +90,21 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
 
         PayOrder updateRecord = new PayOrder();
         updateRecord.setState(PayOrder.STATE_CLOSED);
-        updateRecord.setSuccessTime(new Date());
 
         return update(updateRecord, new LambdaUpdateWrapper<PayOrder>()
                 .eq(PayOrder::getPayOrderId, payOrderId).eq(PayOrder::getState, PayOrder.STATE_ING));
     }
 
+    /** 更新订单状态  【订单生成】 --》 【订单关闭】 **/
+    public boolean updateInit2Close(String payOrderId){
+
+        PayOrder updateRecord = new PayOrder();
+        updateRecord.setState(PayOrder.STATE_CLOSED);
+
+        return update(updateRecord, new LambdaUpdateWrapper<PayOrder>()
+                .eq(PayOrder::getPayOrderId, payOrderId).eq(PayOrder::getState, PayOrder.STATE_INIT));
+    }
+
 
     /** 更新订单状态  【支付中】 --》 【支付失败】 **/
     public boolean updateIng2Fail(String payOrderId, String channelOrderNo, String channelUserId, String channelErrCode, String channelErrMsg){