Ver código fonte

更改接口返回

xusonglin 5 anos atrás
pai
commit
84661c19b1

+ 12 - 7
src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeServiceImpl.java

@@ -8,19 +8,19 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.jkcredit.invoice.hub.constant.CommonConstant;
 import com.jkcredit.invoice.hub.enums.ApiResponseCodeEnum;
 import com.jkcredit.invoice.hub.model.dto.apiCarFree.InvoiceResult;
 import com.jkcredit.invoice.hub.model.dto.apiCarFree.InvoiceResultDto;
+import com.jkcredit.invoice.hub.model.dto.apiCarFree.VehicleRegisterDto;
 import com.jkcredit.invoice.hub.model.dto.apiCarFree.WayBillNumFindInvoiceDto;
 import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
 import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.CarFreeCarrierBillStartDto;
-import com.jkcredit.invoice.hub.model.dto.apiCarFree.VehicleRegisterDto;
 import com.jkcredit.invoice.hub.model.dto.searchInvoice.SearchInvoiceDto;
 import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
-import com.jkcredit.invoice.hub.model.po.searchInvoice.SearchInvoicePo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.service.carFreeCarrierBillEnd.CarFreeCarrierBillEndService;
 import com.jkcredit.invoice.hub.service.carFreeCarrierBillStart.CarFreeCarrierBillStartService;
@@ -36,7 +36,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,7 +62,7 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
     public ApiResponseData vehicleRegisterQuery(JSONObject param) {
         long costTimeStart = System.currentTimeMillis();
         String result;
-
+        String message;
         try {
             VehicleRegisterDto dto = JSON.toJavaObject(param, VehicleRegisterDto.class);
             validate(dto);
@@ -79,6 +78,13 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             VehicleQueryResponse response = ETCCommHelper.upload(fileName, request, VehicleQueryResponse.class);
 
             result = response.toJson();
+            JSONObject resultObject = JSON.parseObject(result);
+            JSONArray array = JSONArray.parseArray(JSON.toJSONString(resultObject.get("result")));
+            if (array.size() == 0) {
+                message = "车辆未备案";
+            } else {
+                message = "车辆已备案";
+            }
             long costTimeEnd = System.currentTimeMillis();
             log.info("[-vehicleRegisterQuery-] result is " + result.replaceAll("\r|\n", "") + " , request is "
                     + param + ",costtime=" + (costTimeEnd - costTimeStart) + ",startTime=" + costTimeStart
@@ -93,14 +99,13 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             log.error("[-vehicleRegisterQuery-] 错误信息:" + se.getMessage());
             throw new ServiceException(se.getMessage());
         }
-        return analyzeApiResultItems(result);
+        return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), message);
     }
 
     @Override
     public ApiResponseData vehicleRegister(JSONObject param) {
         long costTimeStart = System.currentTimeMillis();
         String result;
-
         try {
             VehicleRegisterDto dto = JSON.toJavaObject(param, VehicleRegisterDto.class);
             validate(dto);
@@ -129,7 +134,7 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             log.error("[-apiVehicleRegister-] 错误信息:" + se.getMessage());
             throw new ServiceException(se.getMessage());
         }
-        return analyzeApiResultItems(result);
+        return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), result);
     }
 
     @Override

+ 1 - 1
src/main/java/com/jkcredit/invoice/hub/service/apiCompany/ApiCompanyServiceImpl.java

@@ -109,6 +109,6 @@ public class ApiCompanyServiceImpl extends BaseService implements ApiCompanyServ
             log.error("[-companyAdd-] 错误信息:" + se.getMessage());
             throw new ServiceException(se.getMessage());
         }
-        return analyzeApiResultItems(result);
+        return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), result);
     }
 }