计费查询

src/main/java/com/jkcredit/invoice/hub/model/po/carFreeCarrierBillStart/CarFreeCarrierBillStartPo.java

@@ -59,4 +59,6 @@ public class CarFreeCarrierBillStartPo implements Serializable {
     private Date updateTime;
     // 删除标记
     private Integer activated;
+    // 是否查询过
+    private Integer isSearch;
 }

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

@@ -104,7 +104,6 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
                                     Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(InvoiceResult::getFee))), ArrayList::new));
                     //计费
                     newSearchInvoiceResultList.stream().forEach(t -> {
-                        t.setTransactionId(t.getTransactionId());
                         if (!redisTemplate.hasKey(CommonConstant.TRANSACTION_ID_KEY + t.getTransactionId())) {
                             // todo 此处计费需要使用消息实现
 //                                UserBalanceDto userBalanceDto = userBalanceService.getUserBalance(po.getUserId());

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

@@ -351,29 +351,20 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
 
     @Override
     public ApiResponseData findInvoice(JSONObject param) {
-        List<InvoiceResult> dtoList = searchInvoiceResultService.getSearchInvoiceResult(param.getString("num"), param.getLong("userId"));
-        if (dtoList.size() != 0) {
-            SearchInvoiceDto searchInvoiceDto = searchInvoiceService.getSearchInvoiceByNum(param.getString("num"));
-            InvoiceResultDto invoiceResultDto = new InvoiceResultDto();
-            BeanUtil.copyProperties(invoiceResultDto, searchInvoiceDto);
-            invoiceResultDto.setResult(dtoList);
-            return ApiResponseData.success(ApiResponseCodeEnum.CODE_200.getValue(), JSON.toJSONString(invoiceResultDto));
-        } else {
-            try {
-                CarFreeCarrierBillStartPo po = wayBillStartService.getBillStartByNum(param.getString("num"));
-//                if (po == null) {
-//                    throw new ApiRequestException("业务校验错误:运单编号错误或该运单不存在\n", 803);
-//                }
-                if (po == null) {
-                    po = new CarFreeCarrierBillStartPo();
-                    po.setNum(param.getString("num"));
-                    po.setUserId(param.getLong("userId"));
-                    wayBillStartService.saveBillStart(po);
-                }
-                return apiCarFreeChargeService.charge(po);
-            } catch (ServiceException se) {
-                throw new ApiRequestException(se.getMessage(), ApiResponseCodeEnum.CODE_200.getValue());
+        try {
+            CarFreeCarrierBillStartPo po = wayBillStartService.getBillStartByNum(param.getString("num"));
+            if (po == null) {
+                po = new CarFreeCarrierBillStartPo();
+                po.setNum(param.getString("num"));
+                po.setUserId(param.getLong("userId"));
+                po.setIsSearch(2);
+                wayBillStartService.saveBillStart(po);
+            } else {
+                wayBillStartService.updateBillStartIsSearch(param.getString("num"));
             }
+            return apiCarFreeChargeService.charge(po);
+        } catch (ServiceException se) {
+            throw new ApiRequestException(se.getMessage(), ApiResponseCodeEnum.CODE_200.getValue());
         }
     }
 }

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

@@ -23,4 +23,6 @@ public interface CarFreeCarrierBillStartService {
     CarFreeCarrierBillStartPo getBillStartByNum(String num);
 
     void saveBillStart(CarFreeCarrierBillStartPo po);
+
+    void updateBillStartIsSearch(String num);
 }

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

@@ -102,4 +102,17 @@ public class CarFreeCarrierBillStartServiceImpl extends BaseService implements C
             throw new ServiceException("新增运单开始指令数据失败");
         }
     }
+
+    @Override
+    public void updateBillStartIsSearch(String num) {
+        try {
+            CarFreeCarrierBillStartPo po = mapper.getBillStartByNum(num);
+            po.setIsSearch(2);
+            po.setUpdateTime(new Date());
+            mapper.updateById(po);
+        } catch (Exception e) {
+            log.error("更新运单查询标记失败,失败原因：{}", e.getMessage());
+            throw new ServiceException("更新运单查询标记失败");
+        }
+    }
 }

src/main/resources/mapper/CarFreeCarrierBillStartMapper.xml

@@ -20,6 +20,7 @@
         <result column="is_history" property="isHistory"/>
         <result column="update_time" property="updateTime"/>
         <result column="activated" property="activated"/>
+        <result column="is_search" property="isSearch"/>
     </resultMap>
 
     <select id="getBillStartByNum" resultMap="baseResultMap">