diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 4e1ef53..cd8132d 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -402,26 +402,35 @@ public class AppOrderController { @Describe("删除订单") @RequestMapping("/delete") public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) { + List vvTradeOrderLineEntityList = null; if (StringUtils.isNotEmpty(vvOrderRequest.getTrackNumber())) { - List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberBuyerId( - vvOrderRequest.getTrackNumber(),vvOrderRequest.getBuyerId()); - if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) { - for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { - vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId()); - } - } + vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberBuyerId(vvOrderRequest.getTrackNumber(),vvOrderRequest.getBuyerId()); } - if (vvOrderRequest.getTradeOrderId() != null) { - List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdBuyerId( - vvOrderRequest.getTradeOrderId(),vvOrderRequest.getBuyerId()); - if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) { - for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { - vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId()); + vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdBuyerId(vvOrderRequest.getTradeOrderId(), vvOrderRequest.getBuyerId()); + } + if (CollectionUtils.isNotEmpty(vvTradeOrderLineEntityList)) { + for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { + if ( + !OrderStatusEnums.create.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.wait_pay.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.close.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.cancel.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.shipped.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.agree_sign_receipt.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.reject_sign_receipt.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.package_return.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.package_seller_sign_receipt.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.delivered.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + && !OrderStatusEnums.refund.getStatus().equals(vvTradeOrderLineEntity.getStatus()) + ) { + return R.error("包裹状态 :" + vvTradeOrderLineEntity.getStatus() + ",不符合状态。"); } } + for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { + vvTradeOrderLineDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId()); + } } - return R.ok(); }