修改权益回调

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

@@ -229,7 +229,8 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 newConsumerMember.setIsRights(YesNoEnum.yes.getIndex());
                 newConsumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
                         Integer.parseInt(expirationDateEquityMembership)));
-                consumerMemberService.updateConsumerMember(newConsumerMember);
+                newConsumerMember.setId(consumerMember.getId());
+                consumerMemberService.updateById(newConsumerMember);
                 logger.debug("修改会员类型为权益会员");
             }
             Map<String, String> map = new HashMap<>();
@@ -270,7 +271,6 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             MemberProgressLog memberProgressLog = new MemberProgressLog();
             memberProgressLog.setConsumerId(equityMembersOrder.getConsumerId());
             memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());
-            consumerMember.setMembershipProgress(equityMembersOrderConfig.getGiftPoints().add(consumerMember.getMembershipProgress()));
             memberProgressLog.setVariableProgress(equityMembersOrderConfig.getGiftPoints());
             memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
             memberProgressLog.setOperationTime(new Date());
@@ -285,6 +285,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             integralLog.setOperationType(YesNoEnum.yes.getIndex());
             integralLog.setOperationTime(new Date());
             integralLog.setCreateTime(new Date());
+            consumerMember.setMembershipProgress(equityMembersOrderConfig.getGiftPoints().add(consumerMember.getMembershipProgress()));
             integralLogService.save(integralLog);
             memberProgressLogService.save(memberProgressLog);
             consumerWalletService.updateById(consumerWallet);