修改账户

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

@@ -1,13 +1,11 @@
 package com.ydtech.modules.admin.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.constants.MoneyAttrConstants;
 import com.ydtech.modules.admin.constants.WithdrawTypeConstants;
 import com.ydtech.modules.admin.dao.SysUserAccountMapper;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
@@ -22,7 +20,6 @@ import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
@@ -274,6 +271,11 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     public SysUserAccountVo getSysAllAmount(String userId) {
         SysUserAccountVo sysUserAccountVo = new SysUserAccountVo();
         SysUserAccount sysUserAccount = baseMapper.getById(userId);
+        // 验证账户信息是否有值
+        if (ObjectUtils.isEmpty(sysUserAccount)) {
+            return sysUserAccountVo;
+        }
+
         BeanUtils.copyProperties(sysUserAccount, sysUserAccountVo);
 
         BigDecimal willHalding = BigDecimal.ZERO;        //预收手续费佣金
@@ -326,16 +328,18 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if ("3".equals(sysUserAccountVo.getAmountType())) {
             List<InsFeeOrderNew> sumWillAmountGeneralization = insFeeOrderNewService.getSumWillAmountGeneralization(params);
             sysUserAccountVo.setInsFeeOrderNewList(sumWillAmountGeneralization);
-        }else {
+        } else {
             List<InsFeeOrderNew> resultInsFeeOrderNew = insFeeOrderNewService.getSumWillAmount(params);
             if (!resultInsFeeOrderNew.isEmpty()) {
                 for (InsFeeOrderNew item : resultInsFeeOrderNew) {
                     BigDecimal willPromotion = BigDecimal.ZERO;
                     if ("1".equals(sysUserAccountVo.getAmountType())) {
                         //手续费出口预收
-                        willPromotion = willPromotion.add(item.getJqExportSuperviseCostsPremiums()).add(item.getSyExportSuperviseCostsPremiums()).add(item.getNoExportSuperviseCostsPremiums());
+                        willPromotion =
+                                willPromotion.add(item.getJqExportSuperviseCostsPremiums()).add(item.getSyExportSuperviseCostsPremiums()).add(item.getNoExportSuperviseCostsPremiums());
                     } else if ("2".equals(sysUserAccountVo.getAmountType())) {
-                        willPromotion = willPromotion.add(item.getJqExportOtherCostsPremiums()).add(item.getSyExportOtherCostsPremiums()).add(item.getNoExportOtherCostsPremiums());
+                        willPromotion =
+                                willPromotion.add(item.getJqExportOtherCostsPremiums()).add(item.getSyExportOtherCostsPremiums()).add(item.getNoExportOtherCostsPremiums());
                     }
 
                     item.setWillAmount(willPromotion);
@@ -353,11 +357,14 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     private void getWillAmount(InsFeeOrderNew insFeeOrderNew) {
         if (ObjectUtils.isNotEmpty(insFeeOrderNew)) {
             //交强手续费出口比例
-            BigDecimal jqExportProceduresFee = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
+            BigDecimal jqExportProceduresFee =
+                    insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
             //商业手续费出口比例
-            BigDecimal syExportProceduresFee = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSySuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
+            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);
+            BigDecimal noExportProceduresFee =
+                    insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
 
 
             //非车出口比例
@@ -383,7 +390,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     .add(insFeeOrderNew.getNoDeptProportionLevel5());
             BigDecimal noExportProceduresProportion = new BigDecimal(0);
             //总分销比例
-            BigDecimal sumRetail = insFeeOrderNew.getFirstDetailProportion().add(insFeeOrderNew.getSecondDetailProportion()).add(insFeeOrderNew.getThirdDetailProportion());
+            BigDecimal sumRetail =
+                    insFeeOrderNew.getFirstDetailProportion().add(insFeeOrderNew.getSecondDetailProportion()).add(insFeeOrderNew.getThirdDetailProportion());
             if (insFeeOrderNew.getNoCostsProportion().compareTo(sumNoDeptProportion.add(sumRetail)) > 0) {
                 noExportProceduresProportion = insFeeOrderNew.getNoCostsProportion().subtract(sumNoDeptProportion).subtract(sumRetail);
             }
@@ -400,16 +408,19 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             //交强跟单出口费用
             BigDecimal jqExportOtherFee = insFeeOrderNew.getJqPremium()
                     .multiply(jqExportProceduresProportion
-                            .subtract(insFeeOrderNew.getJqSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
+                            .subtract(insFeeOrderNew.getJqSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,
+                            BigDecimal.ROUND_DOWN);
 
             //商业跟单出口比例
             BigDecimal syExportOtherFee = insFeeOrderNew.getSyPremium()
                     .multiply(syExportProceduresProportion
-                            .subtract(insFeeOrderNew.getSySuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
+                            .subtract(insFeeOrderNew.getSySuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,
+                            BigDecimal.ROUND_DOWN);
             //非车跟单出口比例
             BigDecimal noExportOtherFee = insFeeOrderNew.getNoPremium()
                     .multiply(noExportProceduresProportion
-                            .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_DOWN);
+                            .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,
+                            BigDecimal.ROUND_DOWN);
 
             if (StringUtils.isNotEmpty(insFeeOrderNew.getAmountType())) {
                 if ("1".equals(insFeeOrderNew.getAmountType())) {
@@ -488,7 +499,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         return willPromotion;
     }
 
-    private void willAmount(InsFeeOrderNew insFeeOrderNew, BigDecimal willHalding, BigDecimal willDocumentary, SysUserAccountVo sysUserAccountVo) {
+    private void willAmount(InsFeeOrderNew insFeeOrderNew, BigDecimal willHalding, BigDecimal willDocumentary,
+                            SysUserAccountVo sysUserAccountVo) {
         if (ObjectUtils.isNotEmpty(insFeeOrderNew)) {
             //交强手续费
             BigDecimal jqExportProceduresFee = insFeeOrderNew.getJqExportSuperviseCostsPremiums();

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

@@ -195,9 +195,10 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         insFeeOrderNew.setSyPremium(insAreaCompany.getSypremium());
         insFeeOrderNew.setNoPremium(insAreaCompany.getJypremium());
         //不含税
-        insFeeOrderNew.setJqNoTaxPremium(insAreaCompany.getJqpremium().divide(taxRadio, 2));
-        insFeeOrderNew.setSyNoTaxPremium(insAreaCompany.getSypremium().divide(taxRadio, 2));
-        insFeeOrderNew.setNoNoTaxPremium(insAreaCompany.getJypremium().divide(taxRadio, 2));
+        BigDecimal bigDecimal = new BigDecimal("1.06");
+        insFeeOrderNew.setJqNoTaxPremium(insAreaCompany.getJqpremium().divide(bigDecimal, 2));
+        insFeeOrderNew.setSyNoTaxPremium(insAreaCompany.getSypremium().divide(bigDecimal, 2));
+        insFeeOrderNew.setNoNoTaxPremium(insAreaCompany.getJypremium().divide(bigDecimal, 2));
 
         //region 计算入口费用