Accept Merge Request #85: (dev-修改商户首页查询只读库 -> master)

Merge Request: 处理待结算报错bug

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

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

@@ -2735,9 +2735,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
 
 //            超时时间
-            Date date = new Date();
-            long time1 = date.getTime()+60*60*1000;
-            order.setTimeOut(time1);
+            //目前没有处理待结算的逻辑 先注释掉
+//            Date date = new Date();
+//            long time1 = date.getTime()+60*60*1000;
+//            order.setTimeOut(time1);
         }
         // 更新订单
         updateById(order);