From 10f59d952935516e5b968c84732ca5f3d4e8f5ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 12:04:02 +0800
Subject: [PATCH] 编辑商品样式的名称
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 0958a2f..49bd7a1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -71,6 +71,7 @@
if(CollUtil.isNotEmpty(adminMallOrderInfoVos.getRecords())){
for(AdminMallOrderInfoVo adminMallOrderInfoVo : adminMallOrderInfoVos.getRecords()){
Long orderId = adminMallOrderInfoVo.getId();
+ adminMallOrderInfoVo.setGoodsAmount(adminMallOrderInfoVo.getAmount().subtract(adminMallOrderInfoVo.getCarriage()));
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderId);
if(CollUtil.isNotEmpty(mallOrderItemList)){
StringBuffer stringBuffer = new StringBuffer();
@@ -120,7 +121,7 @@
mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
OrderStatusEnum.WAIT_FINISH.getValue(),
- OrderDeliveryStateEnum.DELIVERY_ING.getValue());
+ OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
return new FebsResponse().success();
}
@@ -459,7 +460,10 @@
mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
mallExpressInfoMapper.insert(mallExpressInfo);
- mallOrderInfo.setStatus(3);
- mallOrderInfoMapper.updateById(mallOrderInfo);
+ mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
+ OrderStatusEnum.WAIT_FINISH.getValue(),
+ OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
+// mallOrderInfo.setStatus(3);
+// mallOrderInfoMapper.updateById(mallOrderInfo);
}
}
--
Gitblit v1.9.1