Merge branch 'master' into cc_20250527_desk

# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java

@@ -109,8 +109,7 @@ public class HyPartnerUserInfoDAO {
     }
 
     public List<HyPartnerUserInfoDO> selectPasswordIsNull(){
-        Example example = new Example(HyPartnerUserInfoDO.class);
-        example.createCriteria().andIsNull("downstreamSystemPassword");
-        return hyPartnerUserInfoMapper.selectByExample(example);
+
+        return hyPartnerUserInfoMapper.selectPasswordIsNull();
     }
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java

@@ -219,4 +219,13 @@ public class LineInfoDAO {
         List<LineInfoDO> lineMobile = lineInfoMapper.getByLineIds(lineIds);
         return lineMobile.stream().filter(o->StringUtils.isNotBlank(o.getMobile())).collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getUsername, (k1, k2)-> k1));
     }
+
+    public List<LineInfoDO> getListByPartnerIds(List<String> partnerIds){
+        if(CollectionUtils.isEmpty(partnerIds)){
+            return Lists.newArrayList();
+        }
+        Example example = new Example(LineInfoDO.class);
+        example.createCriteria().andIn("partnerId",partnerIds);
+        return lineInfoMapper.selectByExample(example);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/QualificationsInfoDAO.java

@@ -44,7 +44,7 @@ public class QualificationsInfoDAO {
         }
         return qualificationsInfoMapper.getByLineId(lineId);
     }
-    public List<QualificationsInfoDO> getByLineIds(@Param("lineIds") List<Long> lineIds){
+    public List<QualificationsInfoDO> getByLineIds( List<Long> lineIds){
         if (lineIds==null|| lineIds.isEmpty()){
             return new java.util.ArrayList<>();
         }
@@ -52,4 +52,13 @@ public class QualificationsInfoDAO {
         example.createCriteria().andIn("lineId", lineIds);
         return qualificationsInfoMapper.selectByExample(example);
     }
+
+    public List<QualificationsInfoDO> getByPartnerIds( List<String> partnerIds){
+        if (partnerIds.isEmpty()){
+            return new java.util.ArrayList<>();
+        }
+        Example example = new Example(QualificationsInfoDO.class);
+        example.createCriteria().andIn("partnerId", partnerIds);
+        return qualificationsInfoMapper.selectByExample(example);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java

@@ -141,12 +141,29 @@ public class ShopAccountDAO {
         return shopAccountMapper.selectByExample(example);
     }
 
+    public List<ShopAccountDO> getPasswordIsNullByShopIds(List<Long> shopIds){
+        if (CollectionUtils.isEmpty(shopIds)){
+            return new ArrayList<>();
+        }
+        Example example = new Example(ShopAccountDO.class);
+        List<String> systemNameList = new ArrayList<>();
+        systemNameList.add("火码POS");
+        systemNameList.add("云流水");
+        systemNameList.add("新掌柜");
+        example.createCriteria().andIn("shopId", shopIds).andIsNull("password").andIn("systemName",systemNameList);
+        return shopAccountMapper.selectByExample(example);
+    }
+
+
     /**
      * @Auther: wangshuo
      * @Date: 2025/4/28
      * @description: 数据处理专用只处理，盐值 密码 第二密码
      */
     public Integer dateHandle(List<ShopAccountDO> list){
+        if (CollectionUtils.isEmpty(list)){
+            return CommonConstants.ZERO;
+        }
         return shopAccountMapper.dateHandle(list);
     }
     /**

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java

@@ -291,4 +291,10 @@ public class ShopInfoDAO {
    public List<FranchiseReportDTO> getShopFranchiseReportList(FranchiseReportRequest request){
        return shopInfoMapper.getShopFranchiseReportList(request);
    }
+
+    public List<ShopInfoDO> selectByPartnerIds(List<String> partnerIds){
+        Example example = new Example(ShopInfoDO.class);
+        example.createCriteria().andIn("partnerId", partnerIds).andEqualTo("deleted", false);
+        return shopInfoMapper.selectByExample(example);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java

@@ -53,4 +53,6 @@ public interface HyPartnerUserInfoMapper  extends tk.mybatis.mapper.common.Mappe
 
     Integer dataHandle(@Param("list") List<HyPartnerUserInfoDO> hyPartnerUserInfoDOList);
 
+     List<HyPartnerUserInfoDO> selectPasswordIsNull();
+
 }

coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml

@@ -56,6 +56,9 @@
     <select id="selectLastCrmCreateTime" resultType="java.lang.String">
         SELECT crm_create_time as crmCreateTime FROM xfsg_partner_user_info ORDER BY crm_create_time desc limit 1
     </select>
+    <select id="selectPasswordIsNull" resultType="com.cool.store.entity.HyPartnerUserInfoDO">
+        SELECT * FROM `xfsg_partner_user_info` a LEFT JOIN xfsg_qualifications_info b on a.partner_id=b.partner_id WHERE b.id is not null and a.downstream_system_password is null
+    </select>
 
     <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
         insert into xfsg_partner_user_info
@@ -184,6 +187,8 @@
                 <if test="item.downstreamSystemSecondaryPassword != null">
                     downstream_system_secondary_password = #{item.downstreamSystemSecondaryPassword},
                 </if>
+                update_time = now()
+
             </set>
             where id = #{item.id}
 

coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml

@@ -176,6 +176,7 @@
                 <if test="item.secondaryPassword != null">
                     secondary_password = #{item.secondaryPassword},
                 </if>
+                remark = #{item.remark}
             </set>
             where id = #{item.id}
 

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -428,9 +428,11 @@
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <foreach collection="regionIds" item="item" index="index" open="and region_id in (" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="regionIds!=null and regionIds.size >0">
+            <foreach collection="regionIds" item="item" index="index" open="and region_id in (" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getShopIdBySuccessOpen" resultType="com.cool.store.entity.ShopInfoDO">
         select a.id as id, a.partner_id as partnerId