Commit 56ee7c86 by huluobin

coupon fix

parent f32f7c42
...@@ -286,14 +286,12 @@ public class MarketServiceImpl implements MarketService { ...@@ -286,14 +286,12 @@ public class MarketServiceImpl implements MarketService {
.eq(CouponCustomerRelevance::getState, 1) .eq(CouponCustomerRelevance::getState, 1)
.eq(CouponCustomerRelevance::getSourceType, 1)); .eq(CouponCustomerRelevance::getSourceType, 1));
//订单使用的次卡 //订单使用的次卡
List<TimesCardUsedRecord> timesCardUsedRecordList = timesCardUsedRecordService List<TimesCardUsedRecord> timesCardUsedRecordList = timesCardUsedRecordService
.list(new LambdaQueryWrapper<TimesCardUsedRecord>() .list(new LambdaQueryWrapper<TimesCardUsedRecord>()
.eq(TimesCardUsedRecord::getOrderId, orderId) .eq(TimesCardUsedRecord::getOrderId, orderId)
.eq(TimesCardUsedRecord::getStatus, 1)); .eq(TimesCardUsedRecord::getStatus, 1));
//查询订单聚合 //查询订单聚合
OrderManage orderManage = orderManageMapper.selectById(orderId); OrderManage orderManage = orderManageMapper.selectById(orderId);
List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderId)); List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderId));
...@@ -463,8 +461,6 @@ public class MarketServiceImpl implements MarketService { ...@@ -463,8 +461,6 @@ public class MarketServiceImpl implements MarketService {
}); });
} }
//4、内部券 //4、内部券
if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) { if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
//删除之前的内部券抵扣情况记录 //删除之前的内部券抵扣情况记录
...@@ -652,7 +648,7 @@ public class MarketServiceImpl implements MarketService { ...@@ -652,7 +648,7 @@ public class MarketServiceImpl implements MarketService {
.filter(orderServe -> serveIds.contains(orderServe.getServeId())) .filter(orderServe -> serveIds.contains(orderServe.getServeId()))
.filter(orderServe -> !orderServe.isActivity()) .filter(orderServe -> !orderServe.isActivity())
.filter(orderServe -> orderServe.getBindTimesCard() == 2) .filter(orderServe -> orderServe.getBindTimesCard() == 2)
.filter(orderServe -> orderServe.getBindTimesCard() == 2) .filter(orderServe -> orderServe.getBindInnerCoupon() == 2)
.filter(orderServe -> orderServe.getBindOuterCoupon() == 2) .filter(orderServe -> orderServe.getBindOuterCoupon() == 2)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
......
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