Administrator 5 mesi fa
parent
commit
12249dcfc9

+ 4 - 5
src/main/java/com/jkcredit/invoice/controller/business/SelfCarController.java

@@ -145,10 +145,10 @@ public class SelfCarController {
                 return new RespR(false, "需要输入公司名称");
             }
             if (StringUtils.isEmpty(selfCarTrade.getExTimeBegin())) {
-                return new RespR(false, "需要交易开始时间");
+                return new RespR(false, "请输入交易开始时间");
             }
             if (StringUtils.isEmpty(selfCarTrade.getExTimeEnd())) {
-                return new RespR(false, "需要输入交易结束时间");
+                return new RespR(false, "输入交易结束时间");
             }
             //先更新查询信息
             TradeRequestVo tradeRequestVo = new TradeRequestVo();
@@ -486,9 +486,8 @@ public class SelfCarController {
     public RespR findSelfcarInvoiceByTime(@RequestBody SelfcarInvoiceByTimeVo selfcarInvoiceByTimeVo, User user) {
         try {
 
-            if (!checkHasAuthRole.checkMessage(selfcarInvoiceByTimeVo.getCustomerName(), selfcarInvoiceByTimeVo.getCompanyName(),
-                    selfcarInvoiceByTimeVo.getCarNum(), selfcarInvoiceByTimeVo.getStartTime(), selfcarInvoiceByTimeVo.getEndTime())) {
-                return new RespR(false, "根据车牌号进行开票操作失败,请查看数据是否维护准确");
+            if (!checkHasAuthRole.checkMessage(selfcarInvoiceByTimeVo.getCustomerName(), selfcarInvoiceByTimeVo.getCompanyName(),selfcarInvoiceByTimeVo.getStartTime(), selfcarInvoiceByTimeVo.getEndTime())) {
+                return new RespR(false, "开票操作失败,请输入开始时间与结束时间");
             }
 
 

+ 6 - 1
src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -230,8 +230,13 @@ public class ScheduledBillTask {
             try {
                 selfCarService.getSelfCarInvoicesByApplyIdsDb(applQueryInvVo);
             }catch (Exception e){
-                e.printStackTrace();
+                log.error("self-poll-err:{}",e);
                 log.error("{}处理取票失败,失败原因{}",applQueryInvVo.getEtcNum()+"#"+applQueryInvVo.getApplId(),e.getMessage());
+                try {
+                    selfCarService.getSelfCarInvoicesByApplyIdsDb(applQueryInvVo);
+                }catch (Exception e1){
+                    log.error("self-poll-err1:{}",e);
+                }
             }
 
         }

+ 1 - 1
src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -173,7 +173,7 @@
         <include refid="baseSql" />
         from t_SellCarTrade
         where  status = 3 and
-        updateTime >concat(curdate(),' 00:00:00')
+        updateTime >concat(date_sub(curdate(),interval 1 day),' 00:00:00')
         UNION ALL
         select
         <include refid="baseSql" />