记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 3ecc4311 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'hjc_road_coupon' into dev_rc_xuper_op

parents b2d4bfed cb58dd96
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 3ecc4311
...@@ -253,13 +253,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -253,13 +253,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
return ResponseDto.failure("优先券不可用"); return ResponseDto.failure("优先券不可用");
} }
Integer typeVoucher = (Integer) advanceMap.get("type"); Integer typeVoucher = (Integer) advanceMap.get("type");
// String couponId = (String) advanceMap.get("couponId"); String couponId = (String) advanceMap.get("couponId");
// if (typeVoucher.equals(-1) || orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) { if (typeVoucher.equals(-1) || orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) {
// return ResponseDto.failure("优先券不可用");
// }
if (typeVoucher.equals(-1)) {
return ResponseDto.failure("优先券不可用"); return ResponseDto.failure("优先券不可用");
} }
// if (typeVoucher.equals(-1)) {
// return ResponseDto.failure("优先券不可用");
// }
} }
} }
} }
......
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