From 4eb7bd043cc1fe6bf0cdf44f8c045698c0e9e21b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 20 Jan 2025 11:34:01 +0800
Subject: [PATCH] refactor(mall): 确认收货功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 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 62e7c88..5134332 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
@@ -25,6 +25,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -56,6 +57,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
private final MallRefundMapper mallRefundMapper;
+ private final MallMemberMapper mallMemberMapper;
@Override
@@ -79,7 +81,13 @@
stringBuffer.append(mallOrderItem.getGoodsName())
.append("-")
.append(mallOrderItem.getSkuName())
- .append("*").append(mallOrderItem.getCnt()).append(";");
+ .append("*").append(mallOrderItem.getCnt()).append("；");
+ if(ObjectUtil.isNotEmpty(mallOrderItem.getMemberInviteId())){
+ MallMember mallMember = mallMemberMapper.selectInfoByInviteId(mallOrderItem.getMemberInviteId());
+ if(ObjectUtil.isNotEmpty(mallMember)){
+ adminMallOrderInfoVo.setRefererName(mallMember.getName());
+ }
+ }
}
adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
}
@@ -107,20 +115,20 @@
if(2 != deliveryType){
return new FebsResponse().fail().message("订单的配送方式不是快递");
}
- String expressNo = deliverGoodsDto.getExpressNo();
- if(StrUtil.isEmpty(expressNo)){
- return new FebsResponse().fail().message("请输入物流单号");
- }
- String expressCom = deliverGoodsDto.getExpressCom();
- if(StrUtil.isEmpty(expressCom)){
- return new FebsResponse().fail().message("请输入物流公司");
- }
- MallExpressInfo mallExpressInfo = new MallExpressInfo();
- mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
- mallExpressInfo.setOrderId(mallOrderInfo.getId());
- mallExpressInfo.setExpressNo(expressNo);
- mallExpressInfo.setExpressCom(expressCom);
- mallExpressInfoMapper.insert(mallExpressInfo);
+// String expressNo = deliverGoodsDto.getExpressNo();
+// if(StrUtil.isEmpty(expressNo)){
+// return new FebsResponse().fail().message("请输入物流单号");
+// }
+// String expressCom = deliverGoodsDto.getExpressCom();
+// if(StrUtil.isEmpty(expressCom)){
+// return new FebsResponse().fail().message("请输入物流公司");
+// }
+// MallExpressInfo mallExpressInfo = new MallExpressInfo();
+// mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
+// mallExpressInfo.setOrderId(mallOrderInfo.getId());
+// mallExpressInfo.setExpressNo(expressNo);
+// mallExpressInfo.setExpressCom(expressCom);
+// mallExpressInfoMapper.insert(mallExpressInfo);
mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
OrderStatusEnum.WAIT_FINISH.getValue(),
@@ -449,6 +457,28 @@
}
@Override
+ public FebsResponse deliverGoodsUpdate(DeliverGoodsDto deliverGoodsDto) {
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(deliverGoodsDto.getId());
+ if(ObjectUtil.isEmpty(mallOrderInfo)){
+ return new FebsResponse().fail().message("订单不存在，刷新后重试");
+ }
+ Integer status = mallOrderInfo.getStatus();
+ if(3 != status){
+ return new FebsResponse().fail().message("订单不是待收货状态");
+ }
+ Integer deliveryType = mallOrderInfo.getDeliveryType();
+ if(2 != deliveryType){
+ return new FebsResponse().fail().message("订单的配送方式不是快递");
+ }
+
+ mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
+ mallOrderInfo.setReceivingTime(new Date());
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+
+ return new FebsResponse().success();
+ }
+
+ @Override
public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
if (mallOrderInfo == null) {
--
Gitblit v1.9.1