Merge branch 'dev' into test

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

@@ -220,17 +220,16 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 consumerMemberService.updateConsumerMember(consumerMember);
                 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.setIsRights(YesNoEnum.yes.getIndex());
-                //修改会员类型为权益会员
-//                consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
-//                consumerMember.setMemberConfigId(memberConfigServiceOne.getId());
-                consumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
+                ConsumerMember newConsumerMember = new ConsumerMember();
+                newConsumerMember.setConsumerId(equityMembersOrder.getConsumerId());
+                newConsumerMember.setIsRights(YesNoEnum.yes.getIndex());
+                newConsumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
                         Integer.parseInt(expirationDateEquityMembership)));
-                extracted(equityMembersOrder, equityMembersOrderConfig, consumerMember, consumerWallet, memberConfigServiceOne);
-                consumerMemberService.updateConsumerMember(consumerMember);
+                consumerMemberService.updateConsumerMember(newConsumerMember);
                 logger.debug("修改会员类型为权益会员");
             }
             Map<String, String> map = new HashMap<>();