Merge #136 into master from cc_20260508_adjustment

feat:费用单费用调整单合并

* cc_20260508_adjustment: (20 commits squashed)

  - feat:费用单调整

  - feat:费用调整

  - feat:新增审批

  - feat:费用调整单

  - feat:调整单

  - feat:自动分账

  - feat:填写添加门店

  - feat:流水查询条件

  - Merge branch 'master' into cc_20260508_adjustment

  - feat：费用流水筛选条件

  - feat：getAdjustAmount

  - feat:提现申请单导出

  - feat:提现申请单导出 状态

  - feat:提现申请单导出 状态

  - Merge branch 'cc_20260513_withdrawApplication_export' into cc_20260508_adjustment
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithdrawApplicationDTO.java

  - feat:提现申请单导出 状态

  - feat:导出

  - feat:认款完成状态的费用单和调整单，若存在关联的费用分账单，不允许删除，未关联分账单的可以删除

  - feat:费用单费用调整单合并

  - feat:费用单费用调整单合并

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/136

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

@@ -58,6 +58,13 @@ public class WithdrawApplicationDAO {
         return withdrawApplicationMapper.pageQuery(request);
     }
 
+    /**
+     * 查询总数
+     */
+    public Long count(WithdrawApplicationPageRequest request) {
+        return withdrawApplicationMapper.count(request);
+    }
+
     /**
      * 根据提现单号查询
      */

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

@@ -17,4 +17,9 @@ public interface WithdrawApplicationMapper extends Mapper<WithdrawApplicationDO>
      * 分页查询
      */
     List<WithdrawApplicationDTO> pageQuery(@Param("request") WithdrawApplicationPageRequest request);
+
+    /**
+     * 查询总数
+     */
+    Long count(@Param("request") WithdrawApplicationPageRequest request);
 }

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

@@ -97,6 +97,9 @@
         <if test="request.expenseSheetType != null and request.expenseSheetType != ''">
             and a.expense_sheet_type = #{request.expenseSheetType}
         </if>
+        <if test="request.createUserId != null and request.createUserId != ''">
+            and a.create_user_id = #{request.createUserId}
+        </if>
         <if test="request.regionIds != null and !request.regionIds.isEmpty()">
             AND <foreach collection="request.regionIds" item="regionId" separator=" OR " open="(" close=")">
                      b.region_path LIKE CONCAT('%/', #{regionId}, '/%')
@@ -149,6 +152,9 @@
         <if test="request.expenseSheetType != null and request.expenseSheetType != ''">
             and a.expense_sheet_type = #{request.expenseSheetType}
         </if>
+        <if test="request.createUserId != null and request.createUserId != ''">
+            and a.create_user_id = #{request.createUserId}
+        </if>
         <if test="request.regionIds != null and !request.regionIds.isEmpty()">
             AND <foreach collection="request.regionIds" item="regionId" separator=" OR " open="(" close=")">
             b.region_path LIKE CONCAT('%/', #{regionId}, '/%')

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

@@ -15,7 +15,9 @@
             fail_reason AS failReason,
             create_user_id AS createUserId,
             create_time AS createTime,
-            update_time AS updateTime
+            update_time AS updateTime,
+            relate_store_id AS relateStoreId,
+            remark
         FROM zxjp_withdraw_application
         WHERE 1=1
         <if test="request.withdrawNo != null and request.withdrawNo != ''">
@@ -36,4 +38,26 @@
         ORDER BY create_time DESC
     </select>
 
+    <!-- 查询总数 -->
+    <select id="count" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM zxjp_withdraw_application
+        WHERE 1=1
+        <if test="request.withdrawNo != null and request.withdrawNo != ''">
+            AND withdraw_no LIKE CONCAT('%', #{request.withdrawNo}, '%')
+        </if>
+        <if test="request.accountName != null and request.accountName != ''">
+            AND account_name LIKE CONCAT('%', #{request.accountName}, '%')
+        </if>
+        <if test="request.startTime != null">
+            AND create_time &gt;= #{request.startTime}
+        </if>
+        <if test="request.endTime != null">
+            AND create_time &lt;= #{request.endTime}
+        </if>
+        <if test="request.status != null">
+            AND status = #{request.status}
+        </if>
+    </select>
+
 </mapper>