获取未查询过发票的运单编号

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"};
+            "WAY_BILL_NUM_FIND_INVOICE", "WAY_BILL_COUNT_QUERY", "BALANCE_QUERY", "FIND_INVOICE", "FIND_NO_SEARCH_NUM"};
     // companyNum
     public static final String COMPANY_NUMBER = "10004616";
 
@@ -40,6 +40,8 @@ public class CommonConstant {
     public static String WAY_BILL_COUNT_QUERY = "WAY_BILL_COUNT_QUERY";
     // 用户余额查询
     public static String BALANCE_QUERY = "BALANCE_QUERY";
+    // 获取未查询过发票的运单编号
+    public static String FIND_NO_SEARCH_NUM = "FIND_NO_SEARCH_NUM";
 
     // 备案来源 无车承运人
     public static Integer WAYBILL_SOURCE_1 = 1;

src/main/java/com/jkcredit/invoice/hub/controller/rest/forward/ForwardResource.java

@@ -77,7 +77,10 @@ public class ForwardResource extends RestResource {
                 // 自用接口，不对客户开放
                 return apiCarFreeService.wayBillNumFindInvoice(JSON.parseObject(JSON.toJSONString(param.getData())));
             } else if (param.getApi().equals(CommonConstant.WAY_BILL_NUM_FIND_INVOICE)) {
+                // 客户用 运单查询发票
                 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 {
                 return ApiResponseData.failure(ApiResponseCodeEnum.CODE_1080.getValue(), ApiResponseCodeEnum.CODE_1080.getDesc());
             }

src/main/java/com/jkcredit/invoice/hub/mapper/CarFreeCarrierBillStartMapper.java

@@ -20,4 +20,7 @@ public interface CarFreeCarrierBillStartMapper extends BaseMapper<CarFreeCarrier
 
     // 查询状态为已结束和开票中运单的历史运单
     List<CarFreeCarrierBillStartPo> getHistoryBills();
+
+    // 查询未被查询过的运单编号
+    List<String> getNoSearchNums(String userId);
 }

src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeService.java

@@ -33,4 +33,7 @@ public interface ApiCarFreeService {
 
     // 无车运单编号查询发票（先查数据库，数据库不存在则查询接口+计费规则）
     ApiResponseData findInvoice(JSONObject param);
+
+    // 获取无车未查询过发票的运单编号
+    ApiResponseData findNoSearchNums(JSONObject param);
 }

src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeServiceImpl.java

@@ -364,7 +364,19 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
             }
             return apiCarFreeChargeService.charge(po);
         } catch (ServiceException se) {
+            log.error("[-findInvoice-] 错误信息：" + se.getMessage());
             throw new ApiRequestException(se.getMessage(), ApiResponseCodeEnum.CODE_200.getValue());
         }
     }
+
+    @Override
+    public ApiResponseData findNoSearchNums(JSONObject param) {
+        try {
+            List<String> nums = wayBillStartService.getNoSearchNums(param.getString("userId"));
+            return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), JSON.toJSONString(nums));
+        } catch (ServiceException e) {
+            log.error("[-findNoSearchNums-] 错误信息：" + e.getMessage());
+            throw new ServiceException(e.getMessage());
+        }
+    }
 }

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillStart/CarFreeCarrierBillStartService.java

@@ -25,4 +25,6 @@ public interface CarFreeCarrierBillStartService {
     void saveBillStart(CarFreeCarrierBillStartPo po);
 
     void updateBillStartIsSearch(String num);
+
+    List<String> getNoSearchNums(String userId);
 }

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillStart/CarFreeCarrierBillStartServiceImpl.java

@@ -115,4 +115,16 @@ public class CarFreeCarrierBillStartServiceImpl extends BaseService implements C
             throw new ServiceException("更新运单查询标记失败");
         }
     }
+
+    @Override
+    public List<String> getNoSearchNums(String userId) {
+        List<String> nums;
+        try {
+            nums = mapper.getNoSearchNums(userId);
+        } catch (Exception e) {
+            log.error("获取未查询过运单编号失败,失败原因：{}", e.getMessage());
+            throw new ServiceException("获取未查询过运单编号失败");
+        }
+        return nums;
+    }
 }

src/main/resources/mapper/CarFreeCarrierBillStartMapper.xml

@@ -34,4 +34,8 @@
     <select id="getHistoryBills" resultMap="baseResultMap">
         select * from h_car_free_carrier_bill_start where activated = 1 and is_history = 2 and (status = 2 or status = 4)
     </select>
+
+    <select id="getNoSearchNums" resultType="java.lang.String">
+        select num from h_car_free_carrier_bill_start where activated = 1 and is_search = 1 and user_id = #{userId}
+    </select>
 </mapper>