Merge branch 'refs/heads/dev' into test

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

@@ -247,7 +247,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             memberProgressLog.setOperationTime(new Date());
             memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
             memberProgressLog.setCreateTime(new Date());
-            memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), memberConfigService.getById(one.getConsumerId()).getValidityPeriod().intValue()));
+            memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), memberConfigService.getById(one.getMemberConfigId()).getValidityPeriod().intValue()));
             memberProgressLogService.save(memberProgressLog);
             one.setMembershipProgress(one.getMembershipProgress().add(divide));
         }