Merge branch 'dev' into test

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

@@ -221,9 +221,6 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 logger.debug("权益会员原来的基础上增加有效期");
             } else {
                 extracted(equityMembersOrder, equityMembersOrderConfig, consumerMember, consumerWallet, memberConfigServiceOne);
-                if (consumerMember.getIsRights().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {
-                    consumerWalletService.accumulatedConsumptionStatistics(equityMembersOrder.getConsumerId());
-                }
                 ConsumerMember newConsumerMember = new ConsumerMember();
                 newConsumerMember.setConsumerId(equityMembersOrder.getConsumerId());
                 newConsumerMember.setIsRights(YesNoEnum.yes.getIndex());
@@ -231,6 +228,9 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                         Integer.parseInt(expirationDateEquityMembership)));
                 newConsumerMember.setId(consumerMember.getId());
                 consumerMemberService.updateById(newConsumerMember);
+                if (consumerMember.getIsRights().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {
+                    consumerWalletService.accumulatedConsumptionStatistics(equityMembersOrder.getConsumerId());
+                }
                 logger.debug("修改会员类型为权益会员");
             }
             Map<String, String> map = new HashMap<>();