修改 下单接口

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

@@ -148,7 +148,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             //校验快递相关参数
             if (payOrderParam.getIsExpress() == 1 && payOrderParam.getExpressType() == 1) {
-                if (payOrderParam.getAdCode() == null || payOrderParam.getProductCode() == null) {
+                if (payOrderParam.getProductCode() == null) {
                     return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
                 }
             }
@@ -180,6 +180,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             AdamRscPolymer01Vo userVo = orderUtils.adamAddressEnterMember(uid, enterIds, addressId);
             List<AdamEntersVo> entersVos;
             AdamAddressesVo addressesVo;
+            payOrderParam.setAdCode("530102");//TODO
             boolean isMember;
             boolean isOldMember;
             if (userVo == null) {

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

@@ -307,8 +307,7 @@ public class OrderUtils {
             header.add("Accept", "application/json;charset=UTF-8");
             header.add("Authorization", "Bearer " + CurrentUtil.getToken());
             String resultData = HttpUtil.get(kylinUrl + "/getShunFengPrice/getPrice?adcode=" + adCode + "&productCode=" + productCode, null, header);
-            ResponseDto<String> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<String>>() {
-            });
+            ResponseDto<String> innerReturnVo = JsonUtils.fromJson(resultData, ResponseDto.class);
             return BigDecimal.valueOf(Integer.parseInt(innerReturnVo.getData().replace("元", "")));
         } catch (Exception e) {
             log.error("获取快递费失败:{}", e);