Commit 360ec9d4 by 吕明尚

Merge branch 'refs/heads/dev' into test

parents 59a86e8b 92d7b773
...@@ -247,7 +247,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper, ...@@ -247,7 +247,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
memberProgressLog.setOperationTime(new Date()); memberProgressLog.setOperationTime(new Date());
memberProgressLog.setOperationType(YesNoEnum.yes.getIndex()); memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
memberProgressLog.setCreateTime(new Date()); 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); memberProgressLogService.save(memberProgressLog);
one.setMembershipProgress(one.getMembershipProgress().add(divide)); one.setMembershipProgress(one.getMembershipProgress().add(divide));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment