|
|
@@ -326,14 +326,14 @@ public class TKSimpleService {
|
|
|
|
|
|
carInfoVo.setLocalCarFlag(null); // todo 车型查询时没有传这个参数,暂时不知什么地方用到。
|
|
|
|
|
|
- String tempOrderId = newOrderId(session);
|
|
|
+// String tempOrderId = newOrderId(session);
|
|
|
|
|
|
CarModelinfoQueryParam carModelinfoQueryParam = new CarModelinfoQueryParam();
|
|
|
carModelinfoQueryParam.setTplatformId(session.getTplatformId());
|
|
|
carModelinfoQueryParam.setTplatLoginKey(session.getTplatLoginKey());
|
|
|
carModelinfoQueryParam.setFromId(session.getFromid());
|
|
|
//抓包观察到每次查车型前,都要获取一个新的订单id, 不知道为什么
|
|
|
- carModelinfoQueryParam.setOrderID(tempOrderId);
|
|
|
+ carModelinfoQueryParam.setOrderID(mainOrderId);
|
|
|
carModelinfoQueryParam.setOrderOldID(mainOrderId);
|
|
|
carModelinfoQueryParam.setChannelCode("OffWeb");
|
|
|
carModelinfoQueryParam.setAreaInfoVo(area);
|
|
|
@@ -408,19 +408,16 @@ public class TKSimpleService {
|
|
|
public CarModelinfoQueryResult queryCarModel(TKLoginSession session, String mainOrderId, CarInfoVo commonCarInfoVo, TKAreaInfoVo area) {
|
|
|
// 第一次查车型,使用车牌号的方式
|
|
|
CarModelinfoQueryResult carModelinfoQueryResult = queryCarModelsByLicenseNo(session, mainOrderId, commonCarInfoVo, area);
|
|
|
-
|
|
|
+// CarModelinfoQueryResult carModelinfoQueryResult = queryCarModelsByVinNo(session, mainOrderId, commonCarInfoVo, area);
|
|
|
List<TKCarModel> tkCarModels = CarModelinfoQueryResult.hasModel(carModelinfoQueryResult);
|
|
|
|
|
|
if (tkCarModels == null) {
|
|
|
- // 第二次查车型,如果第一次没查到,使用车架号的方式
|
|
|
+// // 第二次查车型,如果第一次没查到,使用车架号的方式
|
|
|
carModelinfoQueryResult = queryCarModelsByVinNo(session, mainOrderId, commonCarInfoVo, area);
|
|
|
-
|
|
|
+//
|
|
|
tkCarModels = CarModelinfoQueryResult.hasModel(carModelinfoQueryResult);
|
|
|
+// throw new RuntimeException("车辆信息未查询到!");
|
|
|
}
|
|
|
- // 使用车架号的方式
|
|
|
-// CarModelinfoQueryResult carModelinfoQueryResult = queryCarModelsByVinNo(session, mainOrderId, commonCarInfoVo, area);
|
|
|
-//
|
|
|
-// List<TKCarModel> tkCarModels = CarModelinfoQueryResult.hasModel(carModelinfoQueryResult);
|
|
|
|
|
|
return carModelinfoQueryResult;
|
|
|
}
|
|
|
@@ -585,7 +582,7 @@ public class TKSimpleService {
|
|
|
* @param tkAreaInfoVo
|
|
|
* @param carModelinfoQueryResult
|
|
|
*/
|
|
|
- public void orderCreate(TKLoginSession session,
|
|
|
+ public void orderCreate(TKLoginSession session,
|
|
|
String mainOrderId,
|
|
|
QuoteVo commonQuoteVo,
|
|
|
TKAreaInfoVo tkAreaInfoVo,
|
|
|
@@ -659,7 +656,9 @@ public class TKSimpleService {
|
|
|
car.setSeatFlag("1"); // todo
|
|
|
car.setExhaustScale(tkCarModel.getDisplacement().substring(0,tkCarModel.getDisplacement().indexOf(".")));
|
|
|
car.setPurchasePrice(tkCarModel.getPurchasePrice().substring(0,tkCarModel.getPurchasePrice().indexOf(".")));
|
|
|
-
|
|
|
+// car.setVinNo(commonCarInfoVo.getVinNo());
|
|
|
+// car.setEngineNo(commonCarInfoVo.getEngineNo());
|
|
|
+// car.setEnrollDate(commonCarInfoVo.getRegisterDate());
|
|
|
|
|
|
Double tonCount = commonCarInfoVo.getTonCountDouble();
|
|
|
if (tonCount != null && tonCount > 2) {
|