Merge branch 'master' into cc_20250527_desk

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

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