Explorar el Código

2026-06-27bug修复

订单审核	出口+留点≠入口,总金额对不上(晋A303MX诚泰)
订单审核	入口跟单和手续费比例不对(永诚晋A303MX)
应付账款-应付概览	导出的的表格加个余额吧
应付账款-提现申请-拒绝付款	导出的的表格付款状态应该是拒绝付款吧
应付账款-应付概览   	导出的的表格里没有拒绝付款金额走向的记录(这个账户提现两次,驳回后应付概览导出收支明细后没有这两笔提现和驳回的记录)
订单审核	导出数据表出口费用与系统不一致
应付账款	审核通过后的金额与进入业务员钱包的金额不一致
平台应收	结算报表提示接口异常
lipf hace 3 meses
padre
commit
c182f83088

+ 9 - 4
commons/src/main/java/com/jzg/commons/entity/account/po/SysUserAccountChangeLog.java

@@ -4,13 +4,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.util.BigDecimalUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -56,10 +56,15 @@ public class SysUserAccountChangeLog extends BaseModel {
     private BigDecimal amount;
 
 
+    // 在实际运行中,可能因为并发的问题,操作前的金额和操作后的金额,很难得到要给准确的值(如果非要得到金额,需要加锁,影响其他模块操作)
+    @ExcelProperty("余额")
+    @Schema(description = "余额")
+    private BigDecimal amountAfter;
 
-//    在实际运行中,可能因为并发的问题,操作前的金额和操作后的金额,很难得到要给准确的值(如果非要得到金额,需要加锁,影响其他模块操作)
-//    @Schema(description = "操作后的金额")
-//    private BigDecimal amountAfter;
+    // 这个方法不能删除。 文件导出的时候,要用
+    public BigDecimal getAmountAfter() {
+        return BigDecimalUtil.add(this.amountBefore, this.amount);
+    }
 
     /**
      * 操作类型 1 保单费用 2 保单提成 3. 提现

+ 3 - 3
commons/src/main/java/com/jzg/commons/entity/vo/AmountAuditVo.java

@@ -22,8 +22,8 @@ import java.util.Objects;
 public class AmountAuditVo  extends BaseModel {
 
     @ExcelIgnore
-    @Schema(description = "主键")
-    private int auditingStatus;
+    @Schema(description = "付款状态")
+    private Integer auditingStatus;
 
     @ExcelProperty("付款状态")
     @Schema(description = "付款状态")
@@ -35,8 +35,8 @@ public class AmountAuditVo  extends BaseModel {
         auditingStatusMap.put("0","待付款");
         auditingStatusMap.put("1","已付款");
         auditingStatusMap.put("2","拒绝付款");
-
     }
+    // 导出的时候使用,不能删除
     public String getAuditingStatusName() {
         return auditingStatusMap.getOrDefault(Objects.toString(this.auditingStatus),this.auditingStatus+"");
     }

+ 3 - 4
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -404,7 +404,6 @@ public class QuoteVerificationAspect {
         setCommission.accept(insFeeOrders, commission);
 
         // modify by lipf, 2026年6月16日15:35:09  加投比例,不需要根据平台/私有进行1.06的计算
-
         BigDecimal addAmount = premium.multiply(addThrowPercent).setScale(5, RoundingMode.HALF_EVEN);
         setAdditional.accept(insFeeOrders,addAmount);
 
@@ -448,13 +447,13 @@ public class QuoteVerificationAspect {
         insFeeOrders.setTotalPayablePremium(totalPayable);
 
         // 计算出口费用
-        BigDecimal jqExportPremium = insFeeOrders.getJqExportRatio().multiply(insFeeOrders.getJqPremium());
+        BigDecimal jqExportPremium = insFeeOrders.getJqExportRatio().multiply(insFeeOrders.getJqPremium()).setScale(2,RoundingMode.HALF_DOWN);
         insFeeOrders.setJqExportPremium(jqExportPremium);
 
-        BigDecimal syExportPremium = insFeeOrders.getSyExportRatio().multiply(insFeeOrders.getSyPremium());
+        BigDecimal syExportPremium = insFeeOrders.getSyExportRatio().multiply(insFeeOrders.getSyPremium()).setScale(2, RoundingMode.DOWN);
         insFeeOrders.setSyExportPremium(syExportPremium);
 
-        BigDecimal jyExportPremium = insFeeOrders.getJyExportRatio().multiply(insFeeOrders.getJyPremium());
+        BigDecimal jyExportPremium = insFeeOrders.getJyExportRatio().multiply(insFeeOrders.getJyPremium()).setScale(2, RoundingMode.DOWN);;
         insFeeOrders.setJyExportPremium(jyExportPremium);
 
         // 计算出口留点费用

+ 0 - 9
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1358,16 +1358,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .eq(InsFeeOrders::getOrderNo, ordersNo));
         // 比例信息
         if (insFeeOrders != null) {
-            // modify by lipf,
-            //resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList, ptlAgreement)); 这一行代码被注视掉,那么上面两个查询也就没有必要调用了
-//            List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList = orgClient.queryByCostId(insFeeOrders.getCostId());
-//            PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId());
-//            resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList, ptlAgreement));
             resultVo.setCostRatio(new PtlAgreementCostRatioVo(insFeeOrders));
-            // add by lipf, 手动计算留点比例的费用 2026年6月11日11:31:39. modify by lipf, 留点比例直接从ins_fee_orders中获取 2026年6月22日17:32:46
-//            insFeeOrders.setJqKeepPointPremium(BigDecimalUtil.divide( BigDecimalUtil.multiply(insFeeOrders.getJqPremium(),resultVo.getCostRatio().getJqKeepPointRatio()),new BigDecimal(100)));
-//            insFeeOrders.setSyKeepPointPremium(BigDecimalUtil.divide(BigDecimalUtil.multiply(insFeeOrders.getSyPremium(),resultVo.getCostRatio().getSyKeepPointRatio()),new BigDecimal(100)));
-//            insFeeOrders.setJyKeepPointPremium(BigDecimalUtil.divide(BigDecimalUtil.multiply(insFeeOrders.getJyPremium(),resultVo.getCostRatio().getJyKeepPointRatio()),new BigDecimal(100)));
             resultVo.setInsFeeOrders(new InsFeeOrdersVo(insFeeOrders));
         }
         //权益信息

+ 1 - 1
tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -101,7 +101,7 @@
         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, suji.id as userJzgInfoId,
-        saa.payment_time as paymentTime
+        saa.payment_time as paymentTime,saa.auditing_status
         FROM sys_amount_auditing saa
         LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id AND suji.is_delete = 0
         LEFT JOIN sys_user su on su.id = saa.user_id AND su.is_delete = 0