转赠

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

@@ -881,10 +881,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
                 for (AdamEntersVo item : adamEnters) {
                     entersVoList.add(item);
-                    if(!item.getType().equals(1)){
-                        return ResponseDto.failure("学生票优惠核验失败，无法购买");
-                    }
                     if (ticketData.getIsStudent() == 1) {
+                        if(!item.getType().equals(1)){
+                            return ResponseDto.failure("学生票优惠核验失败，无法购买");
+                        }
                         int age = IDCard.getAgeByIdCard(item.getIdCard());
                         if (age > 25) {
                             return ResponseDto.failure(ErrorMapping.get("20017"));//学生票年龄问题

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

@@ -182,9 +182,9 @@ public class OrderUtils {
 
 
     public List<AdamEntersVo> getEnters(String entersIds, String uid) {
-        MultiValueMap<String, String> head = CollectionUtil.linkedMultiValueMapStringString();
-        head.add("Content-Type", "application/json;charset=UTF-8");
-        String returnVo = HttpUtil.get("https://testadam.zhengzai.tv" + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, head);
+        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+        headers.add("Accept", "application/json;charset=UTF-8");
+        String returnVo = HttpUtil.get("https://testadam.zhengzai.tv" + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
         ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
         });
         return ResponseVo.getData();