计算生成的总金额数据

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

@@ -94,8 +94,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         }
         //添加总金额 = 手续费+跟单费+推广费
         BigDecimal sumAmount=BigDecimal.ZERO;
-        BigDecimal userAmount=BigDecimal.ZERO;
-        userAmount= userAmount.add(sysUserAccount.getHandlingFee()==null?BigDecimal.ZERO:sysUserAccount.getHandlingFee())
+        sumAmount= sumAmount.add(sysUserAccount.getHandlingFee()==null?BigDecimal.ZERO:sysUserAccount.getHandlingFee())
                 .add(sysUserAccount.getDocumentary()==null?BigDecimal.ZERO:sysUserAccount.getDocumentary())
                 .add(sysUserAccount.getPromotion()==null?BigDecimal.ZERO:sysUserAccount.getPromotion());
 
@@ -111,9 +110,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if (StringUtils.isNotEmpty(sysUserAccount.getDocumentaryStatus())) {
                 sysUserAccountEntity.setDocumentaryStatus(sysUserAccount.getDocumentaryStatus());
             }
-            sumAmount= sumAmount.add(sysUserAccountEntity.getHandlingFee()==null?BigDecimal.ZERO:sysUserAccountEntity.getHandlingFee())
-                    .add(sysUserAccountEntity.getDocumentary()==null?BigDecimal.ZERO:sysUserAccountEntity.getDocumentary())
-                    .add(sysUserAccountEntity.getPromotion()==null?BigDecimal.ZERO:sysUserAccountEntity.getPromotion());
             // add by hxl  2024-06-18  插入总金额
             sysUserAccountEntity.setSumAmount((sysUserAccountEntity.getSumAmount()==null?BigDecimal.ZERO:sysUserAccountEntity.getSumAmount()).add(sumAmount));
             baseMapper.updateById(sysUserAccountEntity);
@@ -137,9 +133,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if (StringUtils.isNotEmpty(sysUserAccount.getDocumentaryStatus())) {
                 sysUserAccountEntity.setDocumentaryStatus(sysUserAccount.getDocumentaryStatus());
             }
-            sumAmount= sumAmount.add(sysUserAccountEntity.getHandlingFee()==null?BigDecimal.ZERO:sysUserAccountEntity.getHandlingFee())
-                    .add(sysUserAccountEntity.getDocumentary()==null?BigDecimal.ZERO:sysUserAccountEntity.getDocumentary())
-                    .add(sysUserAccountEntity.getPromotion()==null?BigDecimal.ZERO:sysUserAccountEntity.getPromotion());
             // add by hxl  2024-06-18  插入总金额
             sysUserAccountEntity.setSumAmount((sysUserAccountEntity.getSumAmount()==null?BigDecimal.ZERO:sysUserAccountEntity.getSumAmount()).add(sumAmount));
             baseMapper.insert(sysUserAccountEntity);
@@ -159,9 +152,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 commissionMessage.append(MoneyAttrConstants.M_2.getDesc() + "：" + sysUserAccount.getDocumentary() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getDocumentary());
-                } else {
-                    BigDecimal subtract = sysUserAccountEntity.getDocumentary().subtract(sysUserAccount.getDocumentary());
-                    sysUserAccountHistory.setSurplusAmount(subtract);
                 }
                 sysUserAccountHistory.setBusinessSegmentsType(1);
                 sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
@@ -174,9 +164,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 commissionMessage.append(MoneyAttrConstants.M_1.getDesc() + "：" + sysUserAccount.getHandlingFee() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getHandlingFee());
-                } else {
-                    BigDecimal subtract = sysUserAccountEntity.getHandlingFee().subtract(sysUserAccount.getHandlingFee());
-                    sysUserAccountHistory.setSurplusAmount(subtract);
                 }
                 sysUserAccountHistory.setBusinessSegmentsType(1);
                 sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
@@ -190,9 +177,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 commissionMessage.append(MoneyAttrConstants.M_3.getDesc() + "：" + sysUserAccount.getPromotion() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getPromotion());
-                } else {
-                    BigDecimal subtract = sysUserAccountEntity.getPromotion().subtract(sysUserAccount.getPromotion());
-                    sysUserAccountHistory.setSurplusAmount(subtract);
                 }
                 sysUserAccountHistory.setBusinessSegmentsType(1);
                 sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
@@ -202,20 +186,15 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if(sysUserAccount.getDocumentary() != null && sysUserAccount.getDocumentary().compareTo(BigDecimal.ZERO) != 0  ||  sysUserAccount.getPromotion() != null && sysUserAccount.getPromotion().compareTo(BigDecimal.ZERO) != 0 ){
                 BigDecimal sum = (sysUserAccount.getDocumentary()==null?BigDecimal.ZERO:sysUserAccount.getDocumentary())
                         .add(sysUserAccount.getPromotion()==null?BigDecimal.ZERO:sysUserAccount.getPromotion());
-                BigDecimal oldSum = (sysUserAccountEntity.getDocumentary()==null?BigDecimal.ZERO:sysUserAccountEntity.getDocumentary())
-                        .add(sysUserAccountEntity.getPromotion()==null?BigDecimal.ZERO:sysUserAccountEntity.getPromotion());
-
                 sysUserAccountHistory.setId(null);
                 sysUserAccountHistory.setAmount(sum);
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_4.getCode());
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
-                    sysUserAccountHistory.setSurplusAmount(userAmount);
-                } else {
-                    BigDecimal subtract = oldSum.subtract(sum);
-                    sysUserAccountHistory.setSurplusAmount(subtract);
+                    sysUserAccountHistory.setSurplusAmount(sum);
+                    sysUserAccountHistory.setBusinessSegmentsType(1);
+                    sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
                 }
-                sysUserAccountHistory.setBusinessSegmentsType(1);
-                sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
+
             }
         }
         //添加佣金消息

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
 import com.ydtech.constants.enums.dict.ins.InsFeeAuditDistributionStatusEnum;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.SysDeptAccount;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
@@ -175,7 +176,6 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 sysUserAccount.setDocumentaryStatus("2");  // 收入
                 sysUserAccount.setSuborderId(orderNo);  // 订单Id
                 sysUserAccountService.addOrUpdate(sysUserAccount);
-                /**
                 if (insFeeOrderNew.getDistributionStatus() !=null) {
                     createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order, order.getUserid(),BigDecimal.ZERO, BigDecimal.ZERO, "0");
                     if (insFeeOrderNew.getFirstLevelUserId() != null) {
@@ -256,7 +256,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                     sysDeptAccountHistoryService.addHistory(levelDeptId, sumManagementFee, levelSysDeptAccount.getManagementFee(), "2",
                             insOrderNo, BaseController.getUser().getId(), remark);
                 }
-                 **/
+
             }
         }
     }