Skip to content

G
gxpt_ht
Commit 5ccd6453 by 吕明尚
Options

Merge branch 'dev' into test

parents 9cccb455 99209a40
Showing with 8 additions and 3 deletions
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
...@@ -1259,8 +1259,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1259,8 +1259,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
integralLog.setOperationType(YesNoEnum.yes.getIndex()); integralLog.setOperationType(YesNoEnum.yes.getIndex());
integralLog.setOperationTime(new Date()); integralLog.setOperationTime(new Date());
integralLog.setCreateTime(new Date()); integralLog.setCreateTime(new Date());
integralLogService.save(integralLog); if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex()) || consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
consumerWalletService.updateById(consumerWallet); integralLogService.save(integralLog);
consumerWalletService.updateById(consumerWallet);
}
} }
MemberProgressLog memberProgressLog = new MemberProgressLog(); MemberProgressLog memberProgressLog = new MemberProgressLog();
memberProgressLog.setConsumerId(sOrder.getConsumerId()); memberProgressLog.setConsumerId(sOrder.getConsumerId());
...@@ -1474,9 +1476,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1474,9 +1476,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
integralLog.setOperationType(YesNoEnum.no.getIndex()); integralLog.setOperationType(YesNoEnum.no.getIndex());
integralLog.setOperationTime(new Date()); integralLog.setOperationTime(new Date());
integralLog.setCreateTime(new Date()); integralLog.setCreateTime(new Date());
integralLogService.save(integralLog);
consumerWallet.setRemainingIntegral(integral); consumerWallet.setRemainingIntegral(integral);
if ((consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex()) || consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex()))
&& membershipProgress.compareTo(BigDecimal.ZERO) >= 0) {
integralLogService.save(integralLog);
consumerWalletService.updateById(consumerWallet); consumerWalletService.updateById(consumerWallet);
}
} }
MemberProgressLog memberProgressLog = new MemberProgressLog(); MemberProgressLog memberProgressLog = new MemberProgressLog();
memberProgressLog.setConsumerId(sOrder.getConsumerId()); memberProgressLog.setConsumerId(sOrder.getConsumerId());
......
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