Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

tenant/organization/src/main/java/com/jzg/organization/controller/AmountAuditingController.java

@@ -113,6 +113,13 @@ public class AmountAuditingController extends BaseController {
         return HttpResult.ok(amountAuditVoPage);
     }
 
+    @PostMapping("/myPaymentTotalWithdrawalAmount")
+    @Operation(summary = "我的付款提现金额总计")
+    public HttpResult<String> myPaymentTotalWithdrawalAmount(@RequestBody AmountAuditParam param){
+        BigDecimal b = sysAmountAuditingService.myPaymentTotalWithdrawalAmount(param);
+        return HttpResult.ok(b.toString());
+    }
+
     @PostMapping("/applyWithdraw")
     @Operation(summary = "申请提现")
     public HttpResult applyWithdraw(@RequestBody ApplyWithdrawParam applyWithdrawParam){

tenant/organization/src/main/java/com/jzg/organization/mapper/SysAmountAuditingMapper.java

@@ -40,6 +40,14 @@ public interface SysAmountAuditingMapper extends BaseMapper<SysAmountAuditing> {
      * @return
      */
     Page<AmountAuditVo> queryPaymentPage(Page page,@Param("param") AmountAuditParam param,@Param("userName") String userName);
+
+    /**
+     * 我的付款列表分页
+     * @param page
+     * @param param
+     * @return
+     */
+    List<AmountAuditVo> queryPaymentList(Page page,@Param("param") AmountAuditParam param,@Param("userName") String userName);
 }
 
 

tenant/organization/src/main/java/com/jzg/organization/service/SysAmountAuditingService.java

@@ -71,6 +71,13 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
      */
     Page<AmountAuditVo> myPayment(AmountAuditParam param);
 
+    /**
+     * 我的付款
+     * @param param
+     * @return
+     */
+    BigDecimal myPaymentTotalWithdrawalAmount(AmountAuditParam param);
+
     /**
      * 申请提现
      * @param applyWithdrawParam

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -238,6 +238,12 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         return amountAuditVoPage;
     }
 
+    @Override
+    public BigDecimal myPaymentTotalWithdrawalAmount(AmountAuditParam param) {
+        List<AmountAuditVo> amountAuditVos = baseMapper.queryPaymentList(param.getPage(), param, baseController.getUserName());
+        return CollUtil.isNotEmpty(amountAuditVos) ? amountAuditVos.stream().map(AmountAuditVo::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO) : BigDecimal.ZERO;
+    }
+
     @Override
     public Boolean applyWithdraw(ApplyWithdrawParam applyWithdrawParam) {
 

tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -179,4 +179,43 @@
             </if>
         ORDER BY saa.create_time desc
     </select>
+
+    <select id="queryPaymentList" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
+        SELECT
+        saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
+        sujim.name as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
+        saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
+        saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum
+        FROM sys_amount_auditing saa
+        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
+        LEFT JOIN sys_user su on su.id = saa.user_id
+        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id
+        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id
+        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id
+        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id
+        where
+            1=1
+        and saa.receive_user = #{userName}
+            <if test="param.salesman != null and param.salesman != ''">
+                and (su.username like concat('%', #{param.salesman}, '%') or su.mobile like concat('%', #{param.salesman}, '%'))
+            </if>
+            <if test="param.attrType != null ">
+                and suji.type_attr = #{param.attrType}
+            </if>
+
+            <if test="param.createTimeStart != null and param.createTimeEnd != null">
+                and DATE_FORMAT(saa.create_time, '%Y-%m-%d') between #{param.createTimeStart} AND #{param.createTimeEnd}
+            </if>
+            <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
+                and DATE_FORMAT(saa.auditing_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
+            </if>
+            <if test="param.auditingUser != null and param.auditingUser != ''">
+                and (sua.username = #{param.auditingUser} or sua.mobile = #{param.auditingUser})
+            </if>
+
+            <if test="param.auditingStatus != null ">
+                and saa.auditing_status = #{param.auditingStatus}
+            </if>
+        ORDER BY saa.create_time desc
+    </select>
 </mapper>