修改充值回调

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

@@ -194,6 +194,10 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
     @Override
     public boolean editConsumerWallet(ConsumerWallet consumerWallet, Recharge recharge, ConsumerMember one) {
         BigDecimal divide = new BigDecimal(0);
+        BigDecimal oldBalance = consumerWallet.getBalance();
+        BigDecimal oldDuration = consumerWallet.getRemainingDuration();
+        BigDecimal oldIntegral = consumerWallet.getRemainingIntegral();
+
         RechargeConf rechargeConf = rechargeConfService.selectRechargeConfById(recharge.getRechargeConfId());
         if (one.getMemberType().equals(MemberTypeEnum.RECHARGE.getIndex())) {
             MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
@@ -221,8 +225,8 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         if (consumerWallet.getBalance().compareTo(new BigDecimal(0)) > 0) {
             BalanceLog balanceLog = new BalanceLog();
             balanceLog.setConsumerId(consumerWallet.getConsumerId());
-            balanceLog.setCurrentBalance(consumerWallet.getBalance());
-            balanceLog.setVariableAmount(recharge.getRechargeAmount().add(rechargeConf.getGiveAmount()));
+            balanceLog.setCurrentBalance(oldBalance);
+            balanceLog.setVariableAmount(consumerWallet.getBalance());
             balanceLog.setOperationType(YesNoEnum.yes.getIndex());
             balanceLog.setOperationTime(new Date());
             balanceLog.setCreateTime(new Date());
@@ -232,8 +236,8 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         if (consumerWallet.getRemainingDuration().compareTo(new BigDecimal(0)) > 0) {
             DurationLog durationLog = new DurationLog();
             durationLog.setConsumerId(consumerWallet.getConsumerId());
-            durationLog.setCurrentDuration(consumerWallet.getRemainingDuration());
-            durationLog.setVariableDuration(rechargeConf.getGiveDuration());
+            durationLog.setCurrentDuration(oldDuration);
+            durationLog.setVariableDuration(consumerWallet.getRemainingDuration());
             durationLog.setOperationTime(new Date());
             durationLog.setOperationType(YesNoEnum.yes.getIndex());
             durationLog.setCreateTime(new Date());
@@ -243,7 +247,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         if (consumerWallet.getRemainingIntegral().compareTo(new BigDecimal(0)) > 0) {
             IntegralLog integralLog = new IntegralLog();
             integralLog.setConsumerId(consumerWallet.getConsumerId());
-            integralLog.setCurrentIntegral(consumerWallet.getRemainingIntegral());
+            integralLog.setCurrentIntegral(oldIntegral);
             integralLog.setVariableIntegral(divide);
             integralLog.setOperationTime(new Date());
             integralLog.setOperationType(YesNoEnum.yes.getIndex());