czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
This commit is contained in:
Tankaikai
2024-12-26 17:39:36 +08:00
parent b875469beb 372754bb65
commit 2f23e93b03
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
View File

@@ -99,6 +99,9 @@ public class TempOrdersTask implements ITask {
logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails));
logger.info("order：{} ", JSONUtil.toJsonStr(order)); logger.info("order：{} ", JSONUtil.toJsonStr(order));
updateOrderStatus(payDetails, order); updateOrderStatus(payDetails, order);
} else {
order.setStatus(3);
updateOrderStatus(payDetails, order);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("查询订单异常：{}", e); logger.error("查询订单异常：{}", e);