From f40a6b9e8e1992560500dfb4d2a840b1dd2393e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 31 Oct 2025 13:36:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MkDistributionAmountFlowServiceImpl.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java
index b6a955fee..36a403045 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java
@@ -42,7 +42,12 @@ public class MkDistributionAmountFlowServiceImpl extends ServiceImpl<MkDistribut
                 .ge(MkDistributionAmountFlow::getCreateTime, startTime)
                 .select(OrderInfo::getOrderNo);
         if (StrUtil.isNotBlank(type)) {
+            String[] split = type.split(",");
+            if (split.length != 0) {
+                queryWrapper.in(MkDistributionAmountFlow::getType, split);
+            }else {
                 queryWrapper.eq(MkDistributionAmountFlow::getType, type);
+            }
         }
         if (StrUtil.isNotBlank(key)) {
             queryWrapper.and(and -> {

From cb1cb88347a5b18dac0427af70bb43dd258e8d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 31 Oct 2025 13:46:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?shopCinfig=E4=BC=9A=E5=91=98=E4=BB=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/TbMemberConfigServiceImpl.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index 24407109f..96dd674ad 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -69,6 +69,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     private MkShopCouponRecordService shopCouponRecordService;
     @DubboReference
     private ShopInfoService shopInfoService;
+    @DubboReference
+    private ShopConfigService shopConfigService;
 
     @Override
     public MemberConfigVO detail(Long shopId) {
@@ -189,6 +191,11 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         if (memberDTO.getMemberPriceShopIdList() != null && !memberDTO.getMemberPriceShopIdList().isEmpty()) {
             memberConfig.setMemberPriceShopIdList(JSONObject.toJSONString(memberDTO.getMemberPriceShopIdList()));
         }
+
+        shopConfigService.editStatusByShopIdList(memberConfig.getShopId(), memberConfig.getIsOpen().intValue(),false, "is_account_ay",
+                "ALL".equals(memberConfig.getMemberPriceShopType())  ? "all" : "part",
+                StrUtil.isNotBlank(memberConfig.getMemberPriceShopIdList()) ? JSONArray.parseArray(memberConfig.getMemberPriceShopIdList()).toList(Long.class) : new ArrayList<>());
+
         return updateById(memberConfig, false);