This commit is contained in:
quyixiao 2025-11-11 09:31:07 +08:00
parent 74466d2215
commit 3657eab171

View File

@ -472,9 +472,9 @@ public class AppOrderController {
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (
!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) {
@ -482,8 +482,7 @@ public class AppOrderController {
tradeOrderLineEntity.setGmtClose(new Date());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
}
jsApiPrepay.close(appCloseDTO.getTradeOrderId() );
jsApiPrepay.close(appCloseDTO.getTradeOrderId());
return R.ok();
}