Commit c7a15a16 by 吕明尚

Merge branch 'dev' into test

parents 37f2b501 4a87fc9e
...@@ -226,6 +226,8 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde ...@@ -226,6 +226,8 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
newConsumerMember.setIsRights(YesNoEnum.yes.getIndex()); newConsumerMember.setIsRights(YesNoEnum.yes.getIndex());
newConsumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())), newConsumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
Integer.parseInt(expirationDateEquityMembership))); Integer.parseInt(expirationDateEquityMembership)));
consumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
Integer.parseInt(expirationDateEquityMembership)));
newConsumerMember.setId(consumerMember.getId()); newConsumerMember.setId(consumerMember.getId());
consumerMemberService.updateById(newConsumerMember); consumerMemberService.updateById(newConsumerMember);
if (consumerMember.getIsRights().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) { if (consumerMember.getIsRights().equals(YesNoEnum.no.getIndex()) && consumerMember.getIsRecharge().equals(YesNoEnum.no.getIndex())) {
......
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