From aa884dbab8bec2e2d4951d8a09081b11854c1edc Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Wed, 9 Apr 2025 15:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=BA=97=E9=93=BA=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/account/service/impl/ShopUserSyncServiceImpl.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserSyncServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserSyncServiceImpl.java
index be2383a3..2f8dac7f 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserSyncServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserSyncServiceImpl.java
@@ -48,7 +48,6 @@ public class ShopUserSyncServiceImpl implements ShopUserSyncService {
         // 合并逻辑2：（主店有、分店没有）不用采取任何操作，使用主店的会员信息
         // 合并逻辑3：（主店没有、分店有）把shop_id改为主店shop_id，把分店会员信息jsonArray格式化存储至merged_users字段中
         // 合并逻辑4：当用户补充了手机号码或则修改了手机号码，则需要按照手机号码进行会员信息合并，把逻辑1，2，3重新执行一遍
-        // 查询逻辑：在下单时选择会员信息时，查询时用适用门店id like %,1,% and is_merged_to_head = 0
         List<ShopUser> branchShopNotPhoneUserList = shopUserMapper.selectListByQuery(QueryWrapper.create().eq(ShopUser::getShopId, branchShopId)
                 .and(q -> {
                     q.isNull(ShopUser::getPhone).or(q1 -> {