Merge branch 'dev' into test

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

@@ -175,17 +175,15 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             extracted(recharge);
         } else {
             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);
-            } else {
-                extracted(recharge);
-                consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
+            //修改会员钱包
+            consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
+            if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && one.getIsRights().equals(YesNoEnum.yes.getIndex())) {
+                consumerWalletService.accumulatedConsumptionStatistics(recharge.getConsumerId());
             }
-            one.setIsRecharge(YesNoEnum.yes.getIndex());
-            consumerMemberService.updateConsumerMember(one);
+            ConsumerMember consumerMember = new ConsumerMember();
+            consumerMember.setIsRecharge(YesNoEnum.yes.getIndex());
+            consumerMember.setId(one.getId());
+            consumerMemberService.updateConsumerMember(consumerMember);
         }
         updateRecharge(recharge);
     }