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/ApiMallOrderInfoServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index f7fd884..5f9d624 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -462,11 +462,11 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
-// if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
-// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
-// orderDetailVo.setExpressNo(expressInfo.getExpressNo());
-// orderDetailVo.setExpressCom(expressInfo.getExpressCom());
-// }
+ MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+ if(ObjectUtil.isNotEmpty(expressInfo)){
+ orderDetailVo.setExpressNo(expressInfo.getExpressNo());
+ orderDetailVo.setExpressCom(expressInfo.getExpressCom());
+ }
if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
@@ -840,7 +840,8 @@
@Override
public FebsResponse createOrderVerify(ApiCreateOrderVerifyDto apiCreateOrderVerifyDto) {
- MallMember member = LoginUserUtil.getLoginUser();
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember member = memberMapper.selectById(memberId);
List<AddOrderItemDto> items = apiCreateOrderVerifyDto.getItems();
if(CollUtil.isEmpty(items)){
return new FebsResponse().fail().message("请先挑选商品");
--
Gitblit v1.9.1