Commit 806663f8 by 吕明尚

修改累计消费进行积分

parent 833cfe68
...@@ -313,8 +313,10 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper, ...@@ -313,8 +313,10 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
List<Long> ids = orderList.stream().map(SOrder::getCouponId).filter(Objects::nonNull).collect(Collectors.toList()); List<Long> ids = orderList.stream().map(SOrder::getCouponId).filter(Objects::nonNull).collect(Collectors.toList());
if (CollectionUtil.isEmpty(ids)) { if (CollectionUtil.isEmpty(ids)) {
logger.debug("优惠券为空"); logger.debug("优惠券为空");
if (one.getMemberType().equals(MemberTypeEnum.RECHARGE.getIndex())) {
return; return;
} }
} else {
List<SConsumerCoupon> consumerCouponList = consumerCouponService.selectByIds(ids).stream() List<SConsumerCoupon> consumerCouponList = consumerCouponService.selectByIds(ids).stream()
.filter(s -> s.getCouponType().equals(CouponTypeEnum.CASH.getCode())).collect(Collectors.toList()); .filter(s -> s.getCouponType().equals(CouponTypeEnum.CASH.getCode())).collect(Collectors.toList());
consumerCouponList.stream().forEach(item -> { consumerCouponList.stream().forEach(item -> {
...@@ -324,6 +326,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper, ...@@ -324,6 +326,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
consumption[0] = consumption[0].add(sCouponMap.get(item.getCouponId()).getCouponPayPrice()); consumption[0] = consumption[0].add(sCouponMap.get(item.getCouponId()).getCouponPayPrice());
} }
}); });
}
logger.debug("优惠券购买金额:" + consumption[0]); logger.debug("优惠券购买金额:" + consumption[0]);
if (one.getMemberType().equals(MemberTypeEnum.RIGHTS.getIndex())) { if (one.getMemberType().equals(MemberTypeEnum.RIGHTS.getIndex())) {
//orderList累加payPrice //orderList累加payPrice
......
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