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:30:29 +08:00
parent a6bcecc955
commit 74466d2215
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,12 +444,16 @@ public class AppOrderController {
vvDeliveredDTO.getTrackNumber(),
vvDeliveredDTO.getBuyerId()
);
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.shipped.getStatus().equals(tradeOrderLineEntity.getStatus())) {
return R.error("订单状态不对");
if (
!OrderStatusEnums.shipped.getStatus().equals(tradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.agree_sign_receipt.getStatus().equals(tradeOrderLineEntity.getStatus())
) {
return R.error("订单状态不对,status:" + tradeOrderLineEntity.getStatus());
}
}
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.delivered.getStatus());
tradeOrderLineEntity.setGmtDelivered(new Date());
@ -458,7 +462,6 @@ public class AppOrderController {
return R.ok();
}
/***
* 订单关闭 https://api.1024api.com/api-interface/app/order/close
*/
@ -467,19 +470,18 @@ public class AppOrderController {
public R close(@RequestBody AppCloseDTO appCloseDTO) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(appCloseDTO.getTradeOrderId());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.wait_pay.getStatus().equals(tradeOrderLineEntity.getStatus())) {
return R.error("订单状态不是wait_pay不对");
if (
!OrderStatusEnums.create.getStatus().equals(tradeOrderLineEntity.getStatus())
&& !OrderStatusEnums.wait_pay.getStatus().equals(tradeOrderLineEntity.getStatus())
) {
return R.error("订单状态不对,当前状态："+ tradeOrderLineEntity.getStatus());
}
}
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.close.getStatus());
tradeOrderLineEntity.setGmtClose(new Date());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
}
jsApiPrepay.close(appCloseDTO.getTradeOrderId() );
return R.ok();