Merge branch 'refs/heads/dev' into test

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

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