Merge branch 'master' into cc_20250826_notice

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

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

@@ -191,13 +191,19 @@
     </select>
     <select id="getAllUser" resultType="com.cool.store.dto.UserDTO">
         select
-        user_id as userId,
-        name,
-        mobile
-        from enterprise_user_${eid}
+        DISTINCT a.user_id as userId,
+        a.name,
+        a.mobile
+        from enterprise_user_${eid}  a left join enterprise_user_role_${eid} b  on a.`user_id` = b.`user_id`
         where active = true
         <if test="keyword!=null and keyword!=''">
-            and( name like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%'))
+            and( a.name like concat('%',#{keyword},'%') or a.mobile like concat('%',#{keyword},'%'))
+        </if>
+        <if test="roleIdList !=null and roleIdList.size>0">
+            and b.role_id in
+            <foreach item="roleId" index="index" collection="roleIdList" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
         </if>
     </select>
 

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

@@ -414,6 +414,16 @@
         select * from xfsg_line_pay where deleted = 0 and payment_receipt_code = #{paymentReceiptCode} and
         pay_business_type = 1 order by create_time desc
     </select>
+
+    <select id="getLastPay" resultMap="BaseResultMap">
+        select * from xfsg_line_pay
+        where deleted = 0
+        and shop_id = #{shopId}
+        and pay_business_type = 1
+        and xgj_claim_status = 1
+        order by update_time desc limit 1
+    </select>
+
     <update id="dataUpdateLinePay">
         <foreach collection="list" separator=";" item="item" index="index">
             update xfsg_line_pay

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

@@ -36,6 +36,14 @@
         <result column="region_id" property="regionId" jdbcType="VARCHAR"/>
         <result column="store_status" property="storeStatus" jdbcType="VARCHAR"/>
         <result column="open_date" property="openDate" jdbcType="DATE"/>
+        <result column="monthly_rent" property="monthlyRent"/>
+        <result column="monthly_personnel_salary" property="monthlyPersonnelSalary"/>
+        <result column="monthly_other_expenses" property="monthlyOtherExpenses"/>
+        <result column="unified_management" property="unifiedManagement" jdbcType="TINYINT"/>
+        <result column="join_model" property="joinModel" jdbcType="TINYINT"/>
+        <result column="join_brand" property="joinBrand" jdbcType="TINYINT"/>
+        <result column="store_type" property="storeType" jdbcType="TINYINT"/>
+        <result column="mini_program_order_store_name" property="miniProgramOrderStoreName"/>
     </resultMap>
 
     <select id="getByStoreId" resultMap="BaseResultMap">
@@ -171,5 +179,4 @@
             </foreach>
         </if>
     </select>
-
 </mapper>