|
|
@@ -257,7 +257,7 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
|
|
|
lifeDiscountCouponStoreFriendService.issueFriendCoupon(lifeDiscountCouponStoreFriendDto);
|
|
|
}
|
|
|
// 订单状态 -> 已完成 筛选出未完成的状态
|
|
|
- List<OrderCouponMiddle> collect = couponMiddleList.stream().filter(x -> x.getStatus() == OrderStatusEnum.WAIT_USE.getStatus() && x.getStatus() == OrderStatusEnum.REFUND_FAILED.getStatus())
|
|
|
+ List<OrderCouponMiddle> collect = couponMiddleList.stream().filter(x -> x.getStatus() == OrderStatusEnum.WAIT_USE.getStatus() || x.getStatus() == OrderStatusEnum.REFUND_FAILED.getStatus())
|
|
|
.collect(Collectors.toList());
|
|
|
if (collect.size() == 0) {
|
|
|
lifeUserOrder.setStatus(OrderStatusEnum.COMPLETE.getStatus());
|