quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rjuqwhnt

Browse Source
This commit is contained in:
quyixiao 2025-11-11 09:31:07 +08:00
parent 74466d2215
commit 3657eab171
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -472,9 +472,9 @@ public class AppOrderController {
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if ( if (
!OrderStatusEnums.create.getStatus().equals(tradeOrderLineEntity.getStatus()) !OrderStatusEnums.create.getStatus().equals(tradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.wait_pay.getStatus().equals(tradeOrderLineEntity.getStatus()) && !OrderStatusEnums.wait_pay.getStatus().equals(tradeOrderLineEntity.getStatus())
) { ) {
return R.error("订单状态不对,当前状态："+ tradeOrderLineEntity.getStatus()); return R.error("订单状态不对,当前状态：" + tradeOrderLineEntity.getStatus());
} }
} }
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
@ -482,8 +482,7 @@ public class AppOrderController {
tradeOrderLineEntity.setGmtClose(new Date()); tradeOrderLineEntity.setGmtClose(new Date());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
} }
jsApiPrepay.close(appCloseDTO.getTradeOrderId() ); jsApiPrepay.close(appCloseDTO.getTradeOrderId());
return R.ok(); return R.ok();
} }