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

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-11 09:27:47 +08:00
parent f775039bc0
commit a6bcecc955
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,26 +402,35 @@ public class AppOrderController {
@Describe("删除订单")
@RequestMapping("/delete")
public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = null;
if (StringUtils.isNotEmpty(vvOrderRequest.getTrackNumber())) {
List<VvTradeOrderLineEntity> 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<VvTradeOrderLineEntity> 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();
}