Merge branch 'master' into cc_20251010_wxnotice

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java

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

@@ -30,7 +30,7 @@
         <result column="user_region_ids" jdbcType="LONGVARCHAR" property="userRegionIds"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, user_id, name, remark, mobile, email, main_admin, is_admin, unionid,
+        id, user_id, name, remark, mobile, email, main_admin, is_admin, unionid,departments,
         avatar, jobnumber, is_leader, is_leader_in_depts, face_url, user_status, create_time,
         third_oa_unique_flag
     </sql>
@@ -235,4 +235,10 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getUserLoginByUnionid" resultType="com.cool.store.entity.login.UserLoginDO">
+        SELECT user_id, mobile, password
+        FROM enterprise_user
+        WHERE unionid = #{unionid} AND active = true
+    </select>
 </mapper>

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

@@ -222,4 +222,37 @@
             </foreach>
         </if>
     </select>
+
+    <insert id="batchInsertOrUpdateOrderTime">
+        INSERT INTO store_extend_info_${enterpriseId}
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            store_id,
+            latest_order_time
+        </trim>
+        VALUES
+        <foreach collection="dtoList" item="dto" separator=",">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                #{dto.storeId},
+                #{dto.latestOrderTime}
+            </trim>
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        <trim suffixOverrides=",">
+            store_id = VALUES(store_id),
+            latest_order_time = VALUES(latest_order_time),
+            update_time = now(),
+        </trim>
+    </insert>
+
+    <select id="getAllStoreIdAndNum" resultType="com.cool.store.entity.StoreDO">
+        SELECT store_id, store_num
+        FROM store_${enterpriseId}
+        WHERE is_delete = 'effective'
+        <if test="storeStatus != null and !storeStatus.isEmpty()">
+            AND store_status IN
+            <foreach item="item" collection="storeStatus" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

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

@@ -25,7 +25,7 @@
     <result column="operator_list"  property="operatorList" />
   </resultMap>
 
-  <insert id="insertBatch" parameterType="java.util.List">
+  <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
     INSERT INTO zxjp_store_message (
     store_id,
     store_code,