wuhp 2 лет назад
Родитель
Сommit
53ed38d175

+ 8 - 9
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -246,7 +246,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public SysUserAccountVo getSysAllAmount(String userId) {
         SysUserAccountVo sysUserAccountVo = new SysUserAccountVo();
-        SysUserAccount sysUserAccount = baseMapper.getById(userId);
+        SysUserAccount sysUserAccount = baseMapper.getById("99140105M01D01009");
         BeanUtils.copyProperties(sysUserAccount, sysUserAccountVo);
 
         BigDecimal  willHalding=BigDecimal.ZERO;        //预收手续费佣金
@@ -254,8 +254,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         BigDecimal  willPromotion =BigDecimal.ZERO;   //预收 推广
         StringBuffer stringBuffer = new StringBuffer();
 
-        willPromotion =   this.willPromotion(willPromotion,userId);  // 佣金
-        List<InsOrders> willList = insAreaCompanyService.getByUserId(userId);
+        willPromotion =   this.willPromotion(willPromotion,"99140105M01D01009");  // 佣金
+        List<InsOrders> willList = insAreaCompanyService.getByUserId("99140105M01D01009");
         if(!CollectionUtils.isEmpty(willList)){
            for (InsOrders item : willList){
                String quoteno = item.getQuoteno();
@@ -484,11 +484,11 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         //非车手续费出口比例
         BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
         //用户出口手续费
-        willHalding = willHalding.add(jqExportProceduresFee).add(syExportProceduresFee).add(noExportProceduresFee);
+
         if(sysUserAccountVo.getWillHalding()==null){
-            sysUserAccountVo.setWillHalding(willHalding);
+            sysUserAccountVo.setWillHalding(BigDecimal.ZERO);
         }
-        sysUserAccountVo.setWillHalding(sysUserAccountVo.getWillHalding().add(willHalding));
+        sysUserAccountVo.setWillHalding(sysUserAccountVo.getWillHalding().add(jqExportProceduresFee).add(syExportProceduresFee).add(noExportProceduresFee));
 
         //非车出口比例
         //总机构 交强管理比例
@@ -541,11 +541,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 .multiply(noExportProceduresProportion
                         .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
         //用户出口跟单费
-        willDocumentary = willDocumentary.add(jqExportOtherFee).add(syExportOtherFee).add(noExportOtherFee);
         if(sysUserAccountVo.getWillDocumentary()==null){
-            sysUserAccountVo.setWillDocumentary(willDocumentary);
+            sysUserAccountVo.setWillDocumentary(BigDecimal.ZERO);
         }
-        sysUserAccountVo.setWillDocumentary(sysUserAccountVo.getWillDocumentary().add(willDocumentary));
+        sysUserAccountVo.setWillDocumentary(sysUserAccountVo.getWillDocumentary().add(jqExportOtherFee).add(syExportOtherFee).add(noExportOtherFee));
 
     }