Commit eae986dd by 吕明尚

Merge branch 'dev' into test

parents b101c4a4 5d2493d2
...@@ -270,6 +270,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde ...@@ -270,6 +270,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
@Override @Override
public void addConsumerMember(Long consumerId, BigDecimal giftPoints, public void addConsumerMember(Long consumerId, BigDecimal giftPoints,
ConsumerMember consumerMember, ConsumerWallet consumerWallet) { ConsumerMember consumerMember, ConsumerWallet consumerWallet) {
logger.debug("积分新增,会员进度新增开始");
String expirationDateEquityMembership = sysConfigService.selectConfigByKey("expirationDateEquityMembership"); String expirationDateEquityMembership = sysConfigService.selectConfigByKey("expirationDateEquityMembership");
if (giftPoints.compareTo(BigDecimal.ZERO) > 0) { if (giftPoints.compareTo(BigDecimal.ZERO) > 0) {
MemberProgressLog memberProgressLog = new MemberProgressLog(); MemberProgressLog memberProgressLog = new MemberProgressLog();
...@@ -308,6 +309,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde ...@@ -308,6 +309,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
consumerMemberService.updateConsumerMember(consumerMember); consumerMemberService.updateConsumerMember(consumerMember);
} }
} }
logger.debug("积分新增,会员进度新增结束");
} }
@Override @Override
public Boolean cancelPay(String equityOrderNo) { public Boolean cancelPay(String equityOrderNo) {
......
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