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

commons/src/main/java/com/jzg/commons/entity/vo/UserAccountStatisVo.java

@@ -3,6 +3,8 @@ package com.jzg.commons.entity.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Schema(description = "应付统计表VO")
 @Data
 public class UserAccountStatisVo {
@@ -19,4 +21,7 @@ public class UserAccountStatisVo {
     @Schema(description = "未付总计")
     private Double notPaidSum;
 
+    @Schema(description = "支付中金额总计")
+    private BigDecimal payingAmountSum;
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeOrdersServiceImpl.java

@@ -97,11 +97,11 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
             log.error("根据订单号[{}]未找到费用审核记录",ptlAgreementCostRatioVo.getOrderNo());
             return HttpResult.error(msg);
         }
-        if("1".equals(Objects.toString(insFeeAudit.getAuditStatus(),"")) ){
-            String msg =String.format("订单号为[%s]的订单已经审核通过，无法进行费用调整", ptlAgreementCostRatioVo.getOrderNo());
-            log.error(msg);
-            return HttpResult.error(msg);
-        }
+//        if("1".equals(Objects.toString(insFeeAudit.getAuditStatus(),"")) ){
+//            String msg =String.format("订单号为[%s]的订单已经审核通过，无法进行费用调整", ptlAgreementCostRatioVo.getOrderNo());
+//            log.error(msg);
+//            return HttpResult.error(msg);
+//        }
         InsFeeOrders insFeeOrders = getInsFeeOrders(ptlAgreementCostRatioVo);
         log.info("调整后费用.参数[{}]真实结果是[{}]", JSONUtil.toJsonStr(ptlAgreementCostRatioVo), JSONUtil.toJsonStr(insFeeOrders));
         // 保存比例

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

@@ -441,8 +441,9 @@ public class ReceivableController {
     }
 
     @PostMapping("/getPlatFormReceivableList")
-    @Operation(summary = "获取平台协议列表")
+    @Operation(summary = "获取平台应收列表")
     public HttpResult<InsPlyIncomeVO> getPlatFormReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
+        log.info("获取平台应收列表：receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
         if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
             receivableQueryVo.setQueryType("1");
         }

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

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -59,6 +60,14 @@ public interface SysAmountAuditingMapper extends BaseMapper<SysAmountAuditing> {
      */
     List<SysAmountAuditing> queryPaymentByUserId(@Param("userId") String userId,
                                                  @Param("auditingStatus") Integer auditingStatus);
+
+    /**
+     * 查询指定租户下，所有支付中的金额汇总
+     *
+     * @author lipf
+     * @date 2026/7/17 10:24
+     */
+    BigDecimal queryPayingAmountSum();
 }
 
 

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

@@ -16,6 +16,7 @@ import com.jzg.commons.entity.vo.SysUserWalletVo;
 import com.jzg.commons.entity.vo.UserAccountStatisVo;
 import com.jzg.commons.util.BigDecimalUtil;
 import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.mapper.SysUserAccountMapper;
 import com.jzg.organization.service.*;
 import org.slf4j.Logger;
@@ -59,7 +60,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
     @Autowired
     private SysDeptService sysDeptService;
-
+    @Autowired
+    private SysAmountAuditingMapper sysAmountAuditingMapper;
     @Autowired
     private QuoteClient quoteClient;
 
@@ -83,7 +85,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public UserAccountStatisVo getPayableStatistics(SysUserAccountParam param) {
         log.info("查询财务统计信息： param=[{}]", JSONUtil.toJsonStr(param));
-        return this.baseMapper.getPayableStatistics(param);
+        UserAccountStatisVo payableStatistics = this.baseMapper.getPayableStatistics(param);
+        BigDecimal payingAmountSum = sysAmountAuditingMapper.queryPayingAmountSum();
+        payableStatistics.setPayingAmountSum(payingAmountSum== null? BigDecimal.ZERO:payingAmountSum);
+        return payableStatistics;
     }
 
     /**

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

@@ -1488,8 +1488,8 @@
         ipii.update_by,
         eic.name as company_name,
         eic.name_simple as companyNameSimple,
-        sum( ipiis.actual_received_amount ) AS actual_received_amount,
-        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS paymentReason,
+        ipii.payment_reason ,
+        sum(ipiis.actual_received_amount) AS actual_received_amount, GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS settlementPaymentReason,
         ipii.status
         FROM
         ins_ply_income_invoice ipii
@@ -1562,7 +1562,8 @@
         eic.name_simple as companyNameSimple,
         sum( ipiis.actual_received_amount ) AS actual_received_amount,
         ipii.status,
-        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') as paymentReason,
+        ipii.payment_reason,
+        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') as settlementPaymentReason,
         GROUP_CONCAT(DISTINCT iffo.year SEPARATOR ',') AS year,
         GROUP_CONCAT(DISTINCT iffo.month SEPARATOR ',') AS month,
         iffo.partner_company_id,

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

@@ -259,4 +259,8 @@
             </if>
         </where>
     </select>
+    <!-- 查询指定租户下，所有支付中的金额汇总 lipf 2026年7月17日10:26:36 -->
+    <select id="queryPayingAmountSum" resultType="java.math.BigDecimal">
+        select sum(COALESCE(saa.amount, 0)) as payingAmountSum from sys_amount_auditing saa where saa.auditing_status = 0
+    </select>
 </mapper>