From 66a5790d1e90b101b2412a3d642b93fb6d407e3c Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 22 Apr 2025 14:11:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pile/MemberGroupController.java  | 17 ++++++++++++++---
 .../service/impl/MemberGroupServiceImpl.java    |  9 ++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java
index 09bd12b7e..c3c03e01e 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java
@@ -1,6 +1,5 @@
 package com.jsowell.web.controller.pile;
 
-import com.alibaba.fastjson2.JSON;
 import com.jsowell.common.annotation.Log;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
@@ -12,7 +11,6 @@ import com.jsowell.pile.domain.MemberGroup;
 import com.jsowell.pile.dto.MemberGroupDTO;
 import com.jsowell.pile.service.MemberGroupService;
 import com.jsowell.pile.util.UserUtils;
-import com.jsowell.pile.vo.base.LoginUserDetailVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.web.MemberGroupVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,7 +120,20 @@ public class MemberGroupController extends BaseController {
      */
     @PostMapping("/addMember")
     public AjaxResult addMember(@RequestBody MemberGroupDTO dto) {
-        return toAjax(memberGroupService.addMember(dto));
+        AjaxResult ajaxResult;
+        try {
+            int i = memberGroupService.addMember(dto);
+            if (i > 0) {
+                ajaxResult = AjaxResult.success();
+            } else {
+                ajaxResult = AjaxResult.error();
+            }
+        } catch (BusinessException e) {
+            ajaxResult = AjaxResult.error(e.getMessage());
+        } catch (Exception e) {
+            ajaxResult = AjaxResult.error("添加会员失败");
+        }
+        return ajaxResult;
     }
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
index a99e78c97..af4cbcdcc 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
@@ -220,18 +220,21 @@ public class MemberGroupServiceImpl implements MemberGroupService {
     public int addMember(MemberGroupDTO dto) {
         String groupCode = dto.getGroupCode();
         if (StringUtils.isBlank(groupCode)) {
-            return 0;
+            // return 0;
+            throw new BusinessException("", "集团编号不能为空");
         }
         // 校验会员组是否存在
         MemberGroup memberGroup = selectByGroupCode(groupCode);
         if (memberGroup == null) {
-            return 0;
+            // return 0;
+            throw new BusinessException("", "该集团不存在");
         }
         // 查询会员id
         String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(memberGroup.getMerchantId());
         MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), firstLevelMerchantId);
         if (memberBasicInfo == null) {
-            return 0;
+            // return 0;
+            throw new BusinessException("", "该手机号未注册会员");
         }
         // 查询是否保存过
         MemberGroupVO groupVO = memberGroupMapper.queryByGroupCodeAndMemberId(groupCode, memberBasicInfo.getMemberId());