Просмотр исходного кода

订单审核的时候,对于存在分销的订单存在问题

lipf 2 месяцев назад
Родитель
Сommit
8b2e9266ca

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/po/InsFeeOrders.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.util.BigDecimalUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -81,6 +82,11 @@ public class InsFeeOrders {
     @Schema(description = "总应付保费")
     private BigDecimal totalPayablePremium;
 
+    @Schema(description = "出口合计")
+    public BigDecimal getTotalExportPremium(){
+        return BigDecimalUtil.add(this.jqExportPremium, this.syExportPremium, this.jyExportPremium);
+    }
+
     @Schema(description = "交强险手续费费用")
     private BigDecimal jqCommissionPremium;
 

+ 4 - 2
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -517,7 +517,9 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 userAccount.setSystemCode(systemCode);
             }
             BigDecimal sumAmountUnpaid = userAccount.getSumAmountUnpaid();
-            BigDecimal amount = feeOrders.getTotalPayablePremium();
+            // modify by lipf 2026年7月17日14:29:18 tatalPayablePremium() 是包含分销费用的,
+            //BigDecimal amount = feeOrders.getTotalPayablePremium();
+            BigDecimal amount = feeOrders.getTotalExportPremium();
             log.info("费用审核通过。 amount=[{}].feeOrders=[{}]",amount, JSONUtil.toJsonStr(feeOrders));
             userAccount.setSumAmount(BigDecimalUtil.add(amount,userAccount.getSumAmount()));
             userAccount.setSumAmountUnpaid(BigDecimalUtil.add(amount, sumAmountUnpaid));
@@ -528,7 +530,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             exportChangeLog.setRelatedOrderId(param.getOrderNo());
             exportChangeLog.setUserId(userAccount.getUserId());
             exportChangeLog.setUserName(ywySysUser.getUsername());
-            exportChangeLog.setAmount(feeOrders.getTotalPayablePremium());
+            exportChangeLog.setAmount(amount);
             exportChangeLog.setOperType(1);
             exportChangeLog.setIsDelete(0);
             exportChangeLog.setRemark("保单费用");