From ee4a6270a0a914c66aaa856e297e9004eab11696 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Feb 2023 14:22:26 +0800
Subject: [PATCH] 商品详情增加字段

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 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 4516640..219705f 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
@@ -88,20 +88,24 @@
     public Long createOrder(AddOrderDto addOrderDto) {
 //        synchronized(this){
         MallMember member = LoginUserUtil.getLoginUser();
-        String takeUniqueCode = addOrderDto.getTakeUniqueCode();
-        if(StrUtil.isEmpty(takeUniqueCode)){
-            throw new FebsException("请选择自提点");
+        //验证用户的等级
+        if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
+            throw new FebsException("请先申请成为代理人");
         }
+//        String takeUniqueCode = addOrderDto.getTakeUniqueCode();
+//        if(StrUtil.isEmpty(takeUniqueCode)){
+//            throw new FebsException("请选择自提点");
+//        }
 
-        MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
-        if(ObjectUtil.isEmpty(mallTeamLeader)){
-            throw new FebsException("请重新选择团长");
-        }
+//        MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
+//        if(ObjectUtil.isEmpty(mallTeamLeader)){
+//            throw new FebsException("请重新选择团长");
+//        }
 
         //订单范围内才允许下单
         MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
         if(ObjectUtil.isEmpty(address)){
-            throw new FebsException("请重新选择提货人信息");
+            throw new FebsException("请重新选择收货地址信息");
         }
 //        MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
 //        if(ObjectUtil.isNotEmpty(mallElectronicFence)){
@@ -121,8 +125,8 @@
         orderInfo.setRemark(addOrderDto.getRemark());
         orderInfo.setOrderType(addOrderDto.getOrderType());
 
-        orderInfo.setTakeUniqueCode(addOrderDto.getTakeUniqueCode());
-        orderInfo.setDeliveryType(1);
+//        orderInfo.setTakeUniqueCode(addOrderDto.getTakeUniqueCode());
+        orderInfo.setDeliveryType(2);
 
         if (CollUtil.isEmpty(addOrderDto.getItems())) {
             throw new FebsException("参数错误");

--
Gitblit v1.9.1