Accept Merge Request #83: (dev-支付回调删单bug处理 -> master)

Merge Request: 还原生产配置

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/83?initial=true

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -2713,6 +2713,28 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public PayTransactionsVO getTransactionsParam(Long userId, PayOrderDTO payOrderDTO) {
         TbOrder order = prepareOrder(userId, payOrderDTO);
+        Integer status = order.getStatus();
+        if (status==0) {
+            //            获取超时时间
+            Long timeOut = order.getTimeOut();
+            if (ObjectUtils.isNotEmpty(timeOut)) {
+                long time = new Date().getTime();
+
+                if (timeOut<time) {
+                    throw new SqxException("订单已过期！");
+                }
+            }
+        }else {
+
+            // 支付时，订单状态改为 0
+            order.setStatus(0);
+
+
+//            超时时间
+            Date date = new Date();
+            long time1 = date.getTime()+60*60*1000;
+            order.setTimeOut(time1);
+        }
         // 更新订单
         updateById(order);
 

src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://172.16.20.103:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=CTT
+            url: jdbc:mysql://172.16.20.111:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
             username: root
             password: ch@2025.wm
             initial-size: 10