修改查询报错问题以及其他问题

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

@@ -142,7 +142,11 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             baseMapper.insert(sysUserAccountEntity);
         }
         StringBuilder commissionMessage = new StringBuilder();
+        BigDecimal beforeAmount;
+        BigDecimal afterAmount;
         if (StringUtils.isNotEmpty(sysUserAccount.getDocumentaryStatus())) {
+            //提现前的金额
+            beforeAmount = sysUserAccountEntity.getSumAmount()==null?BigDecimal.ZERO:sysUserAccountEntity.getSumAmount();
 //          判断是否是一级二级三级
             SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();
             sysUserAccountHistory.setUserId(sysUserAccount.getUserId());
@@ -180,21 +184,29 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_3.getCode());
                 commissionMessage.append(MoneyAttrConstants.M_3.getDesc() + "：" + sysUserAccount.getPromotion() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
-                    sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getSumAmount());
+                    //提现后的金额
+                    afterAmount = beforeAmount.subtract(sysUserAccount.getPromotion());
+                    sysUserAccountHistory.setSurplusAmount(afterAmount); //改变后金额
+                    sysUserAccountHistory.setUserAmount(beforeAmount); //改变前金额
                 }
                 sysUserAccountHistory.setBusinessSegmentsType(1);
                 sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
 
             }
+            //手续费+跟单费用
             BigDecimal amount_SX_GD=BigDecimal.ZERO;
             amount_SX_GD= amount_SX_GD.add(sysUserAccount.getHandlingFee()==null?BigDecimal.ZERO:sysUserAccount.getHandlingFee())
                     .add(sysUserAccount.getDocumentary()==null?BigDecimal.ZERO:sysUserAccount.getDocumentary());
-            //历史记录表添加收费+跟单费用  add by hxl   2024-06-18
+            //历史记录表添加手续费+跟单费用  add by hxl   2024-06-18
             if(amount_SX_GD.compareTo(BigDecimal.ZERO) != 0){
                 sysUserAccountHistory.setId(null);
                 sysUserAccountHistory.setAmount(amount_SX_GD);
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_4.getCode());
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
+
+                    afterAmount = beforeAmount.subtract(amount_SX_GD);
+                    sysUserAccountHistory.setSurplusAmount(afterAmount); //改变后金额
+                    sysUserAccountHistory.setUserAmount(beforeAmount); //改变前金额
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getSumAmount());
                     sysUserAccountHistory.setBusinessSegmentsType(1);
                     sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);