后端代码提交

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -14,6 +14,7 @@ import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
+import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.nocar.NocarInvoiceService;
@@ -49,6 +50,8 @@ public class NoCarController {
     NoCarBillWayService noCarBillWayService;
 
     @Autowired
+    NoCarBillWayImportService noCarBillWayImportService;
+    @Autowired
     NocarInvoiceService nocarInvoiceService;
 
     @Autowired
@@ -115,7 +118,25 @@ public class NoCarController {
             return new RespR(false,e.getMessage());
         }
     }
-
+    /**
+     * 分页查询运单信息
+     *
+     * @param page    参数集
+     * @return 用户集合
+     */
+    @PostMapping("/findImportBillWay")
+    @ApiOperation(value="分页查询无车运单信息", notes="分页查询无车运单信息")
+    @LoginRequired
+    public RespR findImportBillWay(Page page, NoCarWayBill noCarWayBill) {
+        try {
+            setTimeDue(noCarWayBill);
+            RespR respR = new RespR(noCarBillWayImportService.findByPageAndWayBill(page, noCarWayBill));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
     /**
      * 重新获取发票并更新状态
      *
@@ -135,6 +156,7 @@ public class NoCarController {
         }
     }
     public void delGetInvoce(Integer historyFlag){
+        log.info("开始取票HISflag:"+historyFlag);
         NoCarWayBill carWayBill = new NoCarWayBill();
         carWayBill.setHisFlag(historyFlag);
         carWayBill.setBillwayStatus(2);
@@ -222,7 +244,7 @@ public class NoCarController {
             params.setTitleRows(1);
             params.setHeadRows(1);
             params.setKeyIndex(2);
-            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params) ;list.remove(0);
+            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params) ;
             buildDate(list);
             RespR respR = noCarBillWayService.batchBillWayStart(list,customerName);
             return respR;
@@ -247,7 +269,7 @@ public class NoCarController {
             params.setTitleRows(1);
             params.setHeadRows(1);
             params.setKeyIndex(2);
-            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);list.remove(0);
+            List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
             log.info("1111111111"+list.size());
             buildDate(list);
             RespR respR = noCarBillWayService.batchHsitoryBillWay(list,customerName);

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -117,6 +117,7 @@ public class SimpleCORSFilter implements Filter {
 
             "/noCar/findCarRec",
             "/noCar/findBillWay",
+            "/noCar/findImportBillWay",
             "/noCar/updateStatus",
             "/noCar/findBatchList",
             "/noCar/findNocarInvoicesStatic",

src/main/java/com/jkcredit/invoice/mapper/Binvoce/BillInvoiceMapper.java

@@ -22,6 +22,8 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice>{
 
     List<BillInvoice> selectByBillNum(String wayBillNum);
 
+    int deleteByBillNum(String wayBillNum);
+
     BillInvoice selectByInvoiceNum(String wayBillNum);
     Map<String,String> findInvoiceStatics(@Param("billInvoice") BillInvoice billInvoice);
 

src/main/java/com/jkcredit/invoice/mapper/waybill/NoCarWaybillImprtMapper.java

@@ -0,0 +1,31 @@
+package com.jkcredit.invoice.mapper.waybill;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface NoCarWaybillImprtMapper extends BaseMapper<NoCarWayBill>{
+
+    IPage<List<NoCarWayBill>> selectAllByPage(Page page, @Param("noCarWayBill") NoCarWayBill noCarWayBill);
+
+    IPage<List<NoCarWayBill>> selectAllByPageException(Page page, @Param("noCarWayBill") NoCarWayBill noCarWayBill);
+
+    int insertImport(NoCarWayBill record);
+
+    int updateByPrimaryKey(NoCarWayBill record);
+
+    int updateByBillNum(NoCarWayBill record);
+
+    NoCarWayBill selectByBillNum(String wayBillNum);
+
+    List<NoCarWayBill> selectByHisFlagAndBillStatus(NoCarWayBill noCarWayBill);
+
+
+    List<NoCarWayBill> getNoCarNoVoiceQuery(String customerName);
+}

src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java

@@ -166,4 +166,24 @@ public class NoCarCalculateInfor {
     public void setCalculateEnd(String calculateEnd) {
         this.calculateEnd = calculateEnd;
     }
+
+    @Override
+    public String toString() {
+        return "NoCarCalculateInfor{" +
+                "Id=" + Id +
+                ", tradeId='" + tradeId + '\'' +
+                ", customId='" + customId + '\'' +
+                ", companyNum='" + companyNum + '\'' +
+                ", buyerName='" + buyerName + '\'' +
+                ", buyerTaxpayerCode='" + buyerTaxpayerCode + '\'' +
+                ", invoiceMakeTime='" + invoiceMakeTime + '\'' +
+                ", invoiceMakeStart='" + invoiceMakeStart + '\'' +
+                ", invoiceMakeEnd='" + invoiceMakeEnd + '\'' +
+                ", fee=" + fee +
+                ", calculateTime='" + calculateTime + '\'' +
+                ", calculateStart='" + calculateStart + '\'' +
+                ", calculateEnd='" + calculateEnd + '\'' +
+                ", ctype=" + ctype +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/Calculate/SelfCarCalculateInfor.java

@@ -121,4 +121,20 @@ public class SelfCarCalculateInfor {
     public void setCalTimeEnd(String calTimeEnd) {
         this.calTimeEnd = calTimeEnd;
     }
+
+    @Override
+    public String toString() {
+        return "SelfCarCalculateInfor{" +
+                "id=" + id +
+                ", customId='" + customId + '\'' +
+                ", companyReferencenum='" + companyReferencenum + '\'' +
+                ", companyNum='" + companyNum + '\'' +
+                ", etcNum='" + etcNum + '\'' +
+                ", fee=" + fee +
+                ", calTime='" + calTime + '\'' +
+                ", calTimeStart='" + calTimeStart + '\'' +
+                ", calTimeEnd='" + calTimeEnd + '\'' +
+                ", invoiceMkTime='" + invoiceMkTime + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/Customer.java

@@ -147,4 +147,24 @@ public class Customer {
     public void setCompany(String company) {
         this.company = company == null ? null : company.trim();
     }
+
+    @Override
+    public String toString() {
+        return "Customer{" +
+                "id=" + id +
+                ", fee=" + fee +
+                ", customerName='" + customerName + '\'' +
+                ", appSecret='" + appSecret + '\'' +
+                ", invoiceTime='" + invoiceTime + '\'' +
+                ", usenumAll=" + usenumAll +
+                ", usenumInterface=" + usenumInterface +
+                ", usenumPlat=" + usenumPlat +
+                ", accountBalance=" + accountBalance +
+                ", bussinessType=" + bussinessType +
+                ", integrationType=" + integrationType +
+                ", firstSign='" + firstSign + '\'' +
+                ", accstatus=" + accstatus +
+                ", company='" + company + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerCarRec.java

@@ -150,4 +150,25 @@ public class CustomerCarRec {
     public void setInterType(Integer interType) {
         this.interType = interType;
     }
+
+    @Override
+    public String toString() {
+        return "CustomerCarRec{" +
+                "customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", companyNum='" + companyNum + '\'' +
+                ", businessType='" + businessType + '\'' +
+                ", carNum='" + carNum + '\'' +
+                ", carColor='" + carColor + '\'' +
+                ", serviceOperation=" + serviceOperation +
+                ", custPhone='" + custPhone + '\'' +
+                ", etcNum='" + etcNum + '\'' +
+                ", succTime='" + succTime + '\'' +
+                ", failTime='" + failTime + '\'' +
+                ", recStatus=" + recStatus +
+                ", interType=" + interType +
+                ", failReason='" + failReason + '\'' +
+                ", validateCode='" + validateCode + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerOper.java

@@ -72,4 +72,17 @@ public class CustomerOper {
     public void setOperType(int operType) {
         this.operType = operType;
     }
+
+    @Override
+    public String toString() {
+        return "CustomerOper{" +
+                "id=" + id +
+                ", customerName='" + customerName + '\'' +
+                ", customerPhone='" + customerPhone + '\'' +
+                ", company='" + company + '\'' +
+                ", createTime='" + createTime + '\'' +
+                ", batchNumber='" + batchNumber + '\'' +
+                ", operType=" + operType +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerRec.java

@@ -339,4 +339,37 @@ public class CustomerRec {
     public void setLowerFileName(String lowerFileName) {
         this.lowerFileName = lowerFileName;
     }
+
+    @Override
+    public String toString() {
+        return "CustomerRec{" +
+                "id=" + id +
+                ", customerName='" + customerName + '\'' +
+                ", companyLeader='" + companyLeader + '\'' +
+                ", companyLeaderPhone='" + companyLeaderPhone + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", companyReferencenum='" + companyReferencenum + '\'' +
+                ", companyOpenbank='" + companyOpenbank + '\'' +
+                ", companyOpenbankAcc='" + companyOpenbankAcc + '\'' +
+                ", companyAdress='" + companyAdress + '\'' +
+                ", companyPhone='" + companyPhone + '\'' +
+                ", companyType=" + companyType +
+                ", operatingRangeType=" + operatingRangeType +
+                ", companyNum='" + companyNum + '\'' +
+                ", createtime='" + createtime + '\'' +
+                ", companyBelongName='" + companyBelongName + '\'' +
+                ", recStatus=" + recStatus +
+                ", interType=" + interType +
+                ", bussinessType='" + bussinessType + '\'' +
+                ", serviceStartTime='" + serviceStartTime + '\'' +
+                ", serviceEndTime='" + serviceEndTime + '\'' +
+                ", serviceType=" + serviceType +
+                ", contractFileName='" + contractFileName + '\'' +
+                ", base64Str='" + base64Str + '\'' +
+                ", lowerBase64Str='" + lowerBase64Str + '\'' +
+                ", lowerFileName='" + lowerFileName + '\'' +
+                ", contractSuc=" + contractSuc +
+                ", contrantNum='" + contrantNum + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/invoice/BillInvoice.java

@@ -388,4 +388,42 @@ public class BillInvoice {
     public void setInvoiceMakeEnd(String invoiceMakeEnd) {
         this.invoiceMakeEnd = invoiceMakeEnd;
     }
+
+    @Override
+    public String toString() {
+        return "BillInvoice{" +
+                "id=" + id +
+                ", companyNum='" + companyNum + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", invoiceNum='" + invoiceNum + '\'' +
+                ", invoiceCode='" + invoiceCode + '\'' +
+                ", invoiceMakeTime='" + invoiceMakeTime + '\'' +
+                ", invoiceMakeStart='" + invoiceMakeStart + '\'' +
+                ", invoiceMakeEnd='" + invoiceMakeEnd + '\'' +
+                ", invoiceUrl='" + invoiceUrl + '\'' +
+                ", invoiceHtmlUrl='" + invoiceHtmlUrl + '\'' +
+                ", enStation='" + enStation + '\'' +
+                ", exStation='" + exStation + '\'' +
+                ", exTime='" + exTime + '\'' +
+                ", fee=" + fee +
+                ", totalTaxAmount=" + totalTaxAmount +
+                ", plateNum='" + plateNum + '\'' +
+                ", vehicleType=" + vehicleType +
+                ", sellerName='" + sellerName + '\'' +
+                ", sellerTaxpayerCode='" + sellerTaxpayerCode + '\'' +
+                ", waybillNum='" + waybillNum + '\'' +
+                ", waybillStatus=" + waybillStatus +
+                ", waybillStartTime='" + waybillStartTime + '\'' +
+                ", waybillEndTime='" + waybillEndTime + '\'' +
+                ", totalAmount=" + totalAmount +
+                ", taxRate=" + taxRate +
+                ", invoiceType='" + invoiceType + '\'' +
+                ", amount=" + amount +
+                ", transactionId='" + transactionId + '\'' +
+                ", tradeMatchTime='" + tradeMatchTime + '\'' +
+                ", buyerName='" + buyerName + '\'' +
+                ", buyerTaxpayerCode='" + buyerTaxpayerCode + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/invoice/SelfCarAppl.java

@@ -128,4 +128,20 @@ public class SelfCarAppl {
     public void setVoiceFlag(Integer voiceFlag) {
         this.voiceFlag = voiceFlag;
     }
+
+    @Override
+    public String toString() {
+        return "SelfCarAppl{" +
+                "id=" + id +
+                ", customId='" + customId + '\'' +
+                ", companyNum='" + companyNum + '\'' +
+                ", cardId='" + cardId + '\'' +
+                ", applId='" + applId + '\'' +
+                ", invoiceCount=" + invoiceCount +
+                ", invoiceAmount=" + invoiceAmount +
+                ", invoiceTaxAmount=" + invoiceTaxAmount +
+                ", applTime='" + applTime + '\'' +
+                ", voiceFlag=" + voiceFlag +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/invoice/SelfCarInvoice.java

@@ -338,4 +338,38 @@ public class SelfCarInvoice {
     public void setInvoiceMakeEnd(String invoiceMakeEnd) {
         this.invoiceMakeEnd = invoiceMakeEnd;
     }
+
+    @Override
+    public String toString() {
+        return "SelfCarInvoice{" +
+                "id=" + id +
+                ", companyNum='" + companyNum + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", cardId='" + cardId + '\'' +
+                ", invoiceNum='" + invoiceNum + '\'' +
+                ", invoiceCode='" + invoiceCode + '\'' +
+                ", invoiceMakeTime='" + invoiceMakeTime + '\'' +
+                ", invoiceMakeStart='" + invoiceMakeStart + '\'' +
+                ", invoiceMakeEnd='" + invoiceMakeEnd + '\'' +
+                ", invoiceUrl='" + invoiceUrl + '\'' +
+                ", invoiceHtmlUrl='" + invoiceHtmlUrl + '\'' +
+                ", enStation='" + enStation + '\'' +
+                ", exStation='" + exStation + '\'' +
+                ", exTime='" + exTime + '\'' +
+                ", fee=" + fee +
+                ", totalTaxAmount=" + totalTaxAmount +
+                ", plateNum='" + plateNum + '\'' +
+                ", vehicleType=" + vehicleType +
+                ", sellerName='" + sellerName + '\'' +
+                ", sellerTaxpayerCode='" + sellerTaxpayerCode + '\'' +
+                ", totalAmount=" + totalAmount +
+                ", taxRate=" + taxRate +
+                ", invoiceType='" + invoiceType + '\'' +
+                ", amount=" + amount +
+                ", tradeId='" + tradeId + '\'' +
+                ", buyerName='" + buyerName + '\'' +
+                ", buyerTaxpayerCode='" + buyerTaxpayerCode + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarWayBill.java

@@ -104,7 +104,7 @@ public class NoCarWayBill implements Cloneable{
     private String updateTime;
 
     /**
-     * 运单转态   1-指令开始 2-开票中  3-开票完成 4 超时作废
+     * 运单转态 -1-导入 -2失败  1-指令开始 2-开票中  3-开票完成 4 超时作废
      */
     private int billwayStatus;
 
@@ -147,6 +147,11 @@ public class NoCarWayBill implements Cloneable{
      * 单位电话
      */
     private String companyTel;
+
+    /**
+     * 失败原因
+     */
+    private String failReason;
     /***下边数据查询使用***/
     private String startBegin;
 
@@ -420,8 +425,56 @@ public class NoCarWayBill implements Cloneable{
         this.actEndTimeDate = actEndTimeDate;
     }
 
+    public String getFailReason() {
+        return failReason;
+    }
+
+    public void setFailReason(String failReason) {
+        this.failReason = failReason;
+    }
+
     @Override
     public NoCarWayBill clone() throws CloneNotSupportedException {
         return (NoCarWayBill)super.clone();
     }
+
+    @Override
+    public String toString() {
+        return "NoCarWayBill{" +
+                "id=" + id +
+                ", customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", billNum='" + billNum + '\'' +
+                ", plateNum='" + plateNum + '\'' +
+                ", plateColor='" + plateColor + '\'' +
+                ", startTime='" + startTime + '\'' +
+                ", startTimeDate=" + startTimeDate +
+                ", sourceAddr='" + sourceAddr + '\'' +
+                ", destAddr='" + destAddr + '\'' +
+                ", predictEndTime='" + predictEndTime + '\'' +
+                ", predictEndTimeDate=" + predictEndTimeDate +
+                ", actEndTimeDate=" + actEndTimeDate +
+                ", fee=" + fee +
+                ", feeD=" + feeD +
+                ", titleType=" + titleType +
+                ", taxplayerCode='" + taxplayerCode + '\'' +
+                ", intfaceStartTime='" + intfaceStartTime + '\'' +
+                ", interfaceEndTime='" + interfaceEndTime + '\'' +
+                ", updateTime='" + updateTime + '\'' +
+                ", billwayStatus=" + billwayStatus +
+                ", hisFlag=" + hisFlag +
+                ", companyNum='" + companyNum + '\'' +
+                ", companyAdress='" + companyAdress + '\'' +
+                ", companyBank='" + companyBank + '\'' +
+                ", companyBankAcc='" + companyBankAcc + '\'' +
+                ", batchNum='" + batchNum + '\'' +
+                ", batchNumEnd='" + batchNumEnd + '\'' +
+                ", companyTel='" + companyTel + '\'' +
+                ", failReason='" + failReason + '\'' +
+                ", startBegin='" + startBegin + '\'' +
+                ", startEnd='" + startEnd + '\'' +
+                ", endBegin='" + endBegin + '\'' +
+                ", endEnd='" + endEnd + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/waybill/SelfCarTrade.java

@@ -219,4 +219,28 @@ public class SelfCarTrade {
     public void setExceptionFlag(String exceptionFlag) {
         this.exceptionFlag = exceptionFlag;
     }
+
+    @Override
+    public String toString() {
+        return "SelfCarTrade{" +
+                "id=" + id +
+                ", customId='" + customId + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", companyNum='" + companyNum + '\'' +
+                ", companyReferencenum='" + companyReferencenum + '\'' +
+                ", cardId='" + cardId + '\'' +
+                ", tradeId='" + tradeId + '\'' +
+                ", exTime='" + exTime + '\'' +
+                ", fee=" + fee +
+                ", status=" + status +
+                ", applId='" + applId + '\'' +
+                ", aclTime='" + aclTime + '\'' +
+                ", exTimeBegin='" + exTimeBegin + '\'' +
+                ", exTimeEnd='" + exTimeEnd + '\'' +
+                ", aclTimeBegin='" + aclTimeBegin + '\'' +
+                ", aclTimeEnd='" + aclTimeEnd + '\'' +
+                ", exceptionFlag='" + exceptionFlag + '\'' +
+                ", interType=" + interType +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/customer/CustomerService.java

@@ -85,4 +85,6 @@ public interface CustomerService extends IService<Customer>{
      * @return
      */
     Customer getCustomerByAppKeyAndAppSecret(Customer customer);
+
+    boolean checkMoneyEnough(String customerName);
 }

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerOperServiceImpl.java

@@ -9,9 +9,10 @@ import com.jkcredit.invoice.model.entity.customer.CustomerOper;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
 import com.jkcredit.invoice.util.DateUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+@Slf4j
 @Service("customerOperService")
 public class CustomerOperServiceImpl extends ServiceImpl<CustomerOperMapper,CustomerOper> implements CustomerOperService {
     @Autowired
@@ -25,6 +26,7 @@ public class CustomerOperServiceImpl extends ServiceImpl<CustomerOperMapper,Cust
 
     @Override
     public String saveCustomerOper(String customerName, int operType) {
+        log.info("开始保存批次信息CustomerOperServiceImpl.saveCustomerOper:("+customerName+","+operType+")");
         //保存批次信息
         User user = userMapper.getUserByUserName(customerName);
         String batchNumber = "YD" + System.currentTimeMillis();

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerServiceImpl.java

@@ -15,12 +15,13 @@ import com.jkcredit.invoice.service.upService.CommInterFace;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.MathUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-
+@Slf4j
 @Service("customerService")
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> implements CustomerService{
     @Autowired
@@ -44,6 +45,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Override
     public Boolean addCustomers(Customer customer) {
+        log.info("开始添加客户信息：CustomerServiceImpl.addCustomers{}",customer);
         customer.setFirstSign(DateUtil.getCurrentDateStr());
         if(customerMapper.selectByCustomerName(customer.getCustomerName())!=null){
             return false;
@@ -59,15 +61,18 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean customRecharge(CustomerRecharge customerRecharge) {
+        log.info("开始充值：CustomerServiceImpl.customRecharge{}",customerRecharge);
         Customer customer = customerMapper.selectByCustomerName(customerRecharge.getCustomerName());
         customer.setAccountBalance(MathUtil.add(customer.getAccountBalance(),customerRecharge.getRechargeMony()));
         customerMapper.updateByPrimaryKeySelective(customer);
         customerRecharge.setRechargeTime(DateUtil.getCurrentDateStr());
         customerRecharge.setBeforeMony(customer.getAccountBalance());
         customerRechargeMapper.insert(customerRecharge);
+        log.info("充值结束：CustomerServiceImpl.customRecharge{}",customerRecharge);
         return true;
     }
     public RespR contractAdd(CustomerRec customerRec){
+        log.info("开始上传协议：CustomerServiceImpl.contractAdd{}",customerRec);
         customerRecMapper.updateByPrimaryKeySelective(customerRec);
         if(customerRec.getRecStatus().intValue() == 2){
             return new RespR(false,"无法上传协议，未注册");
@@ -84,8 +89,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         b2bContractAddRequest.setBase64Str(customerRec.getBase64Str());
         RespR<B2bContractAddResponse> responseRespR = commInterFace.b2bContractAdd(b2bContractAddRequest);
         if(responseRespR.getCode() == 1){
+            log.info("协议上传失败：CustomerServiceImpl.contractAdd{}---msg{}",customerRec,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
+            log.info("协议上传成功：CustomerServiceImpl.contractAdd");
             customerRec.setContractSuc(1);
             customerRec.setContrantNum(responseRespR.getData().getContrantNum());
             customerRecMapper.updateByPrimaryKeySelective(customerRec);
@@ -101,11 +108,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     }
 
     public RespR customeRec(CustomerRec customerRec){
+        log.info("开始客户注册：CustomerServiceImpl.customeRec{}",customerRec);
         //customerRec = customerRecMapper.selectByCustomerNameAndCompanyConcat(customerRec);
         customerRecMapper.updateByPrimaryKeySelective(customerRec);
         //主动查询上游接口，如果已经备案则更新
         RespR respR1 = customerService.customerRecQuery(customerRec);
         if(respR1.getCode() == 0){
+            log.info("客户注册查上游成功：CustomerServiceImpl.customeRec{}",customerRec);
             List<B2bCompanyModel> b2bCompanyModels = (List<B2bCompanyModel>)respR1.getData();
             if(b2bCompanyModels.size()==1){
                 customerRec.setCompanyNum(b2bCompanyModels.get(0).getCompanyNum());
@@ -115,13 +124,16 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
             }
         }
         CompanyAddRequest companyAddRequest = buildCompany(customerRec);
+        log.info("开始客户上游注册：CustomerServiceImpl.customeRec{}",customerRec);
         //注册企业
         RespR<CompanyAddResponse> respR = commInterFace.addCompany(companyAddRequest);
         if(respR.getCode() == 1){
+            log.info("客户上游注册失败：CustomerServiceImpl.customeRec{}，msg{}",customerRec,respR.getMsg());
             customerRec.setRecStatus(2);
             customerRecMapper.updateByPrimaryKeySelective(customerRec);
             return new RespR(false,respR.getMsg());
         }
+        log.info("客户上游注册成功：CustomerServiceImpl.customeRec{}");
         CompanyAddResponse response = respR.getData();
         //注册协议
         String companyNum = response.getCompanyNum();
@@ -155,6 +167,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Override
     public RespR customerRecQuery(CustomerRec customerRec) {
+        log.info("查询注册信息：CustomerServiceImpl.customerRecQuery{}",customerRec);
         CompanyQueryRequest companyQueryRequest = new CompanyQueryRequest();
         companyQueryRequest.setCompanyName(customerRec.getCompanyName());
         companyQueryRequest.setTaxpaterCode(customerRec.getCompanyReferencenum());
@@ -168,12 +181,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Override
     public RespR updateCustomerRecStatus(CustomerRec customerRec) {
+        log.info("更新注册信息：CustomerServiceImpl.customerRecQuery{}",customerRec);
         CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
         customerRec1.setRecStatus(customerRec.getRecStatus());
         int i = customerRecMapper.updateByPrimaryKey(customerRec1);
         if(i<=0){
+            log.info("更新注册信息失败：CustomerServiceImpl.customerRecQuery{}",customerRec);
             return new RespR(false);
         }
+        log.info("更新注册信息成功：CustomerServiceImpl.customerRecQuery{}",customerRec);
         return new RespR(true);
     }
 
@@ -181,4 +197,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     public Customer getCustomerByAppKeyAndAppSecret(Customer customer) {
         return customerMapper.selectByAppKeyAndAppSecret( customer.getCustomerName(), customer.getAppSecret());
     }
+
+    @Override
+    public boolean checkMoneyEnough(String customerName) {
+        Customer customer = customerMapper.selectByCustomerName(customerName);
+        log.info("客户余额查询：CustomerServiceImpl.checkMoneyEnough{}",customer);
+        if(customer== null || customer.getAccountBalance()<=0){
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -19,6 +19,7 @@ import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +27,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-
+@Slf4j
 @Service("lowerService")
 public class CustomerLowerServiceImpl implements CustomeLowerService {
     @Autowired
@@ -47,7 +48,7 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
     CustomerService customerService;
     @Override
     public RespR customeRec(List<CustomerRec> customerRecs) {
-
+        log.info("客户备案信息：CustomerLowerServiceImpl.customeRec{}",customerRecs);
         if(customerRecs==null || customerRecs.size()<=0){return new RespR(false,"备案信息为空");};
         StringBuffer res = new StringBuffer();
         customerRecs.stream().forEach(customerRec -> {
@@ -84,8 +85,10 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
             }
         });
         if(StringUtils.isEmpty(res.toString())){
+            log.info("客户备案成功：CustomerLowerServiceImpl.customeRec{}",customerRecs);
             return new RespR(true,"成功");
         }else{
+            log.info("客户备案失败信息：CustomerLowerServiceImpl.customeRec{},msg{}",customerRecs,res.toString());
             return new RespR(false,res.toString());
         }
 

src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -70,6 +70,7 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR customerCarRec(List<CustomerCarRec> customerCarRecs) {
+        log.info("车辆备案开始NoCarServiceImpl.customerCarRec{}",customerCarRecs);
         if(customerCarRecs== null || customerCarRecs.size()<=0){
             return new RespR(false,"无备案车辆");
         }
@@ -78,6 +79,7 @@ public class NoCarServiceImpl implements NoCarService{
         Customer customer = customerMapper.selectByCustomerName(customerCarRec2.getCustomerName());
         if(customer == null || customer.getAccstatus()!=0){
             res.append("#客户："+customerCarRec2.getCustomerName()+"不存在或状态异常");
+            log.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
             return new RespR(false,res.toString());
         }
         CustomerRec customerRecP = new CustomerRec();
@@ -86,6 +88,7 @@ public class NoCarServiceImpl implements NoCarService{
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
         if(customerRec == null || customerRec.getRecStatus()!=1){
             res.append("#客户："+customerCarRec2.getCustomerName()+"企业:"+customerCarRec2.getCompanyName()+"备案信息不存在");
+            log.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
             return new RespR(false,res.toString());
         }
         return customerCarRecForNoCar(customerCarRecs,res,customerRec);
@@ -141,8 +144,10 @@ public class NoCarServiceImpl implements NoCarService{
 
             }
             if(StringUtils.isEmpty(res.toString())){
+                log.info("车辆备案成功");
                 return new RespR("成功");
             }else {
+                log.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
                 return new RespR(false,res.toString());
             }
 
@@ -156,7 +161,7 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     public RespR customerCarRecQueryUpper(CustomerCarRec customerCarRec) {
         StringBuffer res = new StringBuffer();
-
+        log.info("车辆备案查询NoCarServiceImpl.customerCarRecQueryUpper{}",customerCarRec);
         Customer customer = customerMapper.selectByCustomerName(customerCarRec.getCustomerName());
         if(customer == null || customer.getAccstatus()!=0){
             res.append("#客户："+customer.getCustomerName()+"不存在或状态异常");
@@ -180,6 +185,7 @@ public class NoCarServiceImpl implements NoCarService{
 
         RespR<VehicleQueryResponse> respR = noCarInterface.vehicleQuery(vehicleQueryRequest);
         if(respR.getCode() == 1){
+            log.info("车辆备案查询失败NoCarServiceImpl.customerCarRecQueryUpper{},msg{}",customerCarRec,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         return new RespR(respR.getData());
@@ -204,17 +210,20 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR noCarWaybillStart(NoCarWayBill noCarWayBill) {
+        log.info("运单上传开始：NoCarServiceImpl.noCarWaybillStart{}",noCarWayBill);
         //如果运单时间和当前时间差了三天，直接返回
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
             return new RespR(false,"已经超过72小时，请20天后上传历史运单");
         }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
+            log.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,respR.getMsg());
             return  respR;
         }
         WaybillStartRequest waybillStartRequest = buildWaybillStartRequest(noCarWayBill);
         RespR<WaybillStartResponse> responseRespR = noCarInterface.waybillStart(waybillStartRequest);
         if(responseRespR.getCode() == 1){
+            log.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
@@ -276,9 +285,11 @@ public class NoCarServiceImpl implements NoCarService{
     }
     @Override
     public RespR noCarWaybillEnd(NoCarWayBill noCarWayBill) {
+        log.info("运单结束开始：NoCarServiceImpl.noCarWaybillEnd{}",noCarWayBill);
         //查询运单号为开始指令
         NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==1 ){
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束");
             return new RespR(false,"当前运单状态无法结束");
         }
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
@@ -287,6 +298,7 @@ public class NoCarServiceImpl implements NoCarService{
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
             noCarWayBill1.setBillwayStatus(4);
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"运单已经超时，请拆分");
         }
 
@@ -298,8 +310,10 @@ public class NoCarServiceImpl implements NoCarService{
         waybillEndRequest.setEndTime(DateUtil.dateFormate(noCarWayBill1.getPredictEndTime()));
         RespR<WaybillEndResponse> waybillEndResponseRespR = noCarInterface.waybillEnd(waybillEndRequest);
         if(waybillEndResponseRespR.getCode() == 1){
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,waybillEndResponseRespR.getMsg());
             return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             noCarWayBill1.setBillwayStatus(4);
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
             return new RespR(false,"运单已经超时，请拆分");
@@ -313,22 +327,26 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR noCarHisWaybillStart(NoCarWayBill noCarWayBill) {
+        log.info("历史运单开始上传：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"开始");
         NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-        //这个后边删掉 TODO
+
         if(noCarWayBill1!=null && noCarWayBill1.getBillwayStatus() ==1){
             return new RespR(true);
         }
         if(DateUtil.getDistanceDays(noCarWayBill.getStartTime(),new Date())>-20){
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
             return new RespR(false,"必须是二十天前的运单");
         }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,respR.getMsg());
             return  respR;
         }
         WaybillHistoryStartRequest waybillHistoryStartRequest = BuildNoCarHisWaybill(noCarWayBill);
         RespR<WaybillHistoryStartResponse> responseRespR = noCarInterface.waybillHistoryStart(waybillHistoryStartRequest);
 
         if(responseRespR.getCode() == 1){
+            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
@@ -363,6 +381,7 @@ public class NoCarServiceImpl implements NoCarService{
     }
     @Override
     public RespR noCarHisWaybillEnd(NoCarWayBill noCarWayBill) {
+        log.info("历史运单结束上传：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"开始");
         //查询运单号为开始指令
         NoCarWayBill noCarWayBill1 = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
@@ -370,10 +389,12 @@ public class NoCarServiceImpl implements NoCarService{
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
             noCarWayBill1.setBillwayStatus(4);
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
             return new RespR(false,"运单已经超时，请拆分");
         }
 
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill1.getHisFlag() ==0 ){
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束");
             return new RespR(false,"当前运单状态无法结束");
         }
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
@@ -384,10 +405,12 @@ public class NoCarServiceImpl implements NoCarService{
         waybillEndRequest.setEndTime(DateUtil.dateFormate(noCarWayBill1.getPredictEndTime()));
         RespR<WaybillEndResponse> waybillEndResponseRespR = noCarInterface.waybillEnd(waybillEndRequest);
         if(waybillEndResponseRespR.getCode() == 1){
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill1,waybillEndResponseRespR.getMsg());
             return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
             noCarWayBill.setBillwayStatus(4);
             noCarWaybillMapper.updateByBillNum(noCarWayBill1);
+            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill1,"运单已经超时，请拆分");
             return new RespR(false,"运单已经超时，请拆分");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
@@ -400,18 +423,22 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     @Transactional
     public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isCurr) {
+        log.info("取票啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{}",noCarWayBill,isCurr);
         NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
         if(null == noCarWayBillDb){
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,"运单号异常,无法开票");
             return new RespR(false,"运单号异常,无法开票");
         }
 
 
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,respR.getMsg());
             return  respR;
         }
         int status = noCarWayBillDb.getBillwayStatus();
         if(status == 1 || status == 4){
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,"运单转态,无法开票");
             return new RespR(false,"运单状态无法开票");
         }
         if(!isCurr){
@@ -421,11 +448,11 @@ public class NoCarServiceImpl implements NoCarService{
                return new RespR(billInvoices);
            }
         }
-      /*  if(noCarWayBillDb.getBillwayStatus() == 3){
+       if(noCarWayBillDb.getBillwayStatus() == 3){
             //直接返回发票信息
             List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
             return new RespR(billInvoices);
-        }*/
+        }
         //进行取票操作
         WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
@@ -433,6 +460,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillNumFindInvoiceRequest.setWaybillNum(noCarWayBillDb.getBillNum());
         RespR<WaybillNumFindInvoiceResponse> responseRespR = noCarInterface.waybillNumFindInvoice(waybillNumFindInvoiceRequest);
         if(responseRespR.getCode() == 1){
+            log.info("取票失败啦：NoCarServiceImpl.getInvoiceByWayBillNumReal{},isCurr{},msg{}",noCarWayBill,isCurr,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
@@ -441,10 +469,8 @@ public class NoCarServiceImpl implements NoCarService{
             noCarWayBillDb.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWaybillMapper.updateByBillNum(noCarWayBillDb);
             if(tempStatus == 2 || tempStatus==3){
-                List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
-                if(billInvoices!=null && billInvoices.size()>0){
-                    return new RespR(billInvoices);
-                }
+                //删除已有发票
+                billInvoiceMapper.deleteByBillNum(noCarWayBill.getBillNum());
                 //发票入库
                 List<InvoiceProcessingListModel> invoiceProcessingListModels = responseRespR.getData().getResult();
                 invoiceProcessingListModels.stream().forEach(invoiceProcessingListModel -> {
@@ -500,12 +526,14 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo) {
+        log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
         WaybillInvoiceRedQueryRequest redQueryRequest = new WaybillInvoiceRedQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         redQueryRequest.setCompanyNum(companyNum);
         redQueryRequest.setMonth(hcInvoiceQueryVo.getMonth());
         RespR<WaybillInvoiceRedQueryResponse> respR = noCarInterface.waybillInvoiceRedQuery(redQueryRequest);
         if(respR.getCode() == 1){
+            log.info("取红冲票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",hcInvoiceQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         return new RespR(respR.getData().getResult());
@@ -513,8 +541,10 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo) {
+        log.info("取月票啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"开始");
         Customer customer = customerMapper.selectByCustomerName(monthAccountQueryVo.getCustomeName());
         if(customer==null || customer.getAccstatus() ==1){
+            log.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"客户不存在或者已经停用");
             return new RespR(false,"客户不存在或者已经停用");
         }
         CustomerRec customerRecParm = new CustomerRec();
@@ -522,6 +552,7 @@ public class NoCarServiceImpl implements NoCarService{
         customerRecParm.setCustomerName(monthAccountQueryVo.getCustomeName());
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecParm);
         if(customerRec == null || customerRec.getRecStatus()==1){
+            log.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"客户未备案或备案失败");
             return new RespR(false,"客户未备案或备案失败");
         }
         WaybillCountQueryRequest waybillCountQueryRequest = new WaybillCountQueryRequest();
@@ -532,6 +563,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillCountQueryRequest.setWaybillSource(monthAccountQueryVo.getWaybillSource());
         waybillCountQueryRequest.setPageNo(monthAccountQueryVo.getPageNo());
         RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR =  noCarInterface.waybillCountQuery(waybillCountQueryRequest);
+        log.info("取月票结束：NoCarServiceImpl.hCInvoiceQuery{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
         return waybillCountQueryResponseRespR;
     }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -1,5 +1,4 @@
 package com.jkcredit.invoice.service.lowerService.impl;
-
 import cn.com.taiji.sdk.model.comm.protocol.tts.card.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
@@ -13,7 +12,6 @@ import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
-import com.jkcredit.invoice.model.entity.B2bInvoicePackage;
 import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
@@ -21,20 +19,21 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
+import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.MathUtil;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.ArrayList;
 import java.util.List;
+@Slf4j
 @Service
 public class SelfCarServiceLImpl implements SelfCarServiceL {
     @Autowired
@@ -53,16 +52,22 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     SelfCarInvoiceMapper selfCarInvoiceMapper;
     @Autowired
     SelfCarCalculateInforMapper calculateInforMapper;
+    @Autowired
+    CustomerService customerService;
     @Override
     public RespR<List<CardTradeModel>> getTradeList(TradeRequestVo tradeRequestVo) {
+        log.info("获取交易开始SelfCarServiceLImpl.getTradeList{}",tradeRequestVo);
         Customer customer = customerMapper.selectByCustomerName(tradeRequestVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"客户已经停用");
             return new RespR(false,"客户已经停用");
         }
         if(StringUtils.isEmpty(tradeRequestVo.getStartTime()) || StringUtils.isEmpty(tradeRequestVo.getEndTime())){
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"时间为空");
             return new RespR(false,"时间为空");
         }
         if(DateUtil.getDistanceDays(tradeRequestVo.getEndTime(),tradeRequestVo.getStartTime())>90){
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"不能查询大于90天的交易");
             return new RespR(false,"不能查询大于90天的交易");
         }
         CustomerRec customerRec = new CustomerRec();
@@ -70,10 +75,12 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         customerRec.setCompanyName(tradeRequestVo.getCompanyName());
         customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
         if(customerRec == null || customerRec.getRecStatus().intValue() !=1 ){
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"客户未备案");
             return new RespR(false,"客户未备案");
         }
         CustomerCarRec customerCarRec = customerCarRecMapper.selectByETC(tradeRequestVo.getEtcId());
         if(customerCarRec == null || customerCarRec.getRecStatus() != 1){
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,"该etc卡未绑定或绑定类型错误");
             return new RespR(false,"该etc卡未绑定或绑定类型错误");
         }
         CardTradeRequest cardTradeRequest = new CardTradeRequest();
@@ -84,6 +91,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardTradeRequest.setTradeStatus(tradeRequestVo.getTradeStatus());
         RespR<CardTradeResponse> resp = selfCarInterface.cardTrade(cardTradeRequest);
         if(resp.getCode() == 1){
+            log.info("获取交易失败SelfCarServiceLImpl.getTradeList{},msg{}",tradeRequestVo,resp.getMsg());
             return new RespR(false,"请求失败："+resp.getMsg());
         }else{
             CardTradeResponse cardTradeResponse = resp.getData();
@@ -118,8 +126,14 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<String> applInvoice(InvoiceApplVo invoiceApplVo) {
+        log.info("申请开票开始SelfCarServiceLImpl.applInvoice{}",invoiceApplVo);
+        if(!customerService.checkMoneyEnough(invoiceApplVo.getCustomerName())){
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"余额不足");
+            return new RespR(false,"余额不足");
+        }
         Customer customer = customerMapper.selectByCustomerName(invoiceApplVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户已经停用");
             return new RespR(false,"客户已经停用");
         }
         CustomerRec customerRec = new CustomerRec();
@@ -127,10 +141,12 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         customerRec.setCompanyName(invoiceApplVo.getCompanyName());
         customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
         if(customerRec == null || customerRec.getRecStatus().intValue() !=1 ){
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"客户未备案");
             return new RespR(false,"客户未备案");
         }
         CustomerCarRec customerCarRec = customerCarRecMapper.selectByETC(invoiceApplVo.getCardId());
         if(customerCarRec == null || customerCarRec.getRecStatus() != 1){
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,"该etc卡未绑定或绑定类型错误");
             return new RespR(false,"该etc卡未绑定或绑定类型错误");
         }
         B2BInvoiceApplyRequest b2BInvoiceApplyRequest = new B2BInvoiceApplyRequest();
@@ -149,6 +165,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2BInvoiceApplyRequest.setTradeIdModel(b2BInvoiceApplyModels);
         RespR<B2BInvoiceApplyResponse> respR = selfCarInterface.b2BInvoiceApply(b2BInvoiceApplyRequest);
         if(respR.getCode()==1){
+            log.info("申请开票失败SelfCarServiceLImpl.applInvoice{},msg{}",invoiceApplVo,respR.getMsg());
             return new RespR(false,"申请失败");
         }else{
             B2BInvoiceApplyResponse b2BInvoiceApplyResponse = respR.getData();
@@ -193,8 +210,15 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<List<SelfCarInvoice>> getSelfCarInvoicesByApplyIds(ApplQueryInvVo applQueryInvVo) {
+        log.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{}",applQueryInvVo);
+        if(!customerService.checkMoneyEnough(applQueryInvVo.getCustomerName())){
+            return new RespR(false,"余额不足");
+        }
         B2BInvoiceQueryByApplyRequest b2BInvoiceQueryRequest = new B2BInvoiceQueryByApplyRequest();
         Customer customer = customerMapper.selectByCustomerName(applQueryInvVo.getCustomerName());
+        if(customer == null || customer.getAccstatus().intValue() == 1){
+            return new RespR(false,"客户已经停用");
+        }
         CustomerRec customerRec = new CustomerRec();
         customerRec.setCustomerName(applQueryInvVo.getCustomerName());
         customerRec.setCompanyName(applQueryInvVo.getCompanyName());
@@ -207,6 +231,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2BInvoiceQueryRequest.setApplyId(applQueryInvVo.getApplId());
         RespR<B2BInvoiceQueryByApplyResponse> responseRespR = selfCarInterface.b2bContractQuery(b2BInvoiceQueryRequest);
         if(responseRespR.getCode() == 1){
+            log.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByApplyIds{},msg{}",applQueryInvVo,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             B2BInvoiceQueryByApplyResponse response = responseRespR.getData();
@@ -224,10 +249,6 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 selfCarInvoice.setExTime(DateUtil.tTimeToDate(selfCarInvoice.getExTime()));
                 if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
                     selfCarInvoiceMapper.insert(selfCarInvoice);
-                    //更新为开票完成
-                    SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(selfCarInvoice.getTradeId());
-                    selfCarTrade.setStatus(3);
-                    sellCarTradeMapper.updateByTradeId(selfCarTrade);
                 }
 
             }
@@ -238,6 +259,10 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<List<B2BInvoiceListModel>> getSelfCarInvoicesByTime(SelfCarDueQueryVo selfCarDueQueryVo) {
+        log.info("申请开票开始SelfCarServiceLImpl.getSelfCarInvoicesByTime{}",selfCarDueQueryVo);
+        if(!customerService.checkMoneyEnough(selfCarDueQueryVo.getCustomername())){
+            return new RespR(false,"余额不足");
+        }
         Customer customer = customerMapper.selectByCustomerName(selfCarDueQueryVo.getCustomername());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
@@ -261,6 +286,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
         RespR<B2BInvoiceQueryResponse> responseRespR = selfCarInterface.b2BInvoiceQuery(b2BInvoiceQueryRequest);
         if(responseRespR.getCode() == 1){
+            log.info("申请开票失败SelfCarServiceLImpl.getSelfCarInvoicesByTime{},msg{}",selfCarDueQueryVo,responseRespR.getMsg());
             return new RespR(false,responseRespR.getMsg());
         }else{
             B2BInvoiceQueryResponse b2BInvoiceQueryResponse = responseRespR.getData();
@@ -273,10 +299,6 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     selfCarInvoice.setExTime(DateUtil.dateFormate(selfCarInvoice.getExTime()));
                     if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
                         selfCarInvoiceMapper.insert(selfCarInvoice);
-                        //更新为开票完成
-                        SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(selfCarInvoice.getTradeId());
-                        selfCarTrade.setStatus(3);
-                        sellCarTradeMapper.updateByTradeId(selfCarTrade);
                     }
                 }
             }
@@ -286,10 +308,14 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR<List<B2bInvoicePackageModel>> getInvoicePackge(InvoicePackageVo invoicePackageVo) {
+        log.info("申请开票开始SelfCarServiceLImpl.getInvoicePackge{}",invoicePackageVo);
         Customer customer = customerMapper.selectByCustomerName(invoicePackageVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
         }
+        if(!customerService.checkMoneyEnough(invoicePackageVo.getCustomerName())){
+            return new RespR(false,"余额不足");
+        }
         CustomerRec customerRec = new CustomerRec();
         customerRec.setCustomerName(invoicePackageVo.getCustomerName());
         customerRec.setCompanyName(invoicePackageVo.getCompanyName());
@@ -303,6 +329,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2bInvoicePackageRequest.setMakeMonth(invoicePackageVo.getMonth());
         RespR<B2bInvoicePackageResponse> b2bInvoicePackageResponseRespR = selfCarInterface.b2bInvoicePackage(b2bInvoicePackageRequest);
         if(b2bInvoicePackageResponseRespR.getCode() == 1){
+            log.info("申请开票失败SelfCarServiceLImpl.getInvoicePackge{}，msg{}",invoicePackageVo,b2bInvoicePackageResponseRespR.getMsg());
             return new RespR(false,b2bInvoicePackageResponseRespR.getMsg());
         }else{
             return new RespR(b2bInvoicePackageResponseRespR.getData().getResult());
@@ -311,6 +338,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
 
     @Override
     public RespR getEtcInfo(EtcQueryVo etcQueryVo) {
+        log.info("获取etc信息：SelfCarServiceLImpl.getEtcInfo{}",etcQueryVo);
         Customer customer = customerMapper.selectByCustomerName(etcQueryVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
@@ -329,11 +357,13 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardQueryCardToBRequest.setPalteColor(etcQueryVo.getPlateColor());//车牌颜色.非必输
         RespR<CardBindQueryListToBResponse> respR = selfCarInterface.cardBindQueryListToB(cardQueryCardToBRequest);
         if(respR.getCode() == 1){
+            log.info("获取etc信息失败：SelfCarServiceLImpl.getEtcInfo{},msg{}",etcQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         return new RespR(respR.getData().getResult());
     }
     public RespR queryEtcInfo(EtcBindVo etcBindVo){
+        log.info("获取etc信息：SelfCarServiceLImpl.queryEtcInfo{}",etcBindVo);
         StringBuffer res = new StringBuffer();
         if(etcBindVo== null || etcBindVo.getCards() ==null || etcBindVo.getCards().size()<=0){
             return new RespR(false,"无备案Etc");
@@ -363,9 +393,11 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardQueryCardToBRequest.setVehicleList(cardQueryCardToBModels);
         RespR<CardQueryCardToBResponse> respR = selfCarInterface.cardQueryCardToB(cardQueryCardToBRequest);
         if(respR.getCode() == 1){
+            log.info("获取etc信息失败：SelfCarServiceLImpl.queryEtcInfo{},msg{}",etcBindVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
         }
         if(respR.getData().getResult() == null){
+            log.info("获取etc信息失败：SelfCarServiceLImpl.queryEtcInfo{},msg{}",etcBindVo,"没有etc卡");
             return new RespR(false,"没有etc卡");
         }
         return new RespR(respR.getData().getResult());
@@ -373,6 +405,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR customerEtcRec(EtcBindVo etcBindVo) {
+        log.info("etc注册：SelfCarServiceLImpl.customerEtcRec{}",etcBindVo);
         if(etcBindVo== null || etcBindVo.getCards() ==null || etcBindVo.getCards().size()<=0){
             return new RespR(false,"无备案Etc");
         }
@@ -407,6 +440,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardBindingToBRequest.setCardIdList(cardBindingToBModels);
         RespR<CardBindingToBResponse> respR1 = selfCarInterface.cardBindingToB(cardBindingToBRequest);
         if(respR1.getCode() == 1){
+            log.info("etc注册失败：SelfCarServiceLImpl.customerEtcRec{},msg{}",etcBindVo,respR1.getMsg());
             return new RespR(false,"注册失败："+respR1.getMsg());
         }else{
             return new RespR("已经发送绑定请求，请发送收到的验证码");
@@ -424,6 +458,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR customerEtcRecValid(EtcValidVo etcValidVo) {
+        log.info("etc注册校验：SelfCarServiceLImpl.customerEtcRecValid{}",etcValidVo);
         StringBuffer res = new StringBuffer();
         Customer customer = customerMapper.selectByCustomerName(etcValidVo.getCustomerName());
         if(customer == null || customer.getAccstatus()!=0){
@@ -444,6 +479,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardValidCodeToBRequest.setValidCode(etcValidVo.getValidCode());
         RespR<CardValidCodeToBResponse> respR = selfCarInterface.cardValidCodeToB(cardValidCodeToBRequest);
         if(respR.getCode() == 1){
+            log.info("etc注册校验失败：SelfCarServiceLImpl.customerEtcRecValid{},msg",etcValidVo,respR.getMsg());
             return new RespR(false,"验证失败:"+respR.getMsg());
         }else{
             /**
@@ -469,6 +505,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR customerCarUnRec(List<CustomerCarRec> customerCarRecs) {
+        log.info("etc解绑：SelfCarServiceLImpl.customerCarUnRec{}",customerCarRecs);
         if(customerCarRecs==null || customerCarRecs.size()<=0){
             return new RespR(false,"无解绑信息");
         }
@@ -486,6 +523,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     cardUnbindToBRequest.setCompanyNum(customerRec.getCompanyNum());
                     RespR<CardUnbindToBResponse> respR = selfCarInterface.cardUnbindToB(cardUnbindToBRequest);
                     if(respR.getCode() == 1){
+                        log.info("etc解绑失败：SelfCarServiceLImpl.customerCarUnRec{}，msg{}",customerCarRecs,respR.getMsg());
                         res.append(customerCarRec.getEtcNum()+","+customerCarRec.getCarNum()+"解绑失败;"+"#");
                     }else{
                         customerCarRec.setRecStatus(2);

src/main/java/com/jkcredit/invoice/service/lowerService/vo/ApplQueryInvVo.java

@@ -52,4 +52,14 @@ public class ApplQueryInvVo {
     public void setEtcNum(String etcNum) {
         this.etcNum = etcNum;
     }
+
+    @Override
+    public String toString() {
+        return "ApplQueryInvVo{" +
+                "companyName='" + companyName + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", applId='" + applId + '\'' +
+                ", etcNum='" + etcNum + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/CarVo.java

@@ -31,4 +31,13 @@ public class CarVo {
     public void setEtcNum(String etcNum) {
         this.etcNum = etcNum;
     }
+
+    @Override
+    public String toString() {
+        return "CarVo{" +
+                "num='" + num + '\'' +
+                ", color=" + color +
+                ", etcNum='" + etcNum + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcBindVo.java

@@ -59,4 +59,14 @@ public class EtcBindVo {
     public void setCards(List<CarVo> cards) {
         this.cards = cards;
     }
+
+    @Override
+    public String toString() {
+        return "EtcBindVo{" +
+                "mobile='" + mobile + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", cards=" + cards +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcQueryVo.java

@@ -73,4 +73,15 @@ public class EtcQueryVo {
     public void setPlateColor(Integer plateColor) {
         this.plateColor = plateColor;
     }
+
+    @Override
+    public String toString() {
+        return "EtcQueryVo{" +
+                "customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", plateNum='" + plateNum + '\'' +
+                ", cardId='" + cardId + '\'' +
+                ", plateColor=" + plateColor +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcValidVo.java

@@ -67,4 +67,15 @@ public class EtcValidVo {
     public void setInterType(Integer interType) {
         this.interType = interType;
     }
+
+    @Override
+    public String toString() {
+        return "EtcValidVo{" +
+                "mobile='" + mobile + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", validCode='" + validCode + '\'' +
+                ", interType=" + interType +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/HCInvoiceQueryVo.java

@@ -52,4 +52,14 @@ public class HCInvoiceQueryVo {
     public void setCompanyNum(String companyNum) {
         this.companyNum = companyNum;
     }
+
+    @Override
+    public String toString() {
+        return "HCInvoiceQueryVo{" +
+                "customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", companyNum='" + companyNum + '\'' +
+                ", month='" + month + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoiceApplVo.java

@@ -55,4 +55,14 @@ public class InvoiceApplVo {
     public void setTradeIds(List<String> tradeIds) {
         this.tradeIds = tradeIds;
     }
+
+    @Override
+    public String toString() {
+        return "InvoiceApplVo{" +
+                "customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", cardId='" + cardId + '\'' +
+                ", tradeIds=" + tradeIds +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoicePackageVo.java

@@ -39,4 +39,13 @@ public class InvoicePackageVo {
     public void setMonth(String month) {
         this.month = month;
     }
+
+    @Override
+    public String toString() {
+        return "InvoicePackageVo{" +
+                "customerName='" + customerName + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", month='" + month + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/MonthAccountQueryVo.java

@@ -66,4 +66,16 @@ public class MonthAccountQueryVo {
     public void setPageNo(int pageNo) {
         this.pageNo = pageNo;
     }
+
+    @Override
+    public String toString() {
+        return "MonthAccountQueryVo{" +
+                "customeName='" + customeName + '\'' +
+                ", comPanyName='" + comPanyName + '\'' +
+                ", taxCode='" + taxCode + '\'' +
+                ", tradeMonth='" + tradeMonth + '\'' +
+                ", waybillSource=" + waybillSource +
+                ", pageNo=" + pageNo +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/NoCarQueryVo.java

@@ -55,4 +55,14 @@ public class NoCarQueryVo {
     public void setWaybillSource(String waybillSource) {
         this.waybillSource = waybillSource;
     }
+
+    @Override
+    public String toString() {
+        return "NoCarQueryVo{" +
+                "companyNum='" + companyNum + '\'' +
+                ", plateNum='" + plateNum + '\'' +
+                ", plateColor=" + plateColor +
+                ", waybillSource='" + waybillSource + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/SelfCarDueQueryVo.java

@@ -67,4 +67,15 @@ public class SelfCarDueQueryVo {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    @Override
+    public String toString() {
+        return "SelfCarDueQueryVo{" +
+                "customername='" + customername + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", cardId='" + cardId + '\'' +
+                ", startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/SelfcarInvoiceByTimeVo.java

@@ -46,4 +46,15 @@ public class SelfcarInvoiceByTimeVo {
     public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
+
+    @Override
+    public String toString() {
+        return "SelfcarInvoiceByTimeVo{" +
+                "startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", carNum='" + carNum + '\'' +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestCarNumVo.java

@@ -55,4 +55,16 @@ public class TradeRequestCarNumVo {
     public void setTradeStatus(Integer tradeStatus) {
         this.tradeStatus = tradeStatus;
     }
+
+    @Override
+    public String toString() {
+        return "TradeRequestCarNumVo{" +
+                "startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", carNum='" + carNum + '\'' +
+                ", tradeStatus=" + tradeStatus +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestVo.java

@@ -58,4 +58,16 @@ public class TradeRequestVo {
     public void setTradeStatus(Integer tradeStatus) {
         this.tradeStatus = tradeStatus;
     }
+
+    @Override
+    public String toString() {
+        return "TradeRequestVo{" +
+                "startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", etcId='" + etcId + '\'' +
+                ", tradeStatus=" + tradeStatus +
+                '}';
+    }
 }

src/main/java/com/jkcredit/invoice/service/nocar/NoCarBillWayImportService.java

@@ -0,0 +1,30 @@
+package com.jkcredit.invoice.service.nocar;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+import com.jkcredit.invoice.util.RespR;
+
+import java.util.List;
+
+public interface NoCarBillWayImportService {
+    /**
+     * 查询所有运单号接口
+     * @param page
+     * @param noCarWayBill
+     * @return
+     */
+    IPage<List<NoCarWayBill>> findByPageAndWayBill(Page page, NoCarWayBill noCarWayBill);
+
+    /**
+     * 查询所有异常运单号接口
+     * @param page
+     * @param noCarWayBill
+     * @return
+     */
+    IPage<List<NoCarWayBill>> findByPageAndWayBillException(Page page, NoCarWayBill noCarWayBill);
+
+    void insertImport(NoCarWayBill record);
+
+    void updateBillway(int status,String msg,NoCarWayBill noCarWayBill);
+}

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayImportServiceImpl.java

@@ -0,0 +1,40 @@
+package com.jkcredit.invoice.service.nocar.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jkcredit.invoice.mapper.waybill.NoCarWaybillImprtMapper;
+import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class NoCarBillWayImportServiceImpl extends ServiceImpl<NoCarWaybillImprtMapper,NoCarWayBill> implements NoCarBillWayImportService{
+    @Autowired
+    NoCarWaybillImprtMapper noCarWaybillMapperImprt;
+    @Override
+    public IPage<List<NoCarWayBill>> findByPageAndWayBill(Page page, NoCarWayBill noCarWayBill) {
+        return noCarWaybillMapperImprt.selectAllByPage(page,noCarWayBill);
+    }
+
+    @Override
+    public IPage<List<NoCarWayBill>> findByPageAndWayBillException(Page page, NoCarWayBill noCarWayBill) {
+        return noCarWaybillMapperImprt.selectAllByPageException(page,noCarWayBill);
+    }
+    public void updateBillway(int status,String msg,NoCarWayBill noCarWayBill){
+        noCarWayBill.setFailReason(msg);
+        noCarWayBill.setBillwayStatus(status);
+        noCarWaybillMapperImprt.updateByBillNum(noCarWayBill);
+    }
+
+    @Override
+    public void insertImport(NoCarWayBill record) {
+        noCarWaybillMapperImprt.insertImport(record);
+    }
+
+}

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -8,12 +8,12 @@ import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
-import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
+import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
+import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
-import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +39,12 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
     @Autowired
     CustomerOperService customerOperService;
+
+    @Autowired
+    CustomerService customerService;
+
+    @Autowired
+    NoCarBillWayImportService noCarWaybillMapperImprt;
     @Override
     public IPage<List<NoCarWayBill>> findByPageAndWayBill(Page page, NoCarWayBill noCarWayBill) {
         return noCarWaybillMapper.selectAllByPage(page,noCarWayBill);
@@ -48,8 +54,13 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
     public IPage<List<NoCarWayBill>> findByPageAndWayBillException(Page page, NoCarWayBill noCarWayBill) {
         return noCarWaybillMapper.selectAllByPageException(page,noCarWayBill);
     }
+
     @Override
     public RespR batchBillWayStart(List<NoCarWayBill> noCarWayBills,String customerName) {
+        log.info("开始平台指令上传NoCarBillWayServiceImpl.batchBillWayStart,上传数量"+noCarWayBills.size());
+        if(!customerService.checkMoneyEnough(customerName)){
+            return new RespR(false,"余额不足");
+        }
         StringBuffer stringBuffer = new StringBuffer();
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName,1);
@@ -59,13 +70,16 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
             customerRec.setCustomerName(customerName);
             customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
             customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
+            noCarWayBill.setCompanyName(customerRec.getCompanyName());
+            noCarWayBill.setCustomerName(customerName);
+            noCarWayBill.setBatchNum(batchNumber);
+            noCarWayBill.setBillwayStatus(-1);
+            noCarWaybillMapperImprt.insertImport(noCarWayBill);
             if(customerRec == null){
+                noCarWaybillMapperImprt.updateBillway(-2,"企业税号未备案",noCarWayBill);
                 stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
                 return;
             }
-            noCarWayBill.setCompanyName(customerRec.getCompanyName());
-            noCarWayBill.setCustomerName(customerName);
-            noCarWayBill.setBatchNum(batchNumber);
             //1.查询是否有车辆备案
             CustomerCarRec customerCarRec = customerCarRecMapper.selectByCarNum(noCarWayBill.getPlateColor());
 
@@ -83,6 +97,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                 RespR respR = noCarService.customerCarRec(customerCarRecs);
                 if(respR.getCode() ==1){
                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                     return;
                 }
             }
@@ -90,9 +105,12 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
             //3.进行上传
             RespR respR = noCarService.noCarWaybillStart(noCarWayBill);
             if (respR.getCode() == 1){
+                noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                 stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
             }
+            noCarWaybillMapperImprt.updateBillway(1,"",noCarWayBill);
         });
+        log.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayStart:{}",stringBuffer.toString());
         if(!StringUtils.isEmpty(stringBuffer.toString())){
             return new RespR(false,stringBuffer.toString());
         }
@@ -101,6 +119,9 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
     @Override
     public RespR batchHsitoryBillWay(List<NoCarWayBill> noCarWayBills, String customerName){
+        if(!customerService.checkMoneyEnough(customerName)){
+            return new RespR(false,"余额不足");
+        }
         StringBuffer stringBuffer = new StringBuffer();
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName,3);
@@ -112,14 +133,18 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                 customerRec.setCustomerName(customerName);
                 customerRec.setCompanyReferencenum(noCarWayBill.getTaxplayerCode());
                 customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
-                if(customerRec == null || customerRec.getRecStatus()!=1){
-                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
-                    return;
-                }
                 noCarWayBill.setCompanyName(customerRec.getCompanyName());
                 noCarWayBill.setCustomerName(customerName);
                 noCarWayBill.setBatchNum(batchNumber);
                 noCarWayBill.setTitleType(2);
+                noCarWayBill.setBillwayStatus(-1);
+                noCarWaybillMapperImprt.insertImport(noCarWayBill);
+                if(customerRec == null || customerRec.getRecStatus()!=1){
+                    stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append("企业税号未备案#");
+                    noCarWaybillMapperImprt.updateBillway(-2,"企业税号未备案#",noCarWayBill);
+                    return;
+                }
+
                 //1.查询是否有车辆备案
                 CustomerCarRec customerCarRec = customerCarRecMapper.selectByCarNum(noCarWayBill.getPlateNum());
 
@@ -135,6 +160,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                     customerCarRecs.add(customerCarRec);
                     RespR respR = noCarService.customerCarRec(customerCarRecs);
                     if(respR.getCode() ==1){
+                        noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                         stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                         return;
                     }
@@ -152,6 +178,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                 RespR respR = noCarService.noCarHisWaybillStart(noCarWayBill);
                 if (respR.getCode() == 1){
                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                    noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                     log.info(noCarWayBill.getBillNum()+"#开始指令失败"+respR.getMsg());
                 }else{
                     log.info(noCarWayBill.getBillNum()+"#开始指令成功"+respR.getMsg());
@@ -159,12 +186,12 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                     respR = noCarService.noCarHisWaybillEnd(noCarWayBillClo);
 
                     if(respR.getCode() == 1){
+                        noCarWaybillMapperImprt.updateBillway(1,respR.getMsg(),noCarWayBill);
                         log.info(noCarWayBill.getBillNum()+"#结束指令失败"+respR.getMsg());
                         stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
                     }else{
+                        noCarWaybillMapperImprt.updateBillway(2,respR.getMsg(),noCarWayBill);
                         log.info(noCarWayBill.getBillNum()+"#结束指令成功"+respR.getMsg());
-                        //取发票
-                        noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
                     }
                 }
                 log.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
@@ -182,22 +209,33 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
     @Override
     public RespR batchBillWayEnd(List<NoCarWayBill> noCarWayBills, String customerName) {
+        log.error("结束平台指令上传数量NoCarBillWayServiceImpl.batchBillWayEnd:{}",noCarWayBills.size());
+        if(!customerService.checkMoneyEnough(customerName)){
+            return new RespR(false,"余额不足");
+        }
         StringBuffer stringBuffer = new StringBuffer();
         //保存批次号信息
         String batchNumber = customerOperService.saveCustomerOper(customerName,2);
+
         noCarWayBills.parallelStream().forEach(noCarWayBill -> {
             try {
                 noCarWayBill.setBatchNumEnd(batchNumber);
+                noCarWaybillMapperImprt.insertImport(noCarWayBill);
                 RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
                 if (respR.getCode() == 1){
+                    noCarWaybillMapperImprt.updateBillway(-2,respR.getMsg(),noCarWayBill);
                     stringBuffer.append("#").append(noCarWayBill.getBillNum()).append(":").append(respR.getMsg()).append("#");
+                }else{
+                    noCarWaybillMapperImprt.updateBillway(2,respR.getMsg(),noCarWayBill);
                 }
             }catch (Exception e){
                 e.printStackTrace();
             }
 
         });
+
         if(!StringUtils.isEmpty(stringBuffer.toString())){
+            log.error("开始平台指令上传失败NoCarBillWayServiceImpl.batchBillWayEnd:{}",stringBuffer.toString());
             return new RespR(false,stringBuffer.toString());
         }
         return new RespR(Boolean.TRUE);

src/main/java/com/jkcredit/invoice/service/upService/impl/CommInterFaceImpl.java

@@ -16,14 +16,17 @@ public class CommInterFaceImpl implements CommInterFace{
     public RespR<CompanyQueryResponse> companyQuery(CompanyQueryRequest companyQueryRequest) {
         String fileName = companyQueryRequest.getFilename();
         try {
+            log.info("CommInterFaceImpl.companyQuery上游接口请求参数：{}",  companyQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CompanyQueryResponse response= ETCCommHelper.upload(fileName, companyQueryRequest, CompanyQueryResponse.class);
             log.info("CommInterFaceImpl.companyQuery上游接口返回：{},请求参数：{}", response.toString(), companyQueryRequest.toString());
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error("CommInterFaceImpl.companyQuery:{}",e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error("CommInterFaceImpl.companyQuery:{}",apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -33,14 +36,17 @@ public class CommInterFaceImpl implements CommInterFace{
     public RespR<CompanyAddResponse> addCompany(CompanyAddRequest companyAddRequest) {
         String fileName = companyAddRequest.getFilename();
         try {
+            log.info("CommInterFaceImpl.addCompany请求参数：{}", companyAddRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CompanyAddResponse response=ETCCommHelper.upload(fileName, companyAddRequest, CompanyAddResponse.class);
             log.info("CommInterFaceImpl.addCompany上游接口返回：{},请求参数：{}", response.toString(), companyAddRequest.toString());
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error("CommInterFaceImpl.addCompany：{}", e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error("CommInterFaceImpl.addCompany：{}", apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -50,6 +56,7 @@ public class CommInterFaceImpl implements CommInterFace{
     public RespR<B2bContractAddResponse> b2bContractAdd(B2bContractAddRequest contractAddRequest) {
         String fileName = contractAddRequest.getFilename();
         try {
+            log.info("CommInterFaceImpl.b2bContractAdd上游请求参数：{}",contractAddRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractAddResponse response=ETCCommHelper.upload(fileName, contractAddRequest, B2bContractAddResponse.class);
             log.info("CommInterFaceImpl.b2bContractAdd上游接口返回：{},请求参数：{}", response.toString(), contractAddRequest.toString());
@@ -57,8 +64,10 @@ public class CommInterFaceImpl implements CommInterFace{
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
+            log.error("CommInterFaceImpl.b2bContractAdd：{}",e.getMessage());
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error("CommInterFaceImpl.b2bContractAdd：{}",apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -68,6 +77,7 @@ public class CommInterFaceImpl implements CommInterFace{
     public RespR<B2bContractQueryResponse> b2bContractQuery(B2bContractQueryRequest b2bContractQueryRequest) {
         String fileName = b2bContractQueryRequest.getFilename();
         try {
+            log.info("CommInterFaceImpl.b2bContractQuery上游请求参数：{}",  b2bContractQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractQueryResponse response=ETCCommHelper.upload(fileName, b2bContractQueryRequest, B2bContractQueryResponse.class);
             log.info("CommInterFaceImpl.b2bContractQuery上游接口返回：{},请求参数：{}", response.toString(), b2bContractQueryRequest.toString());
@@ -75,9 +85,11 @@ public class CommInterFaceImpl implements CommInterFace{
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
+            log.error("CommInterFaceImpl.b2bContractQuery：{}",  e.getMessage());
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
+            log.error("CommInterFaceImpl.b2bContractQuery：{}",  apie.getMessage());
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
     }

src/main/java/com/jkcredit/invoice/service/upService/impl/NoCarInterfaceImpl.java

@@ -22,16 +22,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<VehicleRegisterResponse> vehicleRegister(VehicleRegisterRequest registerRequest) {
         String fileName = registerRequest.getFilename();
         try {
-            //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("NoCarInterfaceImpl.vehicleRegister,请求参数：{}",  registerRequest.toString());
             VehicleRegisterResponse response=ETCCommHelper.upload(fileName, registerRequest, VehicleRegisterResponse.class);
             log.info("NoCarInterfaceImpl.vehicleRegister上游接口返回：{},请求参数：{}", response.toString(), registerRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
+            log.error(e.getMessage());
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
             apie.printStackTrace();
+            log.error(apie.getMessage());
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
     }
@@ -40,17 +42,20 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<VehicleQueryResponse> vehicleQuery(VehicleQueryRequest vehicleQueryRequest) {
         String fileName = vehicleQueryRequest.getFilename();
         try {
+            log.info("NoCarInterfaceImpl.vehicleQuery上游请求参数：{}", vehicleQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             VehicleQueryResponse response=ETCCommHelper.upload(fileName, vehicleQueryRequest, VehicleQueryResponse.class);
             log.info("NoCarInterfaceImpl.vehicleQuery上游接口返回：{},请求参数：{}", response.toString(), vehicleQueryRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
-            log.info("NoCarInterfaceImpl.vehicleQuery上游请求参数：{}", vehicleQueryRequest.toString());
+
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
     }
@@ -59,15 +64,17 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<WaybillStartResponse> waybillStart(WaybillStartRequest waybillStartRequest) {
         String fileName = waybillStartRequest.getFilename();
         try {
-            //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("NoCarInterfaceImpl.waybillStart上游请求参数：{}", waybillStartRequest.toString());
             WaybillStartResponse response=ETCCommHelper.upload(fileName, waybillStartRequest, WaybillStartResponse.class);
             log.info("NoCarInterfaceImpl.waybillStart上游接口返回：{},请求参数：{}", response.toString(), waybillStartRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -77,15 +84,17 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<WaybillEndResponse> waybillEnd(WaybillEndRequest waybillEndRequest) {
         String fileName = waybillEndRequest.getFilename();
         try {
-            //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("NoCarInterfaceImpl.waybillEnd请求参数：{}", waybillEndRequest.toString());
             WaybillEndResponse response=ETCCommHelper.upload(fileName, waybillEndRequest, WaybillEndResponse.class);
             log.info("NoCarInterfaceImpl.waybillEnd上游接口返回：{},请求参数：{}", response.toString(), waybillEndRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -95,15 +104,19 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<WaybillHistoryStartResponse> waybillHistoryStart(WaybillHistoryStartRequest waybillHistoryStartRequest) {
         String fileName = waybillHistoryStartRequest.getFilename();
         try {
+            log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口请求参数：{}", waybillHistoryStartRequest.toString());
+
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillHistoryStartResponse response=ETCCommHelper.upload(fileName, waybillHistoryStartRequest, WaybillHistoryStartResponse.class);
             log.info("NoCarInterfaceImpl.waybillHistoryStart上游接口返回：{},请求参数：{}", response.toString(), waybillHistoryStartRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -113,15 +126,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<WaybillHistoryEndResponse> waybillHistoryEnd(WaybillHistoryEndRequest waybillHistoryEndRequest) {
         String fileName = waybillHistoryEndRequest.getFilename();
         try {
+            log.info("NoCarInterfaceImpl.waybillHistoryEnd请求参数：{}",  waybillHistoryEndRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillHistoryEndResponse response=ETCCommHelper.upload(fileName, waybillHistoryEndRequest, WaybillHistoryEndResponse.class);
             log.info("NoCarInterfaceImpl.waybillHistoryEnd上游接口返回：{},请求参数：{}", response.toString(), waybillHistoryEndRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -131,15 +147,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<WaybillNumFindInvoiceResponse> waybillNumFindInvoice(WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest) {
         String fileName = waybillNumFindInvoiceRequest.getFilename();
         try {
+            log.info("NoCarInterfaceImpl.waybillNumFindInvoice请求参数：{}", waybillNumFindInvoiceRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillNumFindInvoiceResponse response=ETCCommHelper.upload(fileName, waybillNumFindInvoiceRequest, WaybillNumFindInvoiceResponse.class);
             log.info("NoCarInterfaceImpl.waybillNumFindInvoice上游接口返回：{},请求参数：{}", response.toString(), waybillNumFindInvoiceRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -150,14 +169,17 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         String fileName = waybillInvoiceRedQueryRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery请求参数：{}",  waybillInvoiceRedQueryRequest.toString());
             WaybillInvoiceRedQueryResponse response=ETCCommHelper.upload(fileName, waybillInvoiceRedQueryRequest, WaybillInvoiceRedQueryResponse.class);
             log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery上游接口返回：{},请求参数：{}", response.toString(), waybillInvoiceRedQueryRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -167,15 +189,18 @@ public class NoCarInterfaceImpl implements NoCarInterface {
     public RespR<WaybillCountQueryResponse> waybillCountQuery(WaybillCountQueryRequest waybillCountQueryRequest) {
         String fileName = waybillCountQueryRequest.getFilename();
         try {
+            log.info("NoCarInterfaceImpl.waybillCountQuery上游请求参数：{}", waybillCountQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillCountQueryResponse response=ETCCommHelper.upload(fileName, waybillCountQueryRequest, WaybillCountQueryResponse.class);
             log.info("NoCarInterfaceImpl.waybillCountQuery上游接口返回：{},请求参数：{}", response.toString(), waybillCountQueryRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }

src/main/java/com/jkcredit/invoice/service/upService/impl/SelfCarInterfaceImpl.java

@@ -22,14 +22,17 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = cardBindQueryListToBRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.cardBindQueryListToB请求参数：{}", cardBindQueryListToBRequest.toString());
             CardBindQueryListToBResponse response=ETCCommHelper.upload(fileName, cardBindQueryListToBRequest, CardBindQueryListToBResponse.class);
             log.info("SelfCarInterfaceImpl.cardBindQueryListToB上游接口返回：{},请求参数：{}", response.toString(), cardBindQueryListToBRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -39,15 +42,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     public RespR<CardQueryCardToBResponse> cardQueryCardToB(CardQueryCardToBRequest cardQueryCardToBRequest) {
         String fileName = cardQueryCardToBRequest.getFilename();
         try {
+            log.info("SelfCarInterfaceImpl.cardQueryCardToB请求参数：{}", cardQueryCardToBRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardQueryCardToBResponse response=ETCCommHelper.upload(fileName, cardQueryCardToBRequest, CardQueryCardToBResponse.class);
             log.info("SelfCarInterfaceImpl.cardQueryCardToB上游接口返回：{},请求参数：{}", response.toString(), cardQueryCardToBRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -58,15 +64,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = cardBindingToBRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.cardBindingToB上游请求参数：{}", cardBindingToBRequest.toString());
             CardBindingToBResponse response=ETCCommHelper.upload(fileName, cardBindingToBRequest, CardBindingToBResponse.class);
             log.info("SelfCarInterfaceImpl.cardBindingToB上游接口返回：{},请求参数：{}", response.toString(), cardBindingToBRequest.toString());
 
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -77,15 +86,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = cardValidCodeToBRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.cardValidCodeToB上游请求参数：{}", cardValidCodeToBRequest.toString());
             CardValidCodeToBResponse response=ETCCommHelper.upload(fileName, cardValidCodeToBRequest, CardValidCodeToBResponse.class);
             log.info("SelfCarInterfaceImpl.cardValidCodeToB上游接口返回：{},请求参数：{}", response.toString(), cardValidCodeToBRequest.toString());
 
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -96,15 +108,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = cardUnbindToBRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.cardUnbindToB上游请求参数：{}", cardUnbindToBRequest.toString());
             CardUnbindToBResponse response=ETCCommHelper.upload(fileName, cardUnbindToBRequest, CardUnbindToBResponse.class);
             log.info("SelfCarInterfaceImpl.cardUnbindToB上游接口返回：{},请求参数：{}", response.toString(), cardUnbindToBRequest.toString());
 
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -115,15 +130,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = cardTradeRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.cardTrade上游请求参数：{}", cardTradeRequest.toString());
             CardTradeResponse response=ETCCommHelper.upload(fileName, cardTradeRequest, CardTradeResponse.class);
             log.info("SelfCarInterfaceImpl.cardTrade上游接口返回：{},请求参数：{}", response.toString(), cardTradeRequest.toString());
 
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -134,15 +152,16 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = b2BInvoiceApplyRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游请求参数：{}",  b2BInvoiceApplyRequest.toString());
             B2BInvoiceApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceApplyRequest, B2BInvoiceApplyResponse.class);
             log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceApplyRequest.toString());
-
-
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -152,6 +171,7 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     public RespR<B2BInvoiceQueryResponse> b2BInvoiceQuery(B2BInvoiceQueryRequest b2BInvoiceQueryRequest) {
         String fileName = b2BInvoiceQueryRequest.getFilename();
         try {
+            log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游请求参数：{}", b2BInvoiceQueryRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2BInvoiceQueryResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryRequest, B2BInvoiceQueryResponse.class);
             log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceQueryRequest.toString());
@@ -159,9 +179,11 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -172,14 +194,17 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         String fileName = b2BInvoiceQueryByApplyRequest.getFilename();
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            log.info("SelfCarInterfaceImpl.b2bContractQuery上游请求参数：{}",b2BInvoiceQueryByApplyRequest.toString());
             B2BInvoiceQueryByApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryByApplyRequest, B2BInvoiceQueryByApplyResponse.class);
             log.info("SelfCarInterfaceImpl.b2bContractQuery上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceQueryByApplyRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }
@@ -189,15 +214,18 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
     public RespR<B2bInvoicePackageResponse> b2bInvoicePackage(B2bInvoicePackageRequest b2bInvoicePackageRequest) {
         String fileName = b2bInvoicePackageRequest.getFilename();
         try {
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游请求参数：{}", b2bInvoicePackageRequest.toString());
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bInvoicePackageResponse response=ETCCommHelper.upload(fileName, b2bInvoicePackageRequest, B2bInvoicePackageResponse.class);
             log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{}", response.toString(), b2bInvoicePackageRequest.toString());
 
             return new RespR<>(response);
         } catch (IOException e) {
+            log.error(e.getMessage());
             e.printStackTrace();
             return new RespR(false,"网络异常,请联系管理人员");
         }catch (ApiRequestException apie) {
+            log.error(apie.getMessage());
             apie.printStackTrace();
             return new RespR(false,"错误码："+apie.getErrCode()+" 错误信息："+apie.getMessage());
         }

src/main/resources/logback-spring.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-	<property name="log.path" value="logs/"/>
-	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN"
-			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
-	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-	<conversionRule conversionWord="wEx"
-					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <property name="log.path" value="d:/logs"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
     <!-- Console log output -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -17,115 +17,43 @@
         </encoder>
     </appender>
 
-    <!-- Log file debug output -->
-    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 过滤器，只记录WARN级别的日志 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
+    <appender name="syslog"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>TRACE</level>
         </filter>
-        <file>${log.path}/debug.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
+        <!-- rollingPolicy:当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名。 -->
+        <!-- TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 活动文件的名字会根据fileNamePattern的值，每隔一段时间改变一次 -->
+            <!-- 文件名：log/sys.2017-12-05.0.log -->
+            <fileNamePattern>${log.path}/log/sys.%d.%i.log</fileNamePattern>
+            <!-- 每产生一个日志文件，该日志文件的保存期限为30天 -->
             <maxHistory>30</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- maxFileSize:这是活动文件的大小，默认值是10MB,本篇设置为1KB，只是为了演示 -->
+                <maxFileSize>10M</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
         <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Log file error output -->
-    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-    </appender>
-
-
-    <appender name="chargeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 过滤器，只记录WARN级别的日志 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${log.path}/charge/charge.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/charge/%d{yyyy-MM}/charge.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="b2bChargeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 过滤器，只记录WARN级别的日志 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${log.path}/charge/b2bCharge.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/b2bCharge/%d{yyyy-MM}/b2bCharge.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Log file debug output -->
-    <appender name="sourceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 过滤器，只记录WARN级别的日志 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <file>${log.path}/source.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/source.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+            <!-- pattern节点，用来设置日志的输入格式 -->
+            <pattern>
+                %d %p (%file:%line\)- %m%n
+            </pattern>
+            <!-- 记录日志的编码 -->
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
     </appender>
 
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="INFO">
         <appender-ref ref="console" />
-        <appender-ref ref="debug" />
-        <appender-ref ref="error" />
+        <appender-ref ref="syslog" />
     </root>
-    <logger name="com.jkcredit.invoice.service.impl" level="WARN">
-        <appender-ref ref="chargeLog"/>
-    </logger>
-    <logger name="com.jkcredit.invoice.service.impl.CardTradeServiceImpl" level="WARN">
-        <appender-ref ref="b2bChargeLog"/>
-    </logger>
 
-    <logger name="com.jkcredit.invoice.service.impl" level="INFO">
-        <appender-ref ref="sourceLog"/>
-    </logger>
 
-    <logger name="com.jkcredit.invoice.async" level="INFO">
-        <appender-ref ref="sourceLog"/>
+    <logger name="com.jkcredit.invoice" level="INFO">
+        <appender-ref ref="syslog"/>
+        <appender-ref ref="console" />
     </logger>
 </configuration>

src/main/resources/mapper/customer/CustomerMapper.xml

@@ -51,6 +51,11 @@
      select
       <include refid="Base_Column_List_app_secret" />
      from t_customer
+    <where>
+      <if test="customer.customerName != null and customer.customerName != ''">
+        and customer_name LIKE CONCAT('%',#{customer.customerName},'%')
+      </if>
+    </where>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 

src/main/resources/mapper/customer/CustomerRecMapper.xml

@@ -54,6 +54,9 @@
     <if test="customerRec.companyName != null and customerRec.companyName != ''">
       and company_name = #{customerRec.companyName}
     </if>
+      <if test="customerRec.serviceEndTime != null and customerRec.serviceEndTime != ''">
+        and service_endTime > #{customerRec.serviceEndTime}
+      </if>
     </where>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >

src/main/resources/mapper/customer/CustomerRechargeMapper.xml

@@ -15,6 +15,11 @@
     select
     <include refid="Base_Column_List" />
     from t_customer_recharge
+    <where>
+      <if test="customerRecharge.customerName != null and customerRecharge.customerName != ''">
+        and customer_name LIKE CONCAT('%',#{customerRecharge.customerName},'%')
+      </if>
+    </where>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 

src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -221,6 +221,10 @@
         where invoiceNum = #{invoiceNum,jdbcType=VARCHAR}
     </select>
 
+    <delete id="deleteByBillNum" parameterType="java.lang.String">
+         DELETE  from t_billInvoice WHERE waybillNum = #{waybillNum,jdbcType=VARCHAR}
+    </delete>
+
     <resultMap id="staticResultMap" type="java.util.Map">
         <result column="fee" property="fee"/>
         <result column="totalTaxAmount" property="totalTaxAmount"/>

src/main/resources/mapper/waybill/NoCarWaybillImportMapper.xml

@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jkcredit.invoice.mapper.waybill.NoCarWaybillImprtMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill">
+        <id column="id" property="id"/>
+        <result column="customerName" property="customerName"/>
+        <result column="companyName" property="companyName"/>
+        <result column="billNum" property="billNum"/>
+        <result column="plateNum" property="plateNum"/>
+        <result column="plateColor" property="plateColor"/>
+        <result column="startTime" property="startTime"/>
+        <result column="sourceAddr" property="sourceAddr"/>
+        <result column="destAddr" property="destAddr"/>
+        <result column="predictEndTime" property="predictEndTime"/>
+        <result column="fee" property="fee"/>
+        <result column="hisFlag" property="hisFlag"></result>
+        <result column="billwayStatus" property="billwayStatus"></result>
+        <result column="titleType" property="titleType"/>
+        <result column="taxplayerCode" property="taxplayerCode"/>
+        <result column="intfaceStartTime" property="intfaceStartTime"/>
+        <result column="interfaceEndTime" property="interfaceEndTime"/>
+        <result column="companyAdress" property="companyAdress"/>
+        <result column="companyBank" property="companyBank"/>
+        <result column="companyBankAcc" property="companyBankAcc"/>
+        <result column="companyTel" property="companyTel"/>
+        <result column="updateTime" property="updateTime"/>
+        <result column="failReason" property="failReason"/>
+    </resultMap>
+
+    <sql id="baseSql">
+        id,
+        customerName,
+        companyName,
+        billNum,
+        plateNum,
+        plateColor,
+        startTime,
+        sourceAddr,
+        destAddr,
+        predictEndTime,
+        fee,
+        titleType,
+        taxplayerCode,
+        intfaceStartTime,
+        interfaceEndTime,
+        billwayStatus,
+        hisFlag,
+        companyAdress,
+        companyBank,
+        companyBankAcc,
+        companyTel,companyNum,updateTime,failReason
+    </sql>
+    <select id="selectAllByPage" resultMap="BaseResultMap">
+        select
+        <include refid="baseSql" />
+        from t_waybill_Import
+        <where>
+            <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
+                and companyName LIKE CONCAT('%',#{noCarWayBill.companyName},'%')
+            </if>
+            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
+                and billNum = #{noCarWayBill.billNum}
+            </if>
+            <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
+                and taxplayerCode = #{noCarWayBill.taxplayerCode}
+            </if>
+            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
+                and billwayStatus = #{noCarWayBill.billwayStatus}
+            </if>
+            <if test="noCarWayBill.startBegin != null and noCarWayBill.startBegin != ''">
+                and intfaceStartTime BETWEEN #{noCarWayBill.startBegin} and #{noCarWayBill.startEnd}
+            </if>
+            <if test="noCarWayBill.endBegin != null and noCarWayBill.endBegin != ''">
+                and interfaceEndTime BETWEEN #{noCarWayBill.endBegin} and #{noCarWayBill.endEnd}
+            </if>
+            <if test="noCarWayBill.batchNum != null and noCarWayBill.batchNum != ''">
+                and batchNumber = #{noCarWayBill.batchNum}
+            </if>
+            <if test="noCarWayBill.batchNumEnd != null and noCarWayBill.batchNumEnd != ''">
+                and batchNumEnd = #{noCarWayBill.batchNumEnd}
+            </if>
+        </where>
+    </select>
+    <select id="selectAllByPageException" resultMap="BaseResultMap">
+        select
+        <include refid="baseSql" />
+        from t_waybill_Import
+        <where>
+            <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
+                and companyName LIKE CONCAT('%',#{noCarWayBill.companyName},'%')
+            </if>
+            <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
+                and billNum = #{noCarWayBill.billNum}
+            </if>
+            <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
+                and taxplayerCode = #{noCarWayBill.taxplayerCode}
+            </if>
+            <if test="noCarWayBill.startBegin != null and noCarWayBill.startBegin != ''">
+                and intfaceStartTime BETWEEN #{noCarWayBill.startBegin} and #{noCarWayBill.startEnd}
+            </if>
+            <if test="noCarWayBill.endBegin != null and noCarWayBill.endBegin != ''">
+                and interfaceEndTime BETWEEN #{noCarWayBill.endBegin} and #{noCarWayBill.endEnd}
+            </if>
+
+             and billwayStatus =4
+        </where>
+    </select>
+    <insert id="insertImport" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
+        insert into t_waybill_Import (
+            customerName,
+            companyName,
+            billNum,
+            plateNum,
+            plateColor,
+            startTime,
+            sourceAddr,
+            destAddr,
+            predictEndTime,
+            fee,
+            titleType,
+            taxplayerCode,
+            intfaceStartTime,
+            interfaceEndTime,
+            billwayStatus,
+            hisFlag,
+            companyAdress,
+            companyBank,
+            companyBankAcc,
+            companyTel,companyNum,updateTime,batchNumber,batchNumEnd,failReason
+        )
+        values ( #{customerName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
+        #{billNum,jdbcType=VARCHAR}, #{plateNum,jdbcType=VARCHAR}, #{plateColor,jdbcType=VARCHAR},
+        #{startTime,jdbcType=VARCHAR}, #{sourceAddr,jdbcType=VARCHAR}, #{destAddr,jdbcType=VARCHAR},
+        #{predictEndTime,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER}, #{titleType,jdbcType=INTEGER},
+        #{taxplayerCode,jdbcType=VARCHAR},#{intfaceStartTime,jdbcType=VARCHAR},#{interfaceEndTime,jdbcType=VARCHAR},
+        #{billwayStatus,jdbcType=INTEGER},#{hisFlag,jdbcType=INTEGER}, #{companyAdress,jdbcType=VARCHAR}, #{companyBank,jdbcType=VARCHAR}
+        , #{companyBankAcc,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},#{batchNum,jdbcType=VARCHAR},#{batchNumEnd,jdbcType=VARCHAR},#{failReason,jdbcType=VARCHAR}
+        )
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
+        update t_waybill_Import
+        set customerName = #{customerName,jdbcType=VARCHAR},
+        companyName = #{companyName,jdbcType=VARCHAR},
+        billNum = #{billNum,jdbcType=VARCHAR},
+        plateNum = #{plateNum,jdbcType=VARCHAR},
+        plateColor = #{plateColor,jdbcType=VARCHAR},
+        startTime = #{startTime,jdbcType=VARCHAR},
+        sourceAddr = #{sourceAddr,jdbcType=VARCHAR},
+        destAddr = #{destAddr,jdbcType=VARCHAR},
+        predictEndTime = #{predictEndTime,jdbcType=VARCHAR},
+        fee = #{fee,jdbcType=INTEGER},
+        titleType = #{titleType,jdbcType=INTEGER},
+        taxplayerCode = #{taxplayerCode,jdbcType=VARCHAR},
+        intfaceStartTime = #{intfaceStartTime,jdbcType=VARCHAR},
+        interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},
+        billwayStatus = #{billwayStatus,jdbcType=INTEGER},
+        hisFlag = #{hisFlag,jdbcType=INTEGER},
+        companyAdress = #{companyAdress,jdbcType=VARCHAR},
+        companyBank = #{companyBank,jdbcType=VARCHAR},
+        companyBankAcc = #{companyBankAcc,jdbcType=VARCHAR},
+        companyTel = #{companyTel,jdbcType=VARCHAR},
+        companyNum = #{companyNum,jdbcType=VARCHAR},
+        failReason = #{failReason,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <update id="updateByBillNum" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
+        update t_waybill_Import
+        set customerName = #{customerName,jdbcType=VARCHAR},
+        companyName = #{companyName,jdbcType=VARCHAR},
+        billNum = #{billNum,jdbcType=VARCHAR},
+        plateNum = #{plateNum,jdbcType=VARCHAR},
+        plateColor = #{plateColor,jdbcType=VARCHAR},
+        startTime = #{startTime,jdbcType=VARCHAR},
+        sourceAddr = #{sourceAddr,jdbcType=VARCHAR},
+        destAddr = #{destAddr,jdbcType=VARCHAR},
+        predictEndTime = #{predictEndTime,jdbcType=VARCHAR},
+        fee = #{fee,jdbcType=INTEGER},
+        titleType = #{titleType,jdbcType=INTEGER},
+        taxplayerCode = #{taxplayerCode,jdbcType=VARCHAR},
+        intfaceStartTime = #{intfaceStartTime,jdbcType=VARCHAR},
+        interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},
+        billwayStatus = #{billwayStatus,jdbcType=INTEGER},
+        hisFlag = #{hisFlag,jdbcType=INTEGER},
+        companyAdress = #{companyAdress,jdbcType=VARCHAR},
+        companyBank = #{companyBank,jdbcType=VARCHAR},
+        companyBankAcc = #{companyBankAcc,jdbcType=VARCHAR},
+        companyTel = #{companyTel,jdbcType=VARCHAR},
+        companyNum = #{companyNum,jdbcType=VARCHAR},
+        failReason = #{failReason,jdbcType=VARCHAR}
+        where billNum = #{billNum,jdbcType=VARCHAR}
+    </update>
+    <select id="selectByBillNum" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="baseSql" />
+        from t_waybill_Import
+        where billNum = #{billNum,jdbcType=VARCHAR}
+    </select>
+    <select id="selectByHisFlagAndBillStatus" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
+        select
+        <include refid="baseSql" />
+        from t_waybill_Import
+        where hisFlag = #{hisFlag,jdbcType=INTEGER} and billwayStatus = #{billwayStatus,jdbcType=INTEGER}
+    </select>
+
+
+
+    <select id="getNoCarNoVoiceQuery" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="baseSql" />
+        from t_waybill_Import
+        where customerName = #{customerName,jdbcType=VARCHAR}
+    </select>
+
+
+
+</mapper>

src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -48,6 +48,9 @@
             <if test="sellCarTrade.tradeId != null and sellCarTrade.tradeId != ''">
                 and tradeId = #{sellCarTrade.tradeId}
             </if>
+            <if test="sellCarTrade.status != null and sellCarTrade.status != ''">
+                and status = #{sellCarTrade.status}
+            </if>
             <if test="sellCarTrade.exTimeBegin != null and sellCarTrade.exTimeBegin != ''">
                 and exTime BETWEEN #{sellCarTrade.exTimeBegin} and #{sellCarTrade.exTimeEnd}
             </if>