Merge branch 'refs/heads/master-20240326' into test

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -277,11 +277,11 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                         insFeeOrderNew.setFirstLevelUserId(parents.get(0).getId());
                     }
                 }
+            }else{
+                insFeeOrderNew.setFirstDetailPremiums(new BigDecimal(0));
+                insFeeOrderNew.setSecondDetailPremiums(new BigDecimal(0));
+                insFeeOrderNew.setThirdDetailPremiums(new BigDecimal(0));
             }
-        }else{
-            insFeeOrderNew.setFirstDetailPremiums(new BigDecimal(0));
-            insFeeOrderNew.setSecondDetailPremiums(new BigDecimal(0));
-            insFeeOrderNew.setThirdDetailPremiums(new BigDecimal(0));
         }
 
 

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -7,15 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
-*@author: tz
-*@description: 新的费用订单表
-*@create: 2024-2-29 08:36:53
-*/
+ * @author: tz
+ * @description: 新的费用订单表
+ * @create: 2024-2-29 08:36:53
+ */
 
 @TableName(value = "ins_fee_order_new", autoResultMap = true)
 @Data
@@ -382,7 +383,7 @@ public class InsFeeOrderNew {
 
     @ApiModelProperty(value = "商业其他费用出口比例")
     @TableField(value = "sy_export_other_costs_proportion")
-    private BigDecimal  syExportOtherCostsProportion;
+    private BigDecimal syExportOtherCostsProportion;
 
     @ApiModelProperty(value = "非车其他费用出口比例")
     @TableField(value = "no_export_other_costs_proportion")
@@ -419,7 +420,19 @@ public class InsFeeOrderNew {
     @TableField(exist = false)
     private String amountType;
 
-    public void createEmpty(String insOrderNo,String agreementId,String userId,String deptId){
+    public BigDecimal getSecondDetailPremiums() {
+        return ObjectUtils.isEmpty(secondDetailPremiums) ? BigDecimal.ZERO : secondDetailPremiums;
+    }
+
+    public BigDecimal getFirstDetailPremiums() {
+        return ObjectUtils.isEmpty(firstDetailPremiums) ? BigDecimal.ZERO : firstDetailPremiums;
+    }
+
+    public BigDecimal getThirdDetailPremiums() {
+        return ObjectUtils.isEmpty(thirdDetailPremiums) ? BigDecimal.ZERO : thirdDetailPremiums;
+    }
+
+    public void createEmpty(String insOrderNo, String agreementId, String userId, String deptId) {
         this.setInsOrderNo(insOrderNo);
         this.setCostsId(null);
         this.setAgreementId(agreementId);