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 41c0492ae..ed6751834 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,5 +1,6 @@
 package com.jsowell.pile.controller;
 
+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;
@@ -9,6 +10,9 @@ import com.jsowell.common.util.poi.ExcelUtil;
 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;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -16,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 会员组Controller
@@ -34,7 +39,12 @@ public class MemberGroupController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('member:memberGroup:list')")
     @GetMapping("/list")
-    public TableDataInfo list(MemberGroup memberGroup) {
+    public TableDataInfo list(MemberGroupDTO memberGroup) {
+        LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
+        logger.info("获取登录用户信息:{}", JSON.toJSONString(loginUserDetail));
+        List<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
+        List<String> collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
+        memberGroup.setMerchantIdList(collect);
         startPage();
         List<MemberGroupVO> list = memberGroupService.selectMemberGroupList(memberGroup);
         return getDataTable(list);
@@ -46,7 +56,7 @@ public class MemberGroupController extends BaseController {
     @PreAuthorize("@ss.hasPermi('member:memberGroup:export')")
     @Log(title = "会员组", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MemberGroup memberGroup) {
+    public void export(HttpServletResponse response, MemberGroupDTO memberGroup) {
         List<MemberGroupVO> list = memberGroupService.selectMemberGroupList(memberGroup);
         ExcelUtil<MemberGroup> util = new ExcelUtil<MemberGroup>(MemberGroup.class);
         // util.exportExcel(response, list, "会员组数据");
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java
index 14e566926..ad07da08f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java
@@ -3,6 +3,8 @@ package com.jsowell.pile.dto;
 import com.jsowell.common.core.domain.BaseEntity;
 import lombok.*;
 
+import java.util.List;
+
 @Getter
 @Setter
 @NoArgsConstructor
@@ -14,4 +16,6 @@ public class MemberGroupDTO extends BaseEntity {
     private String phoneNumber;
 
     private String groupCode;
+
+    private List<String> merchantIdList;
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
index e9dff10f6..4c642601b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
@@ -1,6 +1,7 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.MemberGroup;
+import com.jsowell.pile.dto.MemberGroupDTO;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.web.MemberDiscountVO;
 import com.jsowell.pile.vo.web.MemberGroupVO;
@@ -65,7 +66,7 @@ public interface MemberGroupMapper {
      */
     public int deleteMemberGroupByIds(Long[] ids);
 
-    List<MemberGroupVO> queryMemberGroupList(MemberGroup memberGroup);
+    List<MemberGroupVO> queryMemberGroupList(MemberGroupDTO dto);
 
     /**
      * 查询会员折扣
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java
index 2e9cf52df..94ffd0b52 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java
@@ -10,15 +10,14 @@ import java.util.List;
 
 /**
  * 会员组Service接口
- * 
+ *
  * @author jsowell
  * @date 2023-12-26
  */
-public interface MemberGroupService
-{
+public interface MemberGroupService {
     /**
      * 查询会员组
-     * 
+     *
      * @param id 会员组主键
      * @return 会员组
      */
@@ -26,15 +25,12 @@ public interface MemberGroupService
 
     /**
      * 查询会员组列表
-     * 
-     * @param memberGroup 会员组
-     * @return 会员组集合
      */
-    public List<MemberGroupVO> selectMemberGroupList(MemberGroup memberGroup);
+    public List<MemberGroupVO> selectMemberGroupList(MemberGroupDTO dto);
 
     /**
      * 新增会员组
-     * 
+     *
      * @param memberGroup 会员组
      * @return 结果
      */
@@ -42,7 +38,7 @@ public interface MemberGroupService
 
     /**
      * 修改会员组
-     * 
+     *
      * @param memberGroup 会员组
      * @return 结果
      */
@@ -50,7 +46,7 @@ public interface MemberGroupService
 
     /**
      * 批量删除会员组
-     * 
+     *
      * @param ids 需要删除的会员组主键集合
      * @return 结果
      */
@@ -58,7 +54,7 @@ public interface MemberGroupService
 
     /**
      * 删除会员组信息
-     * 
+     *
      * @param id 会员组主键
      * @return 结果
      */
@@ -66,6 +62,7 @@ public interface MemberGroupService
 
     /**
      * 查询会员折扣
+     *
      * @param merchantId
      * @param stationId
      * @param memberId
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 644a13bab..dbe542a8b 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
@@ -56,18 +56,21 @@ public class MemberGroupServiceImpl implements MemberGroupService {
      */
     @Override
     public MemberGroup selectMemberGroupById(Long id) {
-        return memberGroupMapper.selectMemberGroupById(id);
+        MemberGroup memberGroup = memberGroupMapper.selectMemberGroupById(id);
+        if (memberGroup != null) {
+            BigDecimal discount = memberGroup.getDiscount();
+            // 返回给前端乘以10
+            memberGroup.setDiscount(discount.multiply(BigDecimal.TEN));
+        }
+        return memberGroup;
     }
 
     /**
      * 查询会员组列表
-     *
-     * @param memberGroup 会员组
-     * @return 会员组
      */
     @Override
-    public List<MemberGroupVO> selectMemberGroupList(MemberGroup memberGroup) {
-        List<MemberGroupVO> resultList = memberGroupMapper.queryMemberGroupList(memberGroup);
+    public List<MemberGroupVO> selectMemberGroupList(MemberGroupDTO dto) {
+        List<MemberGroupVO> resultList = memberGroupMapper.queryMemberGroupList(dto);
         if (CollectionUtils.isEmpty(resultList)) {
             return Lists.newArrayList();
         }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml
index 4558f3f60..6d2ceb2ad 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml
@@ -122,6 +122,12 @@
         left join pile_merchant_info t2 on t1.merchant_id = t2.id
         left join pile_station_info t3 on t3.id = t1.station_id
         where t1.del_flag = '0'
+        <if test="merchantIdList != null and merchantIdList.size() != 0">
+            and t1.merchant_id in
+            <foreach collection="merchantIdList" item="merchantId" open="(" separator="," close=")">
+                #{merchantId,jdbcType=VARCHAR}
+            </foreach>
+        </if>
     </select>
 
     <select id="queryMemberDiscount" resultType="com.jsowell.pile.vo.web.MemberDiscountVO">