From 1de5a4bf3d3248b6847cad2f73ce7ca8a4a6ba56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 03 Jun 2024 15:45:05 +0800
Subject: [PATCH] 退款时,退最后一个商品才退运费

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 1b46a1c..1c6c32c 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
@@ -94,8 +94,12 @@
     public Long createOrder(AddOrderDto addOrderDto) {
         Long memberId = LoginUserUtil.getLoginUser().getId();
         MallMember member = mallMemberMapper.selectById(memberId);
+        Integer storeMaster = member.getStoreMaster();
+        if(1 != storeMaster){
+            throw new FebsException("请先认证店铺信息");
+        }
 
-                //验证用户的等级
+        //验证用户的等级
 //        if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
 //            throw new FebsException("请先申请成为代理人");
 //        }
@@ -595,8 +599,8 @@
         IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
 
         orderListDto.setMemberId(member.getId());
-//        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
-        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectNewApiOrderListInPage(page, orderListDto);
+        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
+//        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectNewApiOrderListInPage(page, orderListDto);
         if (CollUtil.isNotEmpty(mallOrderInfos.getRecords())) {
             mallOrderInfos.getRecords().forEach(item -> {
                 item.setItems(mallOrderItemMapper.selectListByOrderId(item.getId()));

--
Gitblit v1.9.1