兑卡优惠

tour-module/src/main/java/com/tour/module/service/impl/OrderServiceImpl.java

@@ -135,12 +135,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public Long addOrder(OrderCreateVo orderVo) {
-        Card card = cardService.getOne(new QueryWrapper<Card>().eq("card_key", orderVo.getCardKey()).eq("status", 0));
+        Card card = cardService.getOne(new QueryWrapper<Card>()
+                .eq("card_key", orderVo.getCardKey())
+                .eq("type", orderVo.getType())
+                .eq("status", 0));
         if (card == null) {
             throw new CustomException("卡密无效");
         }
         //会员卡和旅游卡的区别 会员卡要判断是否在有效期内
-        if ("1".equals(card.getType()) && card.getValidEndTime().getTime() < System.currentTimeMillis()) {//会员卡
+        if ("1".equals(card.getType().toString()) && card.getValidEndTime().getTime() < System.currentTimeMillis()) {//会员卡
             throw new CustomException("会员卡已失效");
         }
         Order order = new Order();

tour-module/src/main/java/com/tour/module/vo/OrderCreateVo.java

@@ -25,4 +25,7 @@ public class OrderCreateVo extends BaseVo {
     @ApiModelProperty(name = "线路id")
     private Long lineId;
 
+    @ApiModelProperty(name = "卡类型")
+    private Long type;
+
 }