计费调试

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

@@ -74,7 +74,10 @@ public class ForwardResource extends RestResource {
             } else if (param.getApi().equals(CommonConstant.BALANCE_QUERY)) {
                 return apiUserService.balanceQuery(JSON.parseObject(JSON.toJSONString(param.getData())));
             } else if (param.getApi().equals("FIND_INVOICE")) {
+                // 自用接口，不对客户开放
                 return apiCarFreeService.wayBillNumFindInvoice(JSON.parseObject(JSON.toJSONString(param.getData())));
+            } else if (param.getApi().equals(CommonConstant.WAY_BILL_NUM_FIND_INVOICE)) {
+                return null;
             } else {
                 return ApiResponseData.failure(ApiResponseCodeEnum.CODE_1080.getValue(), ApiResponseCodeEnum.CODE_1080.getDesc());
             }

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

@@ -70,7 +70,7 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
             param.put("num", po.getNum());
 
             // 接口调用
-            ApiResponseData apiResponseData = carFreeService.waiBillNumFindInvoice(param);
+            ApiResponseData apiResponseData = carFreeService.wayBillNumFindInvoice(param);
 
             // 判断接口是否调用成功
             if (apiResponseData.getData().equals(CommonConstant.SUCCESS_CODE)
@@ -93,7 +93,7 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
                     if (searchInvoiceDto == null) {
                         searchInvoiceService.saveSearchInvoice(invoiceResultDto);
                     }
-
+                    log.info("invoiceResultDto.getResult().size() = {}", invoiceResultDto.getResult().size());
                     if (invoiceResultDto.getResult().size() > 0) {
                         //去重列表
                         newSearchInvoiceResultList = invoiceResultDto.getResult().stream().collect(
@@ -103,6 +103,7 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
                         newSearchInvoiceResultList.stream().forEach(t -> {
                             // todo 上线后删除
                             t.setTransactionId(t.getTransactionId() + System.currentTimeMillis());
+                            log.info("计费t + System.currentTimeMillis() = {}", t);
                             if (!redisTemplate.hasKey(CommonConstant.TRANSACTION_ID_KEY + t.getTransactionId())) {
                                 UserBalanceDto userBalanceDto = userBalanceService.getUserBalance(po.getUserId());
                                 UserBalanceInvoiceDto userBalanceInvoiceDto = new UserBalanceInvoiceDto();
@@ -110,6 +111,7 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
                                 userBalanceInvoiceDto.setNum(t.getWaybillNum());
                                 userBalanceInvoiceDto.setTransactionId(t.getTransactionId());
                                 //发送到消息队列
+                                log.info("发送到消息队列");
                                 chargeProducer.send(userBalanceInvoiceDto);
                                 // 将需要计费数据插入数据库
                                 UserDto userDto = userService.getUser(po.getUserId());
@@ -125,6 +127,8 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
                     }
                     // 遍历发票集合
                     invoiceResultDto.getResult().stream().forEach(t -> {
+                        t.setTransactionId(t.getTransactionId() + System.currentTimeMillis());
+                        log.info("遍历发票集合t + System.currentTimeMillis() = {}", t);
                         if (!redisTemplate.hasKey(CommonConstant.NUM_FIND_INVOICE_KEY + t.getInvoiceNum() + "_" + t.getInvoiceCode())) {
                             SearchInvoiceResultDto dto = new SearchInvoiceResultDto();
                             BeanUtil.copyProperties(dto, t);

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

@@ -28,7 +28,9 @@ public interface ApiCarFreeService {
     // 无车历史运单结束指令
     ApiResponseData wayBillHistoryEnd(JSONObject param);
 
-    // 无车运单编号查询发票
+    // 无车运单编号查询发票(直连上游，不查数据库)
     ApiResponseData wayBillNumFindInvoice(JSONObject param);
 
+    // 无车运单编号查询发票（先查数据库，数据库不存在则查询接口+计费规则）
+    ApiResponseData findInvoice(JSONObject param);
 }

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

@@ -332,4 +332,9 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
         }
         return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), result);
     }
+
+    @Override
+    public ApiResponseData findInvoice(JSONObject param) {
+        return null;
+    }
 }