Commit d524f79f by huluobin

update

parent cc495cf0
...@@ -74,7 +74,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser ...@@ -74,7 +74,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
.attach("c") .attach("c")
.outTradeNo(IdWorker.getIdStr()) .outTradeNo(IdWorker.getIdStr())
//充值金额 //充值金额
.totalFee(agentConfig.getRechargeAmount().multiply(new BigDecimal("100")).intValue()) .totalFee(agentConfig.getRechargeAmount().add(agentConfig.getBondAmount()).multiply(new BigDecimal("100")).intValue())
.spbillCreateIp(InetAddress.getLocalHost().getHostAddress()) .spbillCreateIp(InetAddress.getLocalHost().getHostAddress())
.timeStart(yyyyMMddHHmmss.format(new Date())) .timeStart(yyyyMMddHHmmss.format(new Date()))
.notifyUrl(gogirlProperties.getNotifyChargeAgent()) .notifyUrl(gogirlProperties.getNotifyChargeAgent())
...@@ -229,7 +229,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser ...@@ -229,7 +229,7 @@ public class AgentUserServiceImpl extends ServiceImpl<AgentUserMapper, AgentUser
agentUser.setDiscount(agentConfig.getDiscount()); agentUser.setDiscount(agentConfig.getDiscount());
//计算保证金 //计算保证金
if(!agentUser.canUserBondAmount()){ if (!agentUser.canUserBondAmount()) {
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<select id="selectByRechargeAmount" resultType="com.gogirl.domain.common.AgentConfig"> <select id="selectByRechargeAmount" resultType="com.gogirl.domain.common.AgentConfig">
select * select *
from agent_config from agent_config
where recharge_amount &lt;= #{amount} where recharge_amount + bond_amount &lt;= #{amount}
order by recharge_amount desc order by recharge_amount desc
limit 1; limit 1;
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment