From 0b459f932333ab6b67fe5aaac6b8bff871ada5f6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Feb 2023 14:54:53 +0800
Subject: [PATCH] 运费模板指定省份不能重复
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 6713e9a..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
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
+import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -70,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();
@@ -117,9 +119,10 @@
mallExpressInfo.setExpressCom(expressCom);
mallExpressInfoMapper.insert(mallExpressInfo);
- mallOrderInfo.setStatus(3);
- mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_ING.getValue());
- mallOrderInfoMapper.updateById(mallOrderInfo);
+ mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
+ OrderStatusEnum.WAIT_FINISH.getValue(),
+ OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
+
return new FebsResponse().success();
}
@@ -436,6 +439,13 @@
}
@Override
+ public IPage<AdminGoodsStatisticsVo> goodsStatistics(MallOrderItem mallOrderItem, QueryRequest request) {
+ Page<AdminGoodsStatisticsVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminGoodsStatisticsVo> adminGoodsStatisticsVos = mallOrderInfoMapper.getGoodsStatisticsInPage(page, mallOrderItem);
+ return adminGoodsStatisticsVos;
+ }
+
+ @Override
public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
if (mallOrderInfo == null) {
@@ -450,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