Skip to content

G
gxpt_ht
Commit 261a6bc3 by 吕明尚
Options

Merge branch 'dev' into test

parents 2be3f72f 58236912
Showing with 6 additions and 8 deletions
share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java
...@@ -175,17 +175,15 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i ...@@ -175,17 +175,15 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
extracted(recharge); extracted(recharge);
} else { } else {
ConsumerWallet consumerWallet = consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>().eq(ConsumerWallet::getConsumerId, recharge.getConsumerId())); ConsumerWallet consumerWallet = consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>().eq(ConsumerWallet::getConsumerId, recharge.getConsumerId()));
if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
} else if (one.getIsRights().equals(YesNoEnum.yes.getIndex())) {
//修改会员钱包 //修改会员钱包
consumerWalletService.editConsumerWallet(consumerWallet, recharge, one); consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
} else { if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && one.getIsRights().equals(YesNoEnum.yes.getIndex())) {
extracted(recharge); consumerWalletService.accumulatedConsumptionStatistics(recharge.getConsumerId());
consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
} }
one.setIsRecharge(YesNoEnum.yes.getIndex()); ConsumerMember consumerMember = new ConsumerMember();
consumerMemberService.updateConsumerMember(one); consumerMember.setIsRecharge(YesNoEnum.yes.getIndex());
consumerMember.setId(one.getId());
consumerMemberService.updateConsumerMember(consumerMember);
} }
updateRecharge(recharge); updateRecharge(recharge);
} }
......
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