From ebf329965b4002d4ba51db00e82e31769cfb1f32 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 23 Feb 2024 16:17:21 +0800
Subject: [PATCH] update

---
 .../pile/service/impl/MemberGroupServiceImpl.java  | 14 +++++++++-----
 .../impl/PileBillingTemplateServiceImpl.java       | 12 ++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

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 f8f5ddf81..84359649e 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
@@ -267,25 +267,29 @@ public class MemberGroupServiceImpl implements MemberGroupService {
 
     @Override
     public int removeStationFromMemberGroup(MemberGroupDTO dto) {
+        int result = 0;
         String stationId = dto.getStationId();
         String groupCode = dto.getGroupCode();
         if (StringUtils.isBlank(stationId) || StringUtils.isBlank(groupCode)) {
-            return 0;
+            return result;
         }
         MemberGroup memberGroup = memberGroupMapper.selectByGroupCode(groupCode);
         if (Objects.isNull(memberGroup)) {
-            return 0;
+            return result;
         }
         List<String> stationIds = Lists.newArrayList(StringUtils.split(memberGroup.getStationId(), ","));
         if (CollectionUtils.isNotEmpty(stationIds)) {
             stationIds.remove(stationId);
             memberGroup.setStationId(StringUtils.join(stationIds, ","));
-            memberGroupMapper.updateMemberGroup(memberGroup);
+            result = memberGroupMapper.updateMemberGroup(memberGroup);
         }
 
         // 删除该站点的会员优惠计费模板
-        pileBillingTemplateService.deletePreferentialBillingTemplate(stationId);
-        return 0;
+        int i = pileBillingTemplateService.deletePreferentialBillingTemplate(stationId);
+        if (i > 0) {
+            result = result + i;
+        }
+        return result;
     }
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
index 97f2c9901..7c65ec72f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
@@ -467,17 +467,21 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
         }
 
         // 站点id保存到数据库
-        String groupCode = dto.getGroupCode();
-        MemberGroupVO memberGroupVO = memberGroupService.queryByGroupCode(groupCode);
+        MemberGroupVO memberGroupVO = memberGroupService.queryByGroupCode(dto.getGroupCode());
         if (Objects.nonNull(memberGroupVO)) {
+            List<String> stationIdList = Lists.newArrayList(); // 站点id集合
+            if (StringUtils.isNotBlank(memberGroupVO.getStationId())) {
+                stationIdList = Lists.newArrayList(StringUtils.split(memberGroupVO.getStationId(), ","));
+            }
             // 查询该站点是否已经创建过会员优惠计费模板了
-            List<String> stationIdList = Lists.newArrayList(StringUtils.split(memberGroupVO.getStationId(), ","));
             if (CollectionUtils.isNotEmpty(stationIdList) && stationIdList.contains(dto.getStationId())) {
                 throw new BusinessException("", "该站点已经创建过会员优惠计费模板");
             }
+            // 更新数据
             MemberGroup updateData = new MemberGroup();
             updateData.setId(memberGroupVO.getId());
-            updateData.setStationId(memberGroupVO.getStationId() + "," + dto.getStationId());
+            stationIdList.add(dto.getStationId());
+            updateData.setStationId(StringUtils.join(stationIdList.stream().sorted().collect(Collectors.toList()), ","));
             memberGroupService.updateMemberGroup(updateData);
         }