券下单相关

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -282,6 +282,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                 }
             }
+            if(e.getMessage().equals("券不可用")){
+                return ResponseDto.failure(ErrorMapping.get("20030"));//券不可用
+            }
             return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
         }
     }
@@ -322,6 +325,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             orderTickets.setPriceTotal(ticketData.getPrice().multiply(BigDecimal.valueOf(payOrderParam.getNumber())).add(payOrderParam.getIsExpress() == 1 ? ticketData.getPriceExpress() : BigDecimal.valueOf(0)));
         }
 
+        orderTickets.setPriceVoucher(BigDecimal.ZERO);
         //券的使用逻辑
         sqls.add(SqlMapping.get("kylin_order_coupon.add"));
         LinkedList<Object[]> sqlsDataE = ObjectUtil.cloneLinkedListObj();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.order.utils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
@@ -180,8 +181,13 @@ public class OrderUtils {
         params.add("uCouponId", uCouponId);
         params.add("content", content);
         params.add("totalPrice", totalPrice.toString());
-        String returnData = HttpUtil.post(candyUrl+"/candy-coupon/use", params, null);
-        InnerReturnVo<CandyUseResultVo> innerReturnVo = JsonUtils.fromJson(returnData, InnerReturnVo.class);
+
+        MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+        header.add("Authorization", "Bearer "+CurrentUtil.getToken());
+
+        String returnData = HttpUtil.post(candyUrl+"/candy-coupon/use", params, header);
+        InnerReturnVo<CandyUseResultVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<InnerReturnVo<CandyUseResultVo>>() {
+        });
         CandyUseResultVo candyUseResultVo = innerReturnVo.getData();
         Integer type = candyUseResultVo.getCouType();
         BigDecimal value = candyUseResultVo.getValue();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/errors.properties

@@ -33,6 +33,7 @@
 20028=订单已失效
 20027=您已支付请刷新再试
 20029=未选择支付方式
+20030=券不可用
 
 #APP PARTNER
 20101=添加失败