Merge branch 'master' into cc20250207_optimize_v2.5

# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java

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

@@ -14,4 +14,21 @@
         order by create_time desc
         limit 1
     </select>
+    <select id="getPayTimeByShopIds" resultType="com.cool.store.dto.FranchiseFeeDTO">
+        select a.shop_id AS shopId ,
+        b.pay_time as payTime,
+        a.year_franchise_fee as yearFranchiseFee,
+        a.loan_margin as loanMargin,
+        a.first_year_start_time as firstYearStartTime,
+        a.first_year_end_time as firstYearEndTime,
+        a.first_year_fee as firstYearFee,
+        a.performance_bond as performanceBond
+        from xfsg_franchise_fee a
+        LEFT JOIN xfsg_line_pay b ON b.id = a.pay_id
+        where a.shop_id in
+        <foreach collection="shopIds" item="shopId" open="(" separator="," close=")">
+            #{shopId}
+        </foreach>
+    </select>
+
 </mapper>