From 6e930b85e4ef92a0a6170cbb8f2da930bbcc72e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 15:57:51 +0800
Subject: [PATCH] 增加活动公告
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 68 +++++++++++++++++++++++++++++++--
1 files changed, 63 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 203a7bd..62e7c88 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
@@ -4,6 +4,8 @@
import cc.mrbird.febs.common.entity.QueryRequest;
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.*;
@@ -53,6 +55,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final MallRefundMapper mallRefundMapper;
@Override
@@ -65,6 +68,23 @@
public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
+ 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();
+ for(MallOrderItem mallOrderItem : mallOrderItemList){
+ stringBuffer.append(mallOrderItem.getGoodsName())
+ .append("-")
+ .append(mallOrderItem.getSkuName())
+ .append("*").append(mallOrderItem.getCnt()).append(";");
+ }
+ adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
+ }
+ }
+ }
return adminMallOrderInfoVos;
}
@@ -83,6 +103,10 @@
if(2 != status){
return new FebsResponse().fail().message("订单不是待发货状态");
}
+ Integer deliveryType = mallOrderInfo.getDeliveryType();
+ if(2 != deliveryType){
+ return new FebsResponse().fail().message("订单的配送方式不是快递");
+ }
String expressNo = deliverGoodsDto.getExpressNo();
if(StrUtil.isEmpty(expressNo)){
return new FebsResponse().fail().message("请输入物流单号");
@@ -98,8 +122,10 @@
mallExpressInfo.setExpressCom(expressCom);
mallExpressInfoMapper.insert(mallExpressInfo);
- mallOrderInfo.setStatus(3);
- mallOrderInfoMapper.updateById(mallOrderInfo);
+ mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
+ OrderStatusEnum.WAIT_FINISH.getValue(),
+ OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
+
return new FebsResponse().success();
}
@@ -116,7 +142,7 @@
StringBuffer orderItems = new StringBuffer();
for (MallOrderItem item : mallOrderItems){
StringBuffer orderItem = new StringBuffer();
- orderItems.append(item.getGoodsName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
+ orderItems.append(item.getGoodsName()+"-"+item.getSkuName()+"-"+item.getCnt()+"*"+item.getPrice()+"-合计"+item.getAmount()+"; \n ");
orderItems.append(orderItem);
}
adminOrderDetailVo.setOrderItems(orderItems.toString());
@@ -394,6 +420,35 @@
}
@Override
+ public void updateOrderStateAndDeliveryState(Long id, int value, int value1) {
+ mallOrderInfoMapper.updateOrderStateAndDeliveryState(id,value,value1);
+ }
+
+ @Override
+ public IPage<MallRefundEntity> getOrderRefundListInPage(MallRefundEntity mallRefundEntity, QueryRequest request) {
+ Page<MallRefundEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallRefundEntity> mallRefundEntityIPage = mallRefundMapper.getOrderRefundListInPage(page, mallRefundEntity);
+ List<MallRefundEntity> records = mallRefundEntityIPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(MallRefundEntity mallRefundEntityPic : records){
+ String refundPic = mallRefundEntityPic.getRefundPic();
+ if(StrUtil.isNotEmpty(refundPic)){
+ String[] split = StrUtil.split(refundPic, ",");
+ mallRefundEntityPic.setRefundPicList(split);
+ }
+ }
+ }
+ return mallRefundEntityIPage;
+ }
+
+ @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) {
@@ -408,7 +463,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