From 6479a6a271162044b30c451007064b9831f014fc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 21 Jan 2025 09:44:04 +0800
Subject: [PATCH] feat(mall): 为新注册用户设置默认交易密码
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 19 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..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
@@ -71,11 +73,21 @@
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.getCnt()).append(";");
+ stringBuffer.append(mallOrderItem.getGoodsName())
+ .append("-")
+ .append(mallOrderItem.getSkuName())
+ .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());
}
@@ -103,24 +115,24 @@
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(),
- OrderDeliveryStateEnum.DELIVERY_ING.getValue());
+ OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
return new FebsResponse().success();
}
@@ -138,7 +150,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());
@@ -445,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) {
@@ -459,7 +493,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