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

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -36,6 +36,19 @@ public class SysAmountAuditingEntity implements Serializable {
     @TableField(value = "amount")
     private BigDecimal amount;
 
+    /**
+     * 凭证号
+     */
+    @TableField(value = "voucher_id")
+    private String voucherId;
+
+
+    /**
+     * 图片ID
+     */
+    @TableField(value = "pic_id")
+    private String picId;
+
     /**
      * 创建时间
      */

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

@@ -33,6 +33,12 @@ public class SysAmountAuditingVo {
     @ApiModelProperty(value = "提现金额")
     private BigDecimal amount;
 
+    @ApiModelProperty(value = "凭证号")
+    private String voucherId;
+
+    @ApiModelProperty(value = "图片Id")
+    private String picId;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -33,37 +33,40 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Autowired
     private SysUserAccountService sysUserAccountService;
 
+    @Autowired
+    private SysAmountAuditingService sysAmountAuditingService;
+
     @Override
     @Transactional
     public void AmountReview(SysAmountAuditingVo sysAmountAuditingVo) {
 
-        SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();
+        SysAmountAuditingEntity sysAmountAuditingEntity = sysAmountAuditingService.getById(sysAmountAuditingVo.getId());
 
         BigDecimal amount = sysAmountAuditingVo.getAmount();
         String userId = sysAmountAuditingVo.getUserId();
-        SysUserAccount sysUserAccountEntity = new SysUserAccount();
+//        SysUserAccount sysUserAccountEntity = new SysUserAccount();
 //      用户扣减金额
         if (StringUtils.isNotEmpty(userId)) {
-            sysUserAccountEntity.setUserId(userId);
+//            sysUserAccountEntity.setUserId(userId);
             SysUserAccount sysUserAccount = sysUserAccountService.getById(userId);
             if (ObjectUtils.isNotEmpty(sysUserAccount)) {
                 String amountStatus = sysAmountAuditingVo.getAmountStatus();
                 if (StringUtils.isNotEmpty(amountStatus)) {
                     if ("1".equals(amountStatus)) {
-                        BigDecimal handlingFee = sysUserAccount.getHandlingFee();
-                        BigDecimal afterAmount = handlingFee.subtract(amount);
-                        sysUserAccountEntity.setHandlingFee(afterAmount);
+                        sysUserAccount.setHandlingAmountAccount(amount);
+                        sysUserAccount.setHandlingAmountPayment(sysUserAccount.getHandlingAmountPayment().subtract(amount));
+//                        sysUserAccountEntity.setHandlingFee(afterAmount);
                     } else if ("2".equals(amountStatus)) {
-                        BigDecimal documentary = sysUserAccount.getDocumentary();
-                        BigDecimal afterAmount = documentary.subtract(amount);
-                        sysUserAccountEntity.setDocumentary(afterAmount);
+                        sysUserAccount.setDocumentaryAmountAccount(amount);
+                        sysUserAccount.setDocumentaryAmountpayment(sysUserAccount.getDocumentaryAmountpayment().subtract(amount));
+//                        sysUserAccountEntity.setDocumentary(afterAmount);
                     } else {
-                        BigDecimal promotion = sysUserAccount.getPromotion();
-                        BigDecimal afterAmount = promotion.subtract(amount);
-                        sysUserAccountEntity.setPromotion(afterAmount);
+                        sysUserAccount.setPromotionAmountAccount(amount);
+                        sysUserAccount.setPromotionAmountPayment(sysUserAccount.getPromotionAmountPayment().subtract(amount));
+//                        sysUserAccountEntity.setPromotion(afterAmount);
                     }
                 }
-                sysUserAccountService.updateById(sysUserAccountEntity);
+                sysUserAccountService.updateById(sysUserAccount);
             }
             sysAmountAuditingVo.setAuditingStatus("3");
             sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());

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

@@ -73,8 +73,8 @@ public class SysDeptAccountWithdrawServiceImpl extends ServiceImpl<SysDeptAccoun
             sysDeptAccountService.updateById(sysDeptAccount);
         }
         sysDeptAccountWithdraw.setVoucherId(sysDeptAccountWithdraw.getVoucherId());
-        sysDeptAccountWithdraw.setAuditUserid(BaseController.getUser().getName());
-        sysDeptAccountWithdraw.setAuditName(BaseController.getUser().getId());
+        sysDeptAccountWithdraw.setAuditUserid(BaseController.getUser().getId());
+        sysDeptAccountWithdraw.setAuditName(BaseController.getUser().getName());
         sysDeptAccountWithdrawService.updateById(sysDeptAccountWithdraw);
         return HttpResult.ok("审核完成",sysDeptAccountWithdraw);
     }

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

@@ -49,6 +49,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
     @Autowired
     private SysUserAccountHistoryService sysUserAccountHistoryService;
+
+    @Autowired
+    private SysUserAccountService sysUserAccountService;
+
     @Autowired
     private EsmUserReferrerService esmUserReferrerService;
     @Autowired
@@ -209,13 +213,22 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 //                  用户当前费用金
                     beforeAmount = sysUserAccount.getHandlingFee();
                     afterAmount = beforeAmount.subtract(amount);
+                    sysUserAccount.setHandlingFee(afterAmount);
+                    sysUserAccount.setHandlingAmountPayment(amount);
+                    sysUserAccount.setHandlingAmountWithdrawal(sysUserAccount.getHandlingAmountWithdrawal().add(amount));
                 } else if ("2".equals(sysUserAccountVo.getAmountStatus())) {
 //                    用户当前 非跟单佣金
                     beforeAmount = sysUserAccount.getDocumentary();
                     afterAmount = beforeAmount.subtract(amount);
+                    sysUserAccount.setDocumentary(afterAmount);
+                    sysUserAccount.setDocumentaryAmountpayment(amount);
+                    sysUserAccount.setDocumentaryAmountWithdrawal(sysUserAccount.getDocumentaryAmountWithdrawal().add(amount));
                 } else {
                     beforeAmount = sysUserAccount.getPromotion();
                     afterAmount = beforeAmount.subtract(amount);
+                    sysUserAccount.setPromotion(afterAmount);
+                    sysUserAccount.setPromotionAmountPayment(amount);
+                    sysUserAccount.setPromotionAmountWithdrawal(sysUserAccount.getPromotionAmountWithdrawal().add(amount));
                 }
 //              用户相差
                 if (beforeAmount.compareTo(zero) == 0 || afterAmount.compareTo(zero) < 0) {
@@ -230,7 +243,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 //              新增金额记录
                 sysAmountAuditingService.save(sysAmountAuditingEntity);
                 sysUserAccountHistory.setAuditiingId(sysAmountAuditingEntity.getId());
-
+                sysUserAccountService.updateById(sysUserAccount);
                 sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
             }
 

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

@@ -90,7 +90,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         long count = sysUserBankCardService.count(new QueryWrapper<SysUserBankCard>()
                 .eq("bank_number", sysUserBankCardVO.getBankNumber()));
         if (count > 0) {
-            throw new SystemException("该银行卡号以被绑定");
+            throw new SystemException("该银行卡号已被绑定");
         }
         String id = BaseController.getUser().getId();
         if (StringUtils.isNotEmpty(id)) {

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -201,7 +201,7 @@ public class InsPlyIncomeController extends BaseController {
     @GetMapping("/getById/{id}")
     @ApiModelProperty(value = "回显")
     public HttpResult<InsPlyIncome> getById(@PathVariable("id") String  id){
-        InsPlyIncome item = insPlyIncomeService.getById(id);
+        InsPlyIncome item = insPlyIncomeService.getEntityById(id);
         return  HttpResult.ok(item) ;
     }
 

src/main/java/com/ydtech/modules/fnc/dao/InsPlyIncomeMapper.java

@@ -117,4 +117,6 @@ public interface InsPlyIncomeMapper extends BaseMapper<InsPlyIncome> {
 
     List<HashMap<String,Object>> getOtherIds(HashMap<String, Object> params);
 
+    InsPlyIncome getEntityById(@Param("id") String id);
+
 }

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -313,7 +313,7 @@ public class InsPlyIncome implements Serializable {
 
     @ApiModelProperty("协议类型")
     @TableField(exist = false)
-    private String agreementtype;
+    private String agreementType;
 
 
     @ApiModelProperty("ids")
@@ -388,6 +388,10 @@ public class InsPlyIncome implements Serializable {
     @TableField(exist = false)
     private String userName;
 
+    @ApiModelProperty("对接人")
+    @TableField(exist = false)
+    private String dockingPerson;
+
 
     public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDate createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
         this.orderno = orderno;

src/main/java/com/ydtech/modules/fnc/service/InsPlyIncomeService.java

@@ -118,4 +118,7 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
      * @return  通过开票id分组查出的金额总和
      */
     HttpResult<List<HashMap<String,Object>>> otherSettldetail(InsPlyIncomeVo insPlyIncomeVo);
+
+    InsPlyIncome getEntityById(String id);
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -893,6 +893,11 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         return HttpResult.ok();
     }
 
+    @Override
+    public InsPlyIncome getEntityById(String id) {
+        return    baseMapper.getEntityById(id);
+    }
+
     @Override
     @Transactional
     public void updateByEntity(InsPlyIncomeVo insPlyIncomeVo) {
@@ -901,7 +906,6 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
         this.amountCalculate(insPlyIncomeVo,insPlyIncome);
         baseMapper.updateById(insPlyIncome);
-
         insPlyIncomeVo.setCrudStatus("2");
         this.saveLog(insPlyIncomeVo);
 
@@ -916,53 +920,82 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
      * 计算逻辑 交强不含税保费* 交强跟单比例 = 交强跟单金额
      */
     private void amountCalculate(InsPlyIncomeVo insPlyIncomeVo,InsPlyIncome insPlyIncome) {
-        BigDecimal jqNoTaxPremium = insPlyIncomeVo.getJqNoTaxPremium();// 交强手续费  按照思路  交强不含税保费* 交强手续费比例  =交强手续费
-        BigDecimal syNoTaxPremium = insPlyIncomeVo.getSyNoTaxPremium();// 商业手续费  按照思路  商业不含税保费* 商业手续费比例  =商业手续费
-        BigDecimal noNoTaxPremium = insPlyIncomeVo.getNoNoTaxPremium();// 非车手续费  按照思路  非车不含税保费* 非车手续费比例  =非车手续费
-        if(insPlyIncomeVo.getJqSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0){
-            BigDecimal  jqhandingFee = jqNoTaxPremium.multiply(insPlyIncomeVo.getJqSuperviseCostsProportion().divide(new BigDecimal(100)));
-            insPlyIncome.setJqSuperviseCostsPremiums(jqhandingFee);
-        }
+        if("1".equals(insPlyIncomeVo.getAgreementType())){ //平台
+//            平台   手续费 +跟单费 = 应收   手续费 =  手续费比例*保费 应收比例=手续费比例 +  跟单比例
+            BigDecimal jqSuperviseCostsProportion = initializationBigdecimal(insPlyIncomeVo.getJqSuperviseCostsProportion());//交强手续费比例
+            BigDecimal sySuperviseCostsProportion = initializationBigdecimal(insPlyIncomeVo.getSySuperviseCostsProportion()); //商业手续费比例
+            BigDecimal noSuperviseCostsProportion = initializationBigdecimal(insPlyIncomeVo.getNoSuperviseCostsProportion()); //非车手续费比例
+            BigDecimal jqOtherCostsProportion = initializationBigdecimal(insPlyIncomeVo.getJqOtherCostsProportion()); //交强跟单比例
+            BigDecimal syOtherCostsProportion = initializationBigdecimal(insPlyIncomeVo.getSyOtherCostsProportion());  //商业跟单比例
+            BigDecimal noOtherCostsProportion = initializationBigdecimal(insPlyIncomeVo.getNoOtherCostsProportion()); //非车跟单比例
+            BigDecimal jqPremium = initializationBigdecimal(insPlyIncomeVo.getJqPremium()); //交强保费
+            BigDecimal syPremium = initializationBigdecimal(insPlyIncomeVo.getSyPremium());  //商业保费
+            BigDecimal noPremium = initializationBigdecimal(insPlyIncomeVo.getNoPremium()); //非车保费
+            //手续费比例
+            insPlyIncome.setCommissionFeerate(this.calculateTotal(jqSuperviseCostsProportion,sySuperviseCostsProportion,noSuperviseCostsProportion));  //手续费比例 = 商业手续费比例 +  交强手续费比例 + 非车手续费比例
+            if(jqSuperviseCostsProportion !=null &&  jqPremium!=null ){
+                insPlyIncome.setJqSuperviseCostsPremiums(this.algorithmAmount(jqPremium,jqSuperviseCostsProportion));  //交强手续费
+            }
+            if(sySuperviseCostsProportion !=null && syPremium !=null){
+                insPlyIncome.setSySuperviseCostsPremiums(this.algorithmAmount(syPremium,sySuperviseCostsProportion)); //商业手续费
+            }
+            if(noSuperviseCostsProportion !=null && noPremium!=null){
+                insPlyIncome.setNoSuperviseCostsPremiums(this.algorithmAmount(noPremium,noSuperviseCostsProportion));  //非车手续费
+            }
+            if(jqOtherCostsProportion  !=null &&  jqPremium!=null ){
+                insPlyIncome.setJqOtherCostsPremium(this.algorithmAmount(jqPremium,jqOtherCostsProportion));    //交强跟单费
+            }
+            if(syOtherCostsProportion !=null &&  syPremium !=null ){
+                insPlyIncome.setSyOtherCostsPremium(this.algorithmAmount(syPremium,syOtherCostsProportion));  //商业跟单费
+            }
+            if(noOtherCostsProportion  !=null && noPremium !=null){
+                insPlyIncome.setNoOtherCostsPremium(this.algorithmAmount(noPremium,noOtherCostsProportion));   //非车跟单费
+            }
+            insPlyIncome.setCommissionFeevalue(this.calculateTotal(insPlyIncome.getJqSuperviseCostsPremiums(),insPlyIncome.getSySuperviseCostsPremiums(),insPlyIncome.getNoSuperviseCostsPremiums())); //手续费
+            insPlyIncome.setCommissionFeerate(this.calculateTotal(jqSuperviseCostsProportion,sySuperviseCostsProportion,noSuperviseCostsProportion));  //手续费比例
+            insPlyIncome.setOtherFeevalue(this.calculateTotal(insPlyIncome.getJqOtherCostsPremium(),insPlyIncome.getSyOtherCostsPremium(),insPlyIncome.getNoOtherCostsPremium()));  //跟单费金额
+            insPlyIncome.setOtherFeerate(this.calculateTotal(jqOtherCostsProportion,syOtherCostsProportion,noOtherCostsProportion));  //跟单费比例
+            insPlyIncome.setAllFeeValue(this.calculateTotal(insPlyIncome.getCommissionFeevalue(),insPlyIncome.getOtherFeevalue(),null)); // 总费用 =  手续费+跟单费
+            //应收比例 交强应收比例=交强手续费比例+交强非跟单比例
+            insPlyIncome.setJqReceivableProportion(this.calculateTotal(jqSuperviseCostsProportion,jqOtherCostsProportion,null)); //交强应收
+            insPlyIncome.setSyReceivableProportion(this.calculateTotal(sySuperviseCostsProportion,syOtherCostsProportion,null)); //商业应收
+            insPlyIncome.setNoReceivableProportion(this.calculateTotal(noSuperviseCostsProportion,noOtherCostsProportion,null)); //非车应收
 
-        if(insPlyIncomeVo.getSySuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0){
-            BigDecimal  syhandingFee = syNoTaxPremium.multiply(insPlyIncomeVo.getSySuperviseCostsProportion().divide(new BigDecimal(100)));
-            insPlyIncome.setSySuperviseCostsPremiums(syhandingFee);
-        }
+        }else {
+            BigDecimal jqNoTaxPremium = insPlyIncomeVo.getJqNoTaxPremium();// 交强手续费  按照思路  交强不含税保费* 交强手续费比例  =交强手续费
+            BigDecimal syNoTaxPremium = insPlyIncomeVo.getSyNoTaxPremium();// 商业手续费  按照思路  商业不含税保费* 商业手续费比例  =商业手续费
+            BigDecimal noNoTaxPremium = insPlyIncomeVo.getNoNoTaxPremium();// 非车手续费  按照思路  非车不含税保费* 非车手续费比例  =非车手续费
+            if(insPlyIncomeVo.getJqSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0){
+                BigDecimal  jqhandingFee = jqNoTaxPremium.multiply(insPlyIncomeVo.getJqSuperviseCostsProportion().divide(new BigDecimal(100)));
+                insPlyIncome.setJqSuperviseCostsPremiums(jqhandingFee);
+            }
 
-        if(insPlyIncomeVo.getNoSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0){
-            BigDecimal  nohandingFee = noNoTaxPremium.multiply(insPlyIncomeVo.getNoSuperviseCostsProportion().divide(new BigDecimal(100)));
-            insPlyIncome.setNoSuperviseCostsPremiums(nohandingFee);
-        }
+            if(insPlyIncomeVo.getSySuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0){
+                BigDecimal  syhandingFee = syNoTaxPremium.multiply(insPlyIncomeVo.getSySuperviseCostsProportion().divide(new BigDecimal(100)));
+                insPlyIncome.setSySuperviseCostsPremiums(syhandingFee);
+            }
 
-        if(insPlyIncomeVo.getJqOtherCostsProportion().compareTo(BigDecimal.ZERO) != 0){
-            BigDecimal jqother = jqNoTaxPremium.multiply(insPlyIncomeVo.getJqOtherCostsProportion().divide(new BigDecimal(100)));//交强跟单费  按照思路  交强不含税保费* 交强跟单比例 = 交强跟单金额
-            insPlyIncome.setJqOtherCostsPremium(jqother);
-        }
+            if(insPlyIncomeVo.getNoSuperviseCostsProportion().compareTo(BigDecimal.ZERO) != 0){
+                BigDecimal  nohandingFee = noNoTaxPremium.multiply(insPlyIncomeVo.getNoSuperviseCostsProportion().divide(new BigDecimal(100)));
+                insPlyIncome.setNoSuperviseCostsPremiums(nohandingFee);
+            }
 
-        if(insPlyIncomeVo.getSyOtherCostsProportion().compareTo(BigDecimal.ZERO) != 0){
-            BigDecimal syother = syNoTaxPremium.multiply(insPlyIncomeVo.getSyOtherCostsProportion().divide(new BigDecimal(100)));//交强跟单费  按照思路  交强不含税保费* 交强跟单比例 = 交强跟单金额
-            insPlyIncome.setSyOtherCostsPremium(syother);
-        }
+            if(insPlyIncomeVo.getJqOtherCostsProportion().compareTo(BigDecimal.ZERO) != 0){
+                BigDecimal jqother = jqNoTaxPremium.multiply(insPlyIncomeVo.getJqOtherCostsProportion().divide(new BigDecimal(100)));//交强跟单费  按照思路  交强不含税保费* 交强跟单比例 = 交强跟单金额
+                insPlyIncome.setJqOtherCostsPremium(jqother);
+            }
 
-        if(insPlyIncomeVo.getNoOtherCostsProportion().compareTo(BigDecimal.ZERO) != 0){
-            BigDecimal syother = syNoTaxPremium.multiply(insPlyIncomeVo.getNoOtherCostsProportion().divide(new BigDecimal(100)));//非车跟单费  按照思路  非车不含税保费* 非车跟单比例 = 非车跟单金额
-            insPlyIncome.setNoOtherCostsPremium(syother);
-        }
-        /**
-             判断是否是平台  如果是平台则 手续费= 交强手续费+ 商业手续费+非车手续费  费单非= 交强跟单费+ 商业跟单费 +非车跟单费费
-         *                如果是保险   保险手续费=  交强手续费+商业跟单费   跟单费为null
-         *                           保险跟单    手续费为null  跟单费=   交强跟单费+商业跟单费
-         *                          非车手续费   =非车手续费
-         *                          非车跟单  =  非车跟单费
-         */
-        if("1".equals(insPlyIncomeVo.getAgreementType())){//保险手续费
-            insPlyIncome.setCommissionFeerate(this.calculateTotal(insPlyIncome.getJqSuperviseCostsProportion(),insPlyIncome.getSySuperviseCostsProportion(),insPlyIncome.getNoSuperviseCostsProportion()));  //手续费比例
-            insPlyIncome.setCommissionFeevalue(this.calculateTotal(insPlyIncome.getJqSuperviseCostsPremiums(),insPlyIncome.getSySuperviseCostsPremiums(),insPlyIncome.getNoSuperviseCostsPremiums()));  //手续费金额
-            insPlyIncome.setOtherFeerate(this.calculateTotal(insPlyIncome.getJqOtherCostsProportion(),insPlyIncome.getSyOtherCostsProportion(),insPlyIncome.getNoOtherCostsProportion()));  //跟单比例
-            insPlyIncome.setOtherFeevalue(this.calculateTotal(insPlyIncome.getJqOtherCostsPremium(),insPlyIncome.getSyOtherCostsPremium(),insPlyIncome.getNoOtherCostsPremium()));//跟单费金额
-            insPlyIncome.setAllFeeValue(this.calculateTotal(insPlyIncome.getCommissionFeevalue(),insPlyIncome.getOtherFeevalue(),null)); // 总费用 =  手续费+跟单费
-        }else {
-            if("0".equals(insPlyIncomeVo.getIsNotDocumentary()) && "0".equals(insPlyIncomeVo.getIsNotCar())){  //保险手续费
+            if(insPlyIncomeVo.getSyOtherCostsProportion().compareTo(BigDecimal.ZERO) != 0){
+                BigDecimal syother = syNoTaxPremium.multiply(insPlyIncomeVo.getSyOtherCostsProportion().divide(new BigDecimal(100)));//交强跟单费  按照思路  交强不含税保费* 交强跟单比例 = 交强跟单金额
+                insPlyIncome.setSyOtherCostsPremium(syother);
+            }
+
+            if(insPlyIncomeVo.getNoOtherCostsProportion().compareTo(BigDecimal.ZERO) != 0){
+                BigDecimal syother = syNoTaxPremium.multiply(insPlyIncomeVo.getNoOtherCostsProportion().divide(new BigDecimal(100)));//非车跟单费  按照思路  非车不含税保费* 非车跟单比例 = 非车跟单金额
+                insPlyIncome.setNoOtherCostsPremium(syother);
+            }
+
+            if("0".equals(insPlyIncomeVo.getIsNotDocumentary()) && "0".equals(insPlyIncomeVo.getIsNotCar())){  //保险  手续费 =不含税保费* 手续费比例
                 insPlyIncome.setCommissionFeevalue(this.calculateTotal(insPlyIncome.getJqSuperviseCostsPremiums(),insPlyIncome.getSySuperviseCostsPremiums(),null)); // 手续费
                 insPlyIncome.setCommissionFeerate(this.calculateTotal(insPlyIncome.getJqSuperviseCostsProportion(),insPlyIncome.getSySuperviseCostsProportion(),null));//手续费比例
                 insPlyIncome.setAllFeeValue(this.calculateTotal(insPlyIncome.getCommissionFeevalue(),null,null));//总金额
@@ -970,7 +1003,6 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                 insPlyIncome.setOtherFeevalue(this.calculateTotal(insPlyIncome.getJqOtherCostsPremium(),insPlyIncome.getSyOtherCostsPremium(),null));
                 insPlyIncome.setOtherFeerate(this.calculateTotal(insPlyIncome.getJqOtherCostsProportion(),insPlyIncome.getSyOtherCostsProportion(),null));
                 insPlyIncome.setAllFeeValue(this.calculateTotal(insPlyIncome.getOtherFeevalue(),null,null));//总金额
-
             }
             if("0".equals(insPlyIncomeVo.getIsNotDocumentary()) && "1".equals(insPlyIncomeVo.getIsNotCar())){// 非车
                 insPlyIncome.setCommissionFeevalue(this.calculateTotal(insPlyIncome.getNoSuperviseCostsPremiums(),null,null));  // 非车手续费
@@ -981,9 +1013,24 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                 insPlyIncome.setOtherFeerate(this.calculateTotal(insPlyIncome.getNoOtherCostsProportion(),null,null)); // 非车跟单比例
                 insPlyIncome.setAllFeeValue(this.calculateTotal(insPlyIncome.getOtherFeevalue(),null,null));//总金额
             }
-
         }
 
+    }
+
+    /**
+     *
+     * @param value1   保费
+     * @param value2    比例
+     * @return     费用
+     */
+    private BigDecimal algorithmAmount(BigDecimal value1, BigDecimal value2) {
+
+        return value1.multiply(value2.divide(new BigDecimal(100)));
+
+    }
+
+    private BigDecimal initializationBigdecimal(BigDecimal value) {
+        return value != null ? value : BigDecimal.ZERO;
 
     }
 
@@ -1361,6 +1408,11 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         for (InsPlyIncome item :insPlyIncomes){
             SettlementFeesExcel bxSettlementFeesExcel = new SettlementFeesExcel();
             BeanUtils.copyProperties(item, bxSettlementFeesExcel);
+            if("1".equals(item.getHandlingFeesStatus())){
+                bxSettlementFeesExcel.setHandlingFeesStatus("已结算");
+            }else {
+                bxSettlementFeesExcel.setHandlingFeesStatus("未结算");
+            }
             resultList.add(bxSettlementFeesExcel);
         }
         String uploadPath = this.uploadPath + "/excel/";

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -261,6 +261,9 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("保司机构")
     private String partnerCompaniesName;
 
+    @ApiModelProperty("对接人")
+    private String dockingPerson;
+
     @ApiModelProperty("选择ids")
     private List<String> selectIds;
 

src/main/java/com/ydtech/modules/ins/model/vo/res/SettlementFeesExcel.java

@@ -97,7 +97,7 @@ public class SettlementFeesExcel implements Serializable {
     private BigDecimal jqOtherCostsProportion;
 
     @ApiModelProperty("商业应收比例")
-    @ExcelProperty("交强非跟单比例")
+    @ExcelProperty("商业应收比例")
     private BigDecimal syReceivableProportion;
 
     @ApiModelProperty("商业手续费比例")
@@ -152,9 +152,9 @@ public class SettlementFeesExcel implements Serializable {
     private String settlementUserName;
 
 
-    @ApiModelProperty("结算人")
-    @ExcelProperty("结算人")
-    private String updateUserName;
+//    @ApiModelProperty("结算人")
+//    @ExcelProperty("结算人")
+//    private String updateUserName;
 
 
     @ApiModelProperty("手续费结算状态  1 为已结算  2 已经结算")

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -100,6 +100,8 @@
         a.amount as "amount",
         a.user_id as "userId",
         a.create_time as "createTime",
+        a.voucher_id as "voucherId",
+        a.pic_id as "picId",
         a.auditing_status as "auditingStatus",
         a.amount_status as "amountStatus",
         a.auditing_time as "auditingTime",

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -139,6 +139,8 @@
     <select id="queryNew"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
             select
                 pa.agreement_name  as "agreementName",
+                pa.agreement_type  as "agreementType",
+                pa.docking_person  as "dockingPerson",
                 su.name  as "userName",
                 <include refid="income_com"/>
                 from  ins_ply_income a
@@ -232,6 +234,21 @@
                 </if>
             </where>
     </select>
+    <select id="getEntityById"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
+            select
+                pa.agreement_name  as "agreementName",
+                pa.agreement_type  as "agreementType",
+                su.name  as "userName",
+                <include refid="income_com"/>
+                from  ins_ply_income a
+                LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
+                LEFT  JOIN  sys_user   su  on su.id=a.user_id
+            <where>
+               <if test="id!=null and id!=''">
+                   a.id=#{id}
+               </if>
+            </where>
+    </select>
 
 
     <select id="totalQuery"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">