update

src/main/java/com/gogirl/application/common/impl/AgentUserServiceImpl.java

@@ -127,7 +127,8 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
 
         }
 
-        this.addBalanceLog(1, amount, agentUser.getId());
+        this.addBalanceLog(1, agentConfig.getRechargeAmount(), agentUser.getId());
+        this.addBalanceLog(3, agentConfig.getBondAmount(), agentUser.getId());
 
     }
 
@@ -145,7 +146,13 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
         switch (type) {
             //充值余额
             case 1:
+                //余额
                 agentUser.setBalance(agentUser.getBalance().add(amount));
+                //预充金额
+                agentUser.setRechargeAmount(amount);
+                //累计充值
+                agentUser.setCurrentRechargeAmount(agentUser.getBalance().add(amount));
+                agentUserMapper.updateById(agentUser);
 
                 agentUserBalanceLog.setAmount(amount);
                 agentUserBalanceLog.setAgentUserId(agentUserId);
@@ -161,6 +168,9 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
             case 2:
                 agentUser.setBalance(agentUser.getBalance().subtract(amount));
                 if (agentUser.getBalance().compareTo(BigDecimal.ZERO) < 0) {
+                    if (agentUser.canUserBondAmount()) {
+
+                    }
                     throw new RRException("余额不足");
                 }
                 agentUserMapper.updateById(agentUser);
@@ -187,6 +197,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
     }
 
 
+
     @Override
     public WxPayMpOrderResult chargeAmount(BigDecimal amount) throws UnknownHostException, WxPayException {
 

src/main/java/com/gogirl/domain/common/AgentUser.java

@@ -95,4 +95,9 @@ public class AgentUser implements Serializable {
 
     @ApiModelProperty("累计充值金额")
     private BigDecimal currentRechargeAmount;
+
+    //todo
+    public boolean canUserBondAmount() {
+        return false;
+    }
 }