From f0765a6627f947f085d9d8eebbeacc2ff4b7bb6c Mon Sep 17 00:00:00 2001
From: lele0521 <lele190626@gmail.com>
Date: Thu, 7 Mar 2024 11:23:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/DistributionServiceImpl.java  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
index 4d3da51c..488f7f4f 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java
@@ -80,23 +80,25 @@ public class DistributionServiceImpl extends ServiceImpl<DistributionMapper, Dis
 
         //如果分销员非空并未审核则提示用户请等待，如果分销员为拒绝状态则重新提交申请
         if (Optional.ofNullable(distribution).isPresent()) {
-            if (distribution.getDistributionStatus().equals(DistributionStatusEnum.APPLY.name())) {
-                throw new ServiceException(ResultCode.DISTRIBUTION_IS_APPLY);
-            } else if (distribution.getDistributionStatus().equals(DistributionStatusEnum.REFUSE.name())) {
-                distribution.setDistributionStatus(DistributionStatusEnum.APPLY.name());
-                BeanUtil.copyProperties(distributionApplyDTO, distribution);
-                this.updateById(distribution);
-                return distribution;
+            switch (DistributionStatusEnum.valueOf(distribution.getDistributionStatus())) {
+                case REFUSE:
+                case RETREAT:
+                    distribution.setDistributionStatus(DistributionStatusEnum.APPLY.name());
+                    BeanUtil.copyProperties(distributionApplyDTO, distribution);
+                    this.updateById(distribution);
+                    return distribution;
+                default:
+                    throw new ServiceException(ResultCode.DISTRIBUTION_IS_APPLY);
             }
+        }else{
+            //如果未申请分销员则新增进行申请
+            //获取当前登录用户
+            Member member = memberService.getUserInfo();
+            //新建分销员
+            distribution = new Distribution(member.getId(), member.getNickName(), distributionApplyDTO);
+            //添加分销员
+            this.save(distribution);
         }
-        //如果未申请分销员则新增进行申请
-        //获取当前登录用户
-        Member member = memberService.getUserInfo();
-        //新建分销员
-        distribution = new Distribution(member.getId(), member.getNickName(), distributionApplyDTO);
-        //添加分销员
-        this.save(distribution);
-
         return distribution;
     }