Browse Source

运单查询发票数据

xusonglin 5 years ago
parent
commit
a745e08851

+ 1 - 1
src/main/java/com/jkcredit/invoice/hub/model/dto/searchInvoice/SearchInvoiceDto.java

@@ -23,7 +23,7 @@ public class SearchInvoiceDto implements Serializable {
     private Integer waybillStatus;
     private Integer waybillStatus;
     private String waybillStartTime;
     private String waybillStartTime;
     private String waybillEndTime;
     private String waybillEndTime;
-    private Integer isSearch;
+    //    private Integer isSearch;
     private Date createTime;
     private Date createTime;
     private Date updateTime;
     private Date updateTime;
     private Integer activated;
     private Integer activated;

+ 1 - 1
src/main/java/com/jkcredit/invoice/hub/model/po/searchInvoice/SearchInvoicePo.java

@@ -35,7 +35,7 @@ public class SearchInvoicePo implements Serializable {
     private Integer waybillStatus;
     private Integer waybillStatus;
     private String waybillStartTime;
     private String waybillStartTime;
     private String waybillEndTime;
     private String waybillEndTime;
-    private Integer isSearch;
+    //    private Integer isSearch;
     private Date createTime;
     private Date createTime;
     private Date updateTime;
     private Date updateTime;
     private Integer activated;
     private Integer activated;

+ 0 - 1
src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeChargeServiceImpl.java

@@ -119,7 +119,6 @@ public class ApiCarFreeChargeServiceImpl implements ApiCarFreeChargeService {
                     BeanUtil.copyProperties(searchInvoiceDto, invoiceResultDto);
                     BeanUtil.copyProperties(searchInvoiceDto, invoiceResultDto);
                     searchInvoiceService.updateSearchInvoice(searchInvoiceDto);
                     searchInvoiceService.updateSearchInvoice(searchInvoiceDto);
                 }
                 }
-                // todo searchInvoice表状态更新
                 log.info("invoiceResultDto.getResult().size() = {}", invoiceResultDto.getResult().size());
                 log.info("invoiceResultDto.getResult().size() = {}", invoiceResultDto.getResult().size());
                 if (invoiceResultDto.getResult().size() > 0) {
                 if (invoiceResultDto.getResult().size() > 0) {
                     //去重列表
                     //去重列表

+ 2 - 2
src/main/java/com/jkcredit/invoice/hub/task/WayBillTask.java

@@ -24,7 +24,7 @@ public class WayBillTask {
     @Autowired
     @Autowired
     ApiCarFreeChargeService chargeService;
     ApiCarFreeChargeService chargeService;
 
 
-    @Scheduled(cron = "0 0 23 * * ?", zone = "Asia/Shanghai")
+    @Scheduled(cron = "0 1/3 * * * ?", zone = "Asia/Shanghai")
     public void realTimeWayBill() {
     public void realTimeWayBill() {
         // 查询实时订单,且状态为已结束和开票中
         // 查询实时订单,且状态为已结束和开票中
         // 调用运单查询发票接口
         // 调用运单查询发票接口
@@ -38,7 +38,7 @@ public class WayBillTask {
         }
         }
     }
     }
 
 
-    @Scheduled(cron = "0 0 * * * ?", zone = "Asia/Shanghai")
+    @Scheduled(cron = "0 1/3 * * * ?", zone = "Asia/Shanghai")
     public void historyWayBill() {
     public void historyWayBill() {
         // 查询实时订单,且状态为已结束和开票中
         // 查询实时订单,且状态为已结束和开票中
         // 调用运单查询发票接口
         // 调用运单查询发票接口

+ 1 - 1
src/main/resources/mapper/SearchInvoiceMapper.xml

@@ -12,7 +12,7 @@
         <result column="waybill_status" property="waybillStatus"/>
         <result column="waybill_status" property="waybillStatus"/>
         <result column="waybill_start_time" property="waybillStartTime"/>
         <result column="waybill_start_time" property="waybillStartTime"/>
         <result column="waybill_end_time" property="waybillEndTime"/>
         <result column="waybill_end_time" property="waybillEndTime"/>
-        <result column="is_search" property="isSearch"/>
+        <!--        <result column="is_search" property="isSearch"/>-->
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="activated" property="activated"/>
         <result column="activated" property="activated"/>