Merge branch 'dev' into test

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

@@ -220,6 +220,9 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 consumerMemberService.updateConsumerMember(consumerMember);
                 logger.debug("权益会员原来的基础上增加有效期");
             } else {
+                if (consumerMember.getIsRights().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {
+                    consumerWalletService.accumulatedConsumptionStatistics(equityMembersOrder.getConsumerId());
+                }
                 consumerMember.setIsRights(YesNoEnum.yes.getIndex());
                 //修改会员类型为权益会员
 //                consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());

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

@@ -178,17 +178,14 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
                 consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
             } else if (one.getIsRights().equals(YesNoEnum.yes.getIndex())) {
-                if (ObjectUtil.isEmpty(consumerWallet)) {
-                    extracted(recharge);
-                } else {
                     //修改会员钱包
                     consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
-                }
             } else {
-                one.setIsRecharge(YesNoEnum.yes.getIndex());
-                consumerMemberService.updateConsumerMember(one);
+                extracted(recharge);
                 consumerWalletService.editConsumerWallet(consumerWallet, recharge, one);
             }
+            one.setIsRecharge(YesNoEnum.yes.getIndex());
+            consumerMemberService.updateConsumerMember(one);
         }
         updateRecharge(recharge);
     }