1.预收入明细查询优化

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -131,5 +131,7 @@ public class SysUserAccountVo {
     private String  timeFiltering;
     @ApiModelProperty("子订单数组")
     private List<InsFeeOrderNew> insFeeOrderNewList;
+    @ApiModelProperty("金额类型")
+    private String  amountType;
 
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -296,10 +296,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 if(ObjectUtils.isNotEmpty(byInsOrderNo)){
                     String id = byInsOrderNo.getId();
                     InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderEntity(id);
+                    insFeeOrderNew.setAmountType(sysUserAccountVo.getAmountType());
                     //预收推广
                     willPromotion =this.getWillPromotion(insFeeOrderNew,willPromotion);
                     this.getWillAmount(insFeeOrderNew);  // 推广 非跟单
-                    insFeeOrderNew.setWillPromotion(willPromotion);
+                    if(StringUtils.isNotEmpty(sysUserAccountVo.getAmountType())  &&  "3".equals(sysUserAccountVo.getAmountType()) ){
+                        insFeeOrderNew.setWillAmount(willPromotion);
+                    }
                     resultList.add(insFeeOrderNew);
                 }
             }
@@ -316,9 +319,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             BigDecimal syExportProceduresFee = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSySuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
             //非车手续费出口比例
             BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-            //用户出口手续费
 
-            insFeeOrderNew.setWillHalding(jqExportProceduresFee.add(syExportProceduresFee).add(noExportProceduresFee));
 
             //非车出口比例
             //总机构 交强管理比例
@@ -370,8 +371,17 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             BigDecimal noExportOtherFee = insFeeOrderNew.getNoPremium()
                     .multiply(noExportProceduresProportion
                             .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-            //用户出口跟单费
-            insFeeOrderNew.setWillDocumentary(jqExportOtherFee.add(syExportOtherFee).add(noExportOtherFee));
+
+            if(StringUtils.isNotEmpty(insFeeOrderNew.getAmountType())){
+                if("1".equals(insFeeOrderNew.getAmountType())){
+                    //用户出口手续费
+                    insFeeOrderNew.setWillAmount(jqExportProceduresFee.add(syExportProceduresFee).add(noExportProceduresFee));
+                }
+                if("2".equals(insFeeOrderNew.getAmountType())){
+                    //用户出口跟单费
+                    insFeeOrderNew.setWillAmount(jqExportOtherFee.add(syExportOtherFee).add(noExportOtherFee));
+                }
+            }
         }
     }
 

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

@@ -375,17 +375,14 @@ public class InsFeeOrderNew {
     private String licenseno;
 
 
-    @ApiModelProperty(value = "预收推广")
+    @ApiModelProperty(value = "预收金额")
     @TableField(exist = false)
-    private BigDecimal willPromotion;
+    private BigDecimal willAmount;
 
-    @ApiModelProperty(value = "预收手续费")
-    @TableField(exist = false)
-    private BigDecimal willHalding;
 
     @ApiModelProperty(value = "预收跟单费")
     @TableField(exist = false)
-    private BigDecimal willDocumentary;
+    private String amountType;
 
 
 }