Browse Source

增加红冲发票查询接口

15810770710@163.com 3 years ago
parent
commit
1192492dce

+ 2 - 2
pom.xml

@@ -30,7 +30,7 @@
         <jackson.databind.version>2.8</jackson.databind.version>
         <jackson.datatype.version>2.8</jackson.datatype.version>
         <sdk.common.version>1.0</sdk.common.version>
-        <waybill.protocol.version>1.3.4</waybill.protocol.version>
+        <waybill.protocol.version>1.3.9</waybill.protocol.version>
         <slf4j.api.version>1.7</slf4j.api.version>
         <validation.api.version>1.1.0</validation.api.version>
         <jsonwebtoken.version>0.9.0</jsonwebtoken.version>
@@ -223,7 +223,7 @@
             <artifactId>sdk-waybill-protocol</artifactId>
             <version>${waybill.protocol.version}</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/sdk-waybill-protocol-1.3.5.jar</systemPath>
+            <systemPath>${project.basedir}/src/main/resources/lib/sdk-waybill-protocol-1.3.9.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>slf4j.api</groupId>

+ 3 - 1
src/main/java/com/jkcredit/invoice/hub/constant/CommonConstant.java

@@ -14,7 +14,7 @@ public class CommonConstant {
     public static Integer ACTIVATED_DELETED = 2;
     public static String[] CAR_FREE_API_ARGS = {"COMPANY_QUERY_V1", "COMPANY_ADD_V1", "VEHICLE_REGISTER_QUERY",
             "VEHICLE_REGISTER", "WAY_BILL_START", "WAY_BILL_END", "WAY_BILL_HISTORY_START", "WAY_BILL_HISTORY_END",
-            "WAY_BILL_NUM_FIND_INVOICE", "WAY_BILL_COUNT_QUERY", "BALANCE_QUERY", "FIND_INVOICE", "FIND_NO_SEARCH_NUM"};
+            "WAY_BILL_NUM_FIND_INVOICE", "WAY_BILL_COUNT_QUERY", "BALANCE_QUERY", "FIND_INVOICE", "FIND_NO_SEARCH_NUM", "OFFSET_INVOICE_QUERY"};
     // companyNum
     public static final String COMPANY_NUMBER = "10004616";
 
@@ -42,6 +42,8 @@ public class CommonConstant {
     public static String BALANCE_QUERY = "BALANCE_QUERY";
     // 获取未查询过发票的运单编号
     public static String FIND_NO_SEARCH_NUM = "FIND_NO_SEARCH_NUM";
+    // 红冲发票查询
+    public static String OFFSET_INVOICE_QUERY = "OFFSET_INVOICE_QUERY";
 
     // 备案来源 无车承运人
     public static Integer WAYBILL_SOURCE_1 = 1;

+ 2 - 0
src/main/java/com/jkcredit/invoice/hub/controller/rest/forward/ForwardResource.java

@@ -82,6 +82,8 @@ public class ForwardResource extends RestResource {
                 return apiCarFreeService.findInvoice(JSON.parseObject(JSON.toJSONString(param.getData())));
             } else if (param.getApi().equals(CommonConstant.FIND_NO_SEARCH_NUM)) {
                 return apiCarFreeService.findNoSearchNums(JSON.parseObject(JSON.toJSONString(param.getData())));
+            } else if (param.getApi().equals(CommonConstant.OFFSET_INVOICE_QUERY)) {
+                return apiCarFreeService.offsetInvoiceQuery(JSON.parseObject(JSON.toJSONString(param.getData())));
             } else {
                 return ApiResponseData.failure(ApiResponseCodeEnum.CODE_1080.getValue(), ApiResponseCodeEnum.CODE_1080.getDesc());
             }

+ 16 - 0
src/main/java/com/jkcredit/invoice/hub/model/dto/apiCarFree/OffsetInvoiceQueryDto.java

@@ -0,0 +1,16 @@
+package com.jkcredit.invoice.hub.model.dto.apiCarFree;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xusonglin
+ * @version V1.0
+ **/
+@Data
+public class OffsetInvoiceQueryDto implements Serializable {
+    private static final long serialVersionUID = 1277544725903433250L;
+    private String companyNum;
+    private String month;
+}

+ 3 - 0
src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeService.java

@@ -36,4 +36,7 @@ public interface ApiCarFreeService {
 
     // 获取无车未查询过发票的运单编号
     ApiResponseData findNoSearchNums(JSONObject param);
+
+    // 红冲发票查询
+    ApiResponseData offsetInvoiceQuery(JSONObject param);
 }

+ 34 - 4
src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeServiceImpl.java

@@ -13,10 +13,7 @@ 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.apiCarFree.*;
 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.searchInvoice.SearchInvoiceDto;
@@ -425,4 +422,37 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             throw new ServiceException(e.getMessage());
         }
     }
+
+    @Override
+    public ApiResponseData offsetInvoiceQuery(JSONObject param) {
+        long costTimeStart = System.currentTimeMillis();
+        String result;
+
+        try {
+            OffsetInvoiceQueryDto dto = JSONObject.toJavaObject(param, OffsetInvoiceQueryDto.class);
+            validate(dto);
+            WaybillInvoiceRedQueryRequest request = new WaybillInvoiceRedQueryRequest();
+            request.setCompanyNum(CommonConstant.COMPANY_NUMBER);
+            request.setMonth(dto.getMonth());
+            String fileName = request.getFilename();
+
+            // 调用upload 发送数据
+            WaybillInvoiceRedQueryResponse response = ETCCommHelper.upload(fileName, request, WaybillInvoiceRedQueryResponse.class);
+            result = response.toJson();
+            long costTimeEnd = System.currentTimeMillis();
+            log.info("[-offsetInvoiceQuery-] result is " + result.replaceAll("\r|\n", "") + " , request is "
+                    + param + ",costtime=" + (costTimeEnd - costTimeStart) + ",startTime=" + costTimeStart
+                    + ",endTime=" + costTimeEnd);
+        } catch (IOException e) {
+            log.error("[-offsetInvoiceQuery-] 网络异常 " + e);
+            throw new ServiceException(CommonConstant.QUERY_FAILED);
+        } catch (ApiRequestException apie) {
+            log.error("[-offsetInvoiceQuery-] 错误信息:" + apie.getMessage());
+            throw new com.jkcredit.invoice.hub.spi.lang.exception.ApiRequestException(apie.getMessage());
+        } catch (ServiceException se) {
+            log.error("[-offsetInvoiceQuery-] 错误信息:" + se.getMessage());
+            throw new ServiceException(se.getMessage());
+        }
+        return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), result);
+    }
 }

BIN
src/main/resources/lib/sdk-waybill-protocol-1.3.5.jar


BIN
src/main/resources/lib/sdk-waybill-protocol-1.3.9.jar