Merge branch 'refs/heads/dev' into test

share-system/src/main/java/share/system/service/impl/ConsumerWalletServiceImpl.java

@@ -193,11 +193,10 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         }
         logger.debug("修改会员用户");
         BigDecimal balance = consumerWallet.getBalance().add(recharge.getRechargeAmount());
+        consumerWallet.setBalance(balance);
         if (rechargeConf.getGiveType().contains(GiveTypeEnum.AMOUNT.getIndex())) {
             balance = balance.add(rechargeConf.getGiveAmount());
             consumerWallet.setBalance(balance);
-        } else {
-            consumerWallet.setBalance(balance);
         }
         if (rechargeConf.getGiveType().contains(GiveTypeEnum.DURATION.getIndex())) {
             BigDecimal duration = consumerWallet.getRemainingDuration().add(rechargeConf.getGiveDuration());

share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java

@@ -219,11 +219,10 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
         RechargeConf rechargeConf = rechargeConfService.selectRechargeConfById(recharge.getRechargeConfId());
         ConsumerWallet consumerWallet = new ConsumerWallet();
         consumerWallet.setConsumerId(recharge.getConsumerId());
+        consumerWallet.setBalance(recharge.getRechargeAmount());
         if (rechargeConf.getGiveType().contains(GiveTypeEnum.AMOUNT.getIndex())) {
             BigDecimal balance = recharge.getRechargeAmount().add(rechargeConf.getGiveAmount());
             consumerWallet.setBalance(balance);
-        } else {
-            consumerWallet.setBalance(recharge.getRechargeAmount());
         }
         if (rechargeConf.getGiveType().contains(GiveTypeEnum.DURATION.getIndex())) {
             consumerWallet.setRemainingDuration(rechargeConf.getGiveDuration());