后端代码提交

.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.freemarker:freemarker:2.3.28">
+    <CLASSES>
+      <root url="jar://D:/mashenyi/jar/org/freemarker/freemarker/2.3.28/freemarker-2.3.28.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/mashenyi/jar/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/mashenyi/jar/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_1_5_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.1.5.RELEASE">
+    <CLASSES>
+      <root url="jar://D:/mashenyi/jar/org/springframework/boot/spring-boot-starter-freemarker/2.1.5.RELEASE/spring-boot-starter-freemarker-2.1.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/mashenyi/jar/org/springframework/boot/spring-boot-starter-freemarker/2.1.5.RELEASE/spring-boot-starter-freemarker-2.1.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/mashenyi/jar/org/springframework/boot/spring-boot-starter-freemarker/2.1.5.RELEASE/spring-boot-starter-freemarker-2.1.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

pom.xml

@@ -269,13 +269,13 @@
             <version>1.0</version>
             <systemPath>${project.basedir}/lib/slf4j-api-1.7.jar</systemPath>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>validation-api-1.1.0.Final</groupId>
             <artifactId>sdk</artifactId>
             <scope>system</scope>
             <version>1.0</version>
             <systemPath>${project.basedir}/lib/validation-api-1.1.0.Final.jar</systemPath>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>sdk-common-1.1</groupId>
@@ -287,11 +287,11 @@
 
         <!--无车-->
         <dependency>
-            <groupId>sdk-waybill-protocol-1.3.7</groupId>
+            <groupId>sdk-waybill-protocol-1.3.10</groupId>
             <artifactId>sdk</artifactId>
             <scope>system</scope>
             <version>1.0</version>
-            <systemPath>${project.basedir}/lib/sdk-waybill-protocol-1.3.7.jar</systemPath>
+            <systemPath>${project.basedir}/lib/sdk-waybill-protocol-1.3.10.jar</systemPath>
         </dependency>
         <!--有车-->
         <dependency>
@@ -302,6 +302,10 @@
             <systemPath>${project.basedir}/lib/sdk-b2b-protocol-1.5.1.jar</systemPath>
         </dependency>
         <!--调用第三方的依赖包-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
     </dependencies>
 
 

src/main/java/com/jkcredit/invoice/config/InvoiceWebMvcConfigurer.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @create: 2019/3/1 10:51 AM
  * @version: V1.0
  **/
-@Configuration
+/*@Configuration*/
 public class InvoiceWebMvcConfigurer extends WebMvcConfigurationSupport {
 
     /**
@@ -41,8 +41,8 @@ public class InvoiceWebMvcConfigurer extends WebMvcConfigurationSupport {
                 .addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
-        registry.addResourceHandler("/static/**")
-                .addResourceLocations("file://home/invoiceSrv/app/bin/static");
+        /*registry.addResourceHandler("/static/**")
+                .addResourceLocations("file://home/invoiceSrv/app/bin/static");*/
 
         super.addResourceHandlers(registry);
     }

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

@@ -10,6 +10,7 @@ import com.jkcredit.invoice.service.customer.CustomerRechargeService;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
 import com.jkcredit.invoice.util.RespR;
+import com.jkcredit.invoice.util.WordUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.util.IOUtils;
@@ -19,9 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
+import java.util.*;
 
 /**
  * 客户操作
@@ -177,4 +176,37 @@ public class CustomerController {
 
         return new RespR(false);
     }
+    @GetMapping("/generateWord")
+    @ApiOperation(value="文档下载", notes="文档下载")
+    public RespR generateWord(String customerRecId,HttpServletResponse response){
+        CustomerRec customerRec = (CustomerRec) customerService.contractDownload(customerRecId).getData();
+        String fileName = "合作说明.doc";
+        Map<String, String> dataMap = new HashMap<>();
+        dataMap.put("a", customerRec.getCustomerName());
+        dataMap.put("b", customerRec.getCompanyName());
+        dataMap.put("c", customerRec.getCompanyReferencenum());
+        dataMap.put("d", customerRec.getCompanyAdress());
+        dataMap.put("e", customerRec.getCompanyPhone());
+        dataMap.put("f", customerRec.getCompanyOpenbank());
+        dataMap.put("g", customerRec.getCompanyOpenbankAcc());
+        dataMap.put("j", customerRec.getServiceStartTime().substring(0,10));
+        dataMap.put("k", customerRec.getServiceEndTime().substring(0,10));
+        Calendar now = Calendar.getInstance();
+        dataMap.put("l",now.get(Calendar.YEAR)+"");
+        dataMap.put("h",(now.get(Calendar.MONTH) + 1) + "");
+        dataMap.put("i", now.get(Calendar.DAY_OF_MONTH)+"");
+        OutputStream outputStream =null;
+        try{
+            response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(fileName, "UTF-8"));
+            outputStream = response.getOutputStream();
+            WordUtil.ExportSimpleWord(dataMap,"/static/templates/excel/",outputStream);
+            response.flushBuffer();
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            IOUtils.closeQuietly(outputStream);
+        }
+        return new RespR(false);
+    }
+
 }

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

@@ -2,11 +2,13 @@ package com.jkcredit.invoice.controller.localBussiness;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
+import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
 import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
+import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.nocar.NocarInvoiceService;
@@ -14,16 +16,19 @@ import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Api(tags = "无车操作")
 @RestController
 @RequestMapping(value = {"/noCar"})
 public class NoCarController {
     @Autowired
-    NoCarRecService noCarService;
+    NoCarRecService noCarRecService;
 
     @Autowired
     NoCarBillWayService noCarBillWayService;
@@ -33,6 +38,12 @@ public class NoCarController {
 
     @Autowired
     NoCarCalculateInfoService noCarCalculateInfoService;
+
+    @Autowired
+    NoCarWaybillMapper noCarWaybillMapper;
+
+    @Autowired
+    NoCarService noCarService;
     /**
      * 分页查询无车备案信息
      *
@@ -44,14 +55,29 @@ public class NoCarController {
     @LoginRequired
     public RespR getCustomersByPage(Page page, CustomerCarRec customerCarRec) {
         try {
-            RespR respR = new RespR(noCarService.findByPageAndCarRec(page, customerCarRec));
+            RespR respR = new RespR(noCarRecService.findByPageAndCarRec(page, customerCarRec));
             return respR;
         }catch (Exception e){
             e.printStackTrace();
             return new RespR(false,e.getMessage());
         }
     }
-
+    public void setTimeDue(NoCarWayBill noCarWayBill){
+        if(!StringUtils.isEmpty(noCarWayBill.getStartBegin()) && !"null".equals(noCarWayBill.getStartBegin())){
+            String [] res = noCarWayBill.getStartBegin().split(",");
+            noCarWayBill.setStartBegin(res[0]);
+            noCarWayBill.setStartEnd(res[1]);
+        }else{
+            noCarWayBill.setStartBegin(null);
+        }
+        if(!StringUtils.isEmpty(noCarWayBill.getEndBegin()) && !"null".equals(noCarWayBill.getEndBegin())){
+            String [] res = noCarWayBill.getEndBegin().split(",");
+            noCarWayBill.setEndBegin(res[0]);
+            noCarWayBill.setEndEnd(res[1]);
+        }else{
+            noCarWayBill.setEndBegin(null);
+        }
+    }
     /**
      * 分页查询运单信息
      *
@@ -63,6 +89,7 @@ public class NoCarController {
     @LoginRequired
     public RespR findBillWay(Page page, NoCarWayBill noCarWayBill) {
         try {
+            setTimeDue(noCarWayBill);
             RespR respR = new RespR(noCarBillWayService.findByPageAndWayBill(page, noCarWayBill));
             return respR;
         }catch (Exception e){
@@ -70,6 +97,36 @@ public class NoCarController {
             return new RespR(false,e.getMessage());
         }
     }
+
+    /**
+     * 重新获取发票并更新状态
+     *
+     * @return 用户集合
+     */
+    @PostMapping("/updateStatus")
+    @ApiOperation(value="重新获取发票并更新状态", notes="重新获取发票并更新状态")
+    @LoginRequired
+    public RespR updateStatus() {
+        try {
+            delGetInvoce(0);
+            delGetInvoce(1);
+            return new RespR("更新成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+    public void delGetInvoce(Integer historyFlag){
+        NoCarWayBill carWayBill = new NoCarWayBill();
+        carWayBill.setHisFlag(historyFlag);
+        carWayBill.setBillwayStatus(2);
+        List<NoCarWayBill> noCarWayBillsMdEnd = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
+        if(noCarWayBillsMdEnd!=null && noCarWayBillsMdEnd.size()>0){
+            noCarWayBillsMdEnd.stream().forEach(noCarWayBill -> {
+                noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
+            });
+        }
+    }
     /**
      * 分页查询异常运单信息
      *
@@ -81,6 +138,7 @@ public class NoCarController {
     @LoginRequired
     public RespR findBillWayException(Page page, NoCarWayBill noCarWayBill) {
         try {
+            setTimeDue(noCarWayBill);
             RespR respR = new RespR(noCarBillWayService.findByPageAndWayBillException(page, noCarWayBill));
             return respR;
         }catch (Exception e){
@@ -99,6 +157,11 @@ public class NoCarController {
     @LoginRequired
     public RespR findNocarInvoices(Page page, BillInvoice billInvoice) {
         try {
+            if(!StringUtils.isEmpty(billInvoice.getInvoiceMakeTime()) && !"null".equals(billInvoice.getInvoiceMakeTime())){
+                String [] res =billInvoice.getInvoiceMakeTime().split(",");
+                billInvoice.setInvoiceMakeStart(res[0]);
+                billInvoice.setInvoiceMakeEnd(res[1]);
+            }
             RespR respR = new RespR(nocarInvoiceService.findByPageAndInvoice(page, billInvoice));
             return respR;
         }catch (Exception e){

src/main/java/com/jkcredit/invoice/controller/service/SelfCarServiceController.java

@@ -1,5 +1,6 @@
 package com.jkcredit.invoice.controller.service;
 
+import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Api(tags = "自有车下游接口")
@@ -28,6 +30,28 @@ public class SelfCarServiceController {
     @ApiOperation(value="获取交易Id列表", notes="获取交易Id列表")
     //@LoginRequired
     public RespR getTradeList(@RequestBody TradeRequestVo tradeRequestVo){
+        if(tradeRequestVo.getTradeStatus() ==null){
+            tradeRequestVo.setTradeStatus(1);
+            RespR<List<CardTradeModel>> respRbefore = selfCarService.getTradeList(tradeRequestVo);
+            tradeRequestVo.setTradeStatus(2);
+            RespR<List<CardTradeModel>> respRUnder = selfCarService.getTradeList(tradeRequestVo);
+            tradeRequestVo.setTradeStatus(3);
+            RespR<List<CardTradeModel>> respRAfter = selfCarService.getTradeList(tradeRequestVo);
+            //合并展示
+            List<CardTradeModel> cardTradeModels = new ArrayList<>();
+            if(respRbefore.getCode() == 0){
+                cardTradeModels.addAll(respRbefore.getData());
+            }
+            if(respRUnder.getCode() == 0){
+                cardTradeModels.addAll(respRUnder.getData());
+            }
+            if(respRAfter.getCode() == 0){
+                cardTradeModels.addAll(respRAfter.getData());
+            }
+            return new RespR(cardTradeModels);
+        }
+        //合并展示
+
         return selfCarService.getTradeList(tradeRequestVo);
     }
 

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

@@ -28,6 +28,7 @@ public class SelfCarCalculateInfor {
      */
     private String calTime;
 
+
     public Long getId() {
         return id;
     }

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

@@ -3,7 +3,7 @@ package com.jkcredit.invoice.model.entity;
 import java.util.Date;
 
 public class CustomerRecharge {
-    private Integer id;
+    private Long id;
 
     private String customerName;
 
@@ -11,11 +11,11 @@ public class CustomerRecharge {
 
     private String rechargeTime;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

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

@@ -3,7 +3,7 @@ package com.jkcredit.invoice.model.entity.customer;
  * 客户备案信息
  */
 public class CustomerRec {
-    private Integer id;
+    private Long id;
     /**
      * 客户名称
      */
@@ -115,11 +115,16 @@ public class CustomerRec {
      */
     private Integer contractSuc =2;
 
-    public Integer getId() {
+    /**
+     * 协议编号 协议上传成功后返回
+     */
+    private String contrantNum;
+
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -306,4 +311,12 @@ public class CustomerRec {
     public void setContractSuc(Integer contractSuc) {
         this.contractSuc = contractSuc;
     }
+
+    public String getContrantNum() {
+        return contrantNum;
+    }
+
+    public void setContrantNum(String contrantNum) {
+        this.contrantNum = contrantNum;
+    }
 }

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

@@ -6,6 +6,20 @@ package com.jkcredit.invoice.model.entity.invoice;
 public class BillInvoice {
     private Long id;
     /**
+     * 公司编码
+     */
+    private String companyNum;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+    /**
      * 发票号码
      */
     private String invoiceNum;
@@ -17,6 +31,10 @@ public class BillInvoice {
      *开票时间
      */
     private String invoiceMakeTime;
+
+    private String invoiceMakeStart;
+
+    private String invoiceMakeEnd;
     /**
      *发票url
      */
@@ -330,4 +348,44 @@ public class BillInvoice {
     public void setId(Long id) {
         this.id = id;
     }
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getInvoiceMakeStart() {
+        return invoiceMakeStart;
+    }
+
+    public void setInvoiceMakeStart(String invoiceMakeStart) {
+        this.invoiceMakeStart = invoiceMakeStart;
+    }
+
+    public String getInvoiceMakeEnd() {
+        return invoiceMakeEnd;
+    }
+
+    public void setInvoiceMakeEnd(String invoiceMakeEnd) {
+        this.invoiceMakeEnd = invoiceMakeEnd;
+    }
 }

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

@@ -75,10 +75,15 @@ public class NoCarWayBill {
     /**
      * 接口结束时间
      */
-    private String InterfaceEndTime;
+    private String interfaceEndTime;
 
     /**
-     * 运单转态  -1-指令开始 0-指令结束   1-开票中 2-作废 3-开票完成
+     * 最后一次运单更新时间
+     */
+    private String updateTime;
+
+    /**
+     * 运单转态  1-指令开始 2-开票中  3-开票完成 4 超时作废
      */
     private int billwayStatus;
 
@@ -111,6 +116,14 @@ public class NoCarWayBill {
      * 单位电话
      */
     private String companyTel;
+    /***下边数据查询使用***/
+    private String startBegin;
+
+    private String startEnd;
+
+    private String endBegin;
+
+    private String endEnd;
 
     public Long getId() {
         return id;
@@ -225,11 +238,11 @@ public class NoCarWayBill {
     }
 
     public String getInterfaceEndTime() {
-        return InterfaceEndTime;
+        return interfaceEndTime;
     }
 
     public void setInterfaceEndTime(String interfaceEndTime) {
-        InterfaceEndTime = interfaceEndTime;
+        this.interfaceEndTime = interfaceEndTime;
     }
 
     public int getBillwayStatus() {
@@ -287,4 +300,44 @@ public class NoCarWayBill {
     public void setCompanyTel(String companyTel) {
         this.companyTel = companyTel;
     }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getStartBegin() {
+        return startBegin;
+    }
+
+    public void setStartBegin(String startBegin) {
+        this.startBegin = startBegin;
+    }
+
+    public String getStartEnd() {
+        return startEnd;
+    }
+
+    public void setStartEnd(String startEnd) {
+        this.startEnd = startEnd;
+    }
+
+    public String getEndBegin() {
+        return endBegin;
+    }
+
+    public void setEndBegin(String endBegin) {
+        this.endBegin = endBegin;
+    }
+
+    public String getEndEnd() {
+        return endEnd;
+    }
+
+    public void setEndEnd(String endEnd) {
+        this.endEnd = endEnd;
+    }
 }

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

@@ -20,6 +20,11 @@ public class SelfCarTrade {
     private String companyNum;
 
     /**
+     * 公司税号
+     */
+    private String companyReferencenum;
+
+    /**
      * etc卡号
      */
     private String cardId;
@@ -40,7 +45,7 @@ public class SelfCarTrade {
     private Long fee;
 
     /**
-     * 交易状态 0-未开票 1-开票中 2-成功开票 3-取票成功
+     * 交易状态1-代开票 2-开票中 3-已开票
      */
     private Integer status;
 
@@ -50,7 +55,7 @@ public class SelfCarTrade {
     private String applId;
 
     /**
-     * 开票时间
+     * 申请开票时间
      */
     private String aclTime;
 
@@ -141,4 +146,12 @@ public class SelfCarTrade {
     public void setAclTime(String aclTime) {
         this.aclTime = aclTime;
     }
+
+    public String getCompanyReferencenum() {
+        return companyReferencenum;
+    }
+
+    public void setCompanyReferencenum(String companyReferencenum) {
+        this.companyReferencenum = companyReferencenum;
+    }
 }

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

@@ -66,9 +66,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         if(customerRec.getRecStatus().intValue() == 2){
             return new RespR(false,"无法上传协议，未注册");
         }
-        if(customerRec.getContractSuc().intValue() == 1){
+        /*if(customerRec.getContractSuc().intValue() == 1){
             return new RespR(false,"协议已经上传");
-        }
+        }*/
         B2bContractAddRequest b2bContractAddRequest = new B2bContractAddRequest();
         b2bContractAddRequest.setCompanyNum(customerRec.getCompanyNum());
         b2bContractAddRequest.setServiceStartTime(DateUtil.dateToTime(customerRec.getServiceStartTime()));
@@ -81,6 +81,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
             return new RespR(false,responseRespR.getMsg());
         }else{
             customerRec.setContractSuc(1);
+            customerRec.setContrantNum(responseRespR.getData().getContrantNum());
             customerRecMapper.updateByPrimaryKeySelective(customerRec);
             return new RespR("协议上传成功");
         }

src/main/java/com/jkcredit/invoice/service/lowerService/SelfCarServiceL.java

@@ -1,5 +1,6 @@
 package com.jkcredit.invoice.service.lowerService;
 
+import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
@@ -19,14 +20,14 @@ public interface SelfCarServiceL {
      * @param tradeRequestVo
      * @return
      */
-    RespR<List<SelfCarTrade>> getTradeList(TradeRequestVo tradeRequestVo);
+    RespR<List<CardTradeModel>> getTradeList(TradeRequestVo tradeRequestVo);
 
     /**
      * 开票申请接口
      * @param invoiceApplVo
      * @return
      */
-    RespR<Boolean> applInvoice(InvoiceApplVo invoiceApplVo);
+    RespR<String> applInvoice(InvoiceApplVo invoiceApplVo);
 
     /**
      *按申请id取发票

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

@@ -154,11 +154,12 @@ public class NoCarServiceImpl implements NoCarService{
         WaybillStartRequest waybillStartRequest = buildWaybillStartRequest(noCarWayBill);
         RespR<WaybillStartResponse> responseRespR = noCarInterface.waybillStart(waybillStartRequest);
         if(responseRespR.getCode() == 1){
-            return new RespR(false,"指令开始失败");
+            return new RespR(false,responseRespR.getMsg());
         }else{
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setHisFlag(0);
-            noCarWayBill.setBillwayStatus(-1);
+            noCarWayBill.setBillwayStatus(1);
             noCarWaybillMapper.insert(noCarWayBill);
         }
         return new RespR("成功");
@@ -218,10 +219,10 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-            noCarWayBill.setBillwayStatus(-2);
+            noCarWayBill.setBillwayStatus(4);
             return new RespR(false,"运单已经超时，请拆分");
         }
-        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=-1 || noCarWayBill.getHisFlag() ==1 ){
+        if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==1 ){
             return new RespR(false,"当前运单状态无法结束");
         }
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
@@ -231,13 +232,14 @@ public class NoCarServiceImpl implements NoCarService{
         waybillEndRequest.setEndTime(DateUtil.dateFormate(noCarWayBill1.getPredictEndTime()));
         RespR<WaybillEndResponse> waybillEndResponseRespR = noCarInterface.waybillEnd(waybillEndRequest);
         if(waybillEndResponseRespR.getCode() == 1){
-            return new RespR(false,"运单结束指令失败");
+            return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
-            noCarWayBill.setBillwayStatus(-2);
+            noCarWayBill.setBillwayStatus(2);
             return new RespR(false,"运单已经超时，请拆分");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
         noCarWayBill1.setBillwayStatus(0);
+        noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
         noCarWaybillMapper.updateByBillNum(noCarWayBill1);
         return new RespR();
     }
@@ -255,11 +257,12 @@ public class NoCarServiceImpl implements NoCarService{
         RespR<WaybillHistoryStartResponse> responseRespR = noCarInterface.waybillHistoryStart(waybillHistoryStartRequest);
 
         if(responseRespR.getCode() == 1){
-            return new RespR(false,"指令开始失败");
+            return new RespR(false,responseRespR.getMsg());
         }else{
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
+            noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setHisFlag(1);
-            noCarWayBill.setBillwayStatus(-1);
+            noCarWayBill.setBillwayStatus(1);
             noCarWaybillMapper.insert(noCarWayBill);
         }
         return null;
@@ -271,7 +274,7 @@ public class NoCarServiceImpl implements NoCarService{
         waybillStartRequest.setNum(noCarWayBill.getBillNum());
         waybillStartRequest.setPlateNum(noCarWayBill.getPlateNum());
         waybillStartRequest.setPlateColor(Integer.parseInt(noCarWayBill.getPlateColor()));
-        waybillStartRequest.setStartTime(DateUtil.dateToTTime(noCarWayBill.getStartTime()));
+        waybillStartRequest.setStartTime(DateUtil.tTimeToDate(noCarWayBill.getStartTime()));
         waybillStartRequest.setSourceAddr(noCarWayBill.getSourceAddr());
         waybillStartRequest.setPredictEndTime(noCarWayBill.getPredictEndTime());
         waybillStartRequest.setFee(noCarWayBill.getFee());
@@ -291,7 +294,7 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBill1.setPredictEndTime(noCarWayBill.getPredictEndTime());
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-            noCarWayBill.setBillwayStatus(-2);
+            noCarWayBill.setBillwayStatus(4);
             return new RespR(false,"运单已经超时，请拆分");
         }
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=-1 || noCarWayBill.getHisFlag() ==0 ){
@@ -304,13 +307,14 @@ public class NoCarServiceImpl implements NoCarService{
         waybillEndRequest.setEndTime(noCarWayBill1.getPredictEndTime());
         RespR<WaybillEndResponse> waybillEndResponseRespR = noCarInterface.waybillEnd(waybillEndRequest);
         if(waybillEndResponseRespR.getCode() == 1){
-            return new RespR(false,"运单结束指令失败");
+            return new RespR(false,waybillEndResponseRespR.getMsg());
         }else if("4".equals(waybillEndResponseRespR.getData().getInfo())){
-            noCarWayBill.setBillwayStatus(-2);
+            noCarWayBill.setBillwayStatus(4);
             return new RespR(false,"运单已经超时，请拆分");
         }
         noCarWayBill1.setInterfaceEndTime(DateUtil.getCurrentDateStr());
-        noCarWayBill1.setBillwayStatus(0);
+        noCarWayBill1.setBillwayStatus(2);
+        noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
         noCarWaybillMapper.updateByBillNum(noCarWayBill1);
         return new RespR();
     }
@@ -324,7 +328,7 @@ public class NoCarServiceImpl implements NoCarService{
             return  respR;
         }
         int status = noCarWayBillDb.getBillwayStatus();
-        if(status == -1 || status == -2 || status == 2){
+        if(status == 1 || status == 4){
             return new RespR(false,"运单状态无法开票");
         }
         if(!isCurr){
@@ -349,12 +353,8 @@ public class NoCarServiceImpl implements NoCarService{
         }else{
             int tempStatus = responseRespR.getData().getWaybillStatus().intValue();
             //更改票状态
-            noCarWayBillDb.setBillwayStatus(1);
-            if(tempStatus ==3){
-                noCarWayBillDb.setBillwayStatus(3);
-            }else if(tempStatus == 4){
-                noCarWayBillDb.setBillwayStatus(2);
-            }
+            noCarWayBillDb.setBillwayStatus(tempStatus);
+            noCarWayBillDb.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWaybillMapper.updateByBillNum(noCarWayBillDb);
             if(tempStatus == 2 || tempStatus==3){
                 List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
@@ -365,6 +365,9 @@ public class NoCarServiceImpl implements NoCarService{
                 List<InvoiceProcessingListModel> invoiceProcessingListModels = responseRespR.getData().getResult();
                 invoiceProcessingListModels.stream().forEach(invoiceProcessingListModel -> {
                     BillInvoice billInvoice = buildFromInvoiceProcessingListModel(invoiceProcessingListModel);
+                    billInvoice.setCompanyName(noCarWayBillDb.getCompanyName());
+                    billInvoice.setCompanyNum(noCarWayBillDb.getCompanyNum());
+                    billInvoice.setCustomerName(noCarWayBillDb.getCustomerName());
                     billInvoiceMapper.insert(billInvoice);
                     //扣费明细入账
                     NoCarCalculateInfor calculateInfor = new NoCarCalculateInfor();
@@ -373,7 +376,7 @@ public class NoCarServiceImpl implements NoCarService{
                     calculateInfor.setCtype(1);
                     calculateInfor.setCustomId(noCarWayBill.getCustomerName());
                     /**
-                     * 这个设置为动态的
+                     * 这个设置为动态的 TODO
                      */
                     calculateInfor.setFee(1500L);
                     calculateInfor.setTradeId(billInvoice.getTransactionId());
@@ -384,8 +387,8 @@ public class NoCarServiceImpl implements NoCarService{
 
                 });
                 List<BillInvoice> billInvoices1 = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
-                if(billInvoices!=null && billInvoices.size()>0){
-                    return new RespR(billInvoices);
+                if(billInvoices1!=null && billInvoices1.size()>0){
+                    return new RespR(billInvoices1);
                 }
             }
 
@@ -396,32 +399,25 @@ public class NoCarServiceImpl implements NoCarService{
     public BillInvoice buildFromInvoiceProcessingListModel(InvoiceProcessingListModel invoiceProcessingListModel){
         BillInvoice billInvoice = new BillInvoice();
         BeanUtils.copyProperties(invoiceProcessingListModel,billInvoice);
+        //设置时间
+        billInvoice.setExTime(DateUtil.tTimeToDate(billInvoice.getExTime()));
+        billInvoice.setInvoiceMakeTime(DateUtil.tTimeToDate(billInvoice.getInvoiceMakeTime()));
+        billInvoice.setWaybillEndTime(DateUtil.tTimeToDate(billInvoice.getWaybillEndTime()));
+        billInvoice.setTradeMatchTime(DateUtil.getCurrentDateStr());
+        billInvoice.setWaybillStartTime(DateUtil.tTimeToDate(billInvoice.getWaybillStartTime()));
         return billInvoice;
     }
 
     @Override
     public RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo) {
-
-        Customer customer = customerMapper.selectByCustomerName(hcInvoiceQueryVo.getCustomerName());
-        if(customer==null || customer.getAccstatus() ==1){
-            return new RespR(false,"客户不存在或者已经停用");
-        }
-        CustomerRec customerRecParm = new CustomerRec();
-        customerRecParm.setCompanyName(hcInvoiceQueryVo.getCompanyName());
-        customerRecParm.setCustomerName(hcInvoiceQueryVo.getCustomerName());
-        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecParm);
-        if(customerRec == null || customerRec.getRecStatus()!=1){
-            return new RespR(false,"客户未备案或备案失败");
-        }
         WaybillInvoiceRedQueryRequest redQueryRequest = new WaybillInvoiceRedQueryRequest();
-        redQueryRequest.setCompanyNum(customerRec.getCompanyNum());
+        redQueryRequest.setCompanyNum(hcInvoiceQueryVo.getCompanyNum());
         redQueryRequest.setMonth(hcInvoiceQueryVo.getMonth());
         RespR<WaybillInvoiceRedQueryResponse> respR = noCarInterface.waybillInvoiceRedQuery(redQueryRequest);
         if(respR.getCode() == 1){
             return new RespR(false,respR.getMsg());
         }
         return new RespR(respR.getData().getResult());
-
     }
 
     @Override
@@ -432,7 +428,7 @@ public class NoCarServiceImpl implements NoCarService{
         }
         CustomerRec customerRecParm = new CustomerRec();
         customerRecParm.setCompanyName(monthAccountQueryVo.getComPanyName());
-        customerRecParm.setCustomerName(monthAccountQueryVo.getComPanyName());
+        customerRecParm.setCustomerName(monthAccountQueryVo.getCustomeName());
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecParm);
         if(customerRec == null || customerRec.getRecStatus()==1){
             return new RespR(false,"客户未备案或备案失败");

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

@@ -53,7 +53,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     SelfCarCalculateInforMapper calculateInforMapper;
     @Override
     @Transactional
-    public RespR<List<SelfCarTrade>> getTradeList(TradeRequestVo tradeRequestVo) {
+    public RespR<List<CardTradeModel>> getTradeList(TradeRequestVo tradeRequestVo) {
         Customer customer = customerMapper.selectByCustomerName(tradeRequestVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
@@ -94,11 +94,12 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     if(selfCarTrade == null){
                         selfCarTrade = new SelfCarTrade();
                         selfCarTrade.setCustomId(customerRec.getCustomerName());
+                        selfCarTrade.setCompanyName(customerRec.getCompanyName());
+                        selfCarTrade.setCompanyReferencenum(customerRec.getCompanyReferencenum());
                         selfCarTrade.setCompanyNum(customerRec.getCompanyNum());
                         selfCarTrade.setCardId(cardTradeModel.getCardId());
                         selfCarTrade.setTradeId(cardTradeModel.getTradeId());
-                        selfCarTrade.setAclTime(DateUtil.dateToTTime(cardTradeModel.getExTime()));
-                        selfCarTrade.setExTime(DateUtil.dateToTTime(cardTradeModel.getExTime()));
+                        selfCarTrade.setExTime(DateUtil.tTimeToDate(cardTradeModel.getExTime()));
                         selfCarTrade.setFee(cardTradeModel.getFee());
                         selfCarTrade.setStatus(tradeRequestVo.getTradeStatus());
                         sellCarTradeMapper.insert(selfCarTrade);
@@ -126,7 +127,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
 
     @Override
-    public RespR<Boolean> applInvoice(InvoiceApplVo invoiceApplVo) {
+    public RespR<String> applInvoice(InvoiceApplVo invoiceApplVo) {
         Customer customer = customerMapper.selectByCustomerName(invoiceApplVo.getCustomerName());
         if(customer == null || customer.getAccstatus().intValue() == 1){
             return new RespR(false,"客户已经停用");
@@ -148,7 +149,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         List<B2BInvoiceApplyModel> b2BInvoiceApplyModels = new ArrayList<>();
         List<String> tradeIds = invoiceApplVo.getTradeIds();
         if(tradeIds == null || tradeIds.size()<=0){
-            return new RespR<>(false,"没有交易Id");
+            return new RespR(false,"没有交易Id");
         }
         for(String tradeId:tradeIds){
             B2BInvoiceApplyModel b2BInvoiceApplyModel = new B2BInvoiceApplyModel();
@@ -158,7 +159,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         b2BInvoiceApplyRequest.setTradeIdModel(b2BInvoiceApplyModels);
         RespR<B2BInvoiceApplyResponse> respR = selfCarInterface.b2BInvoiceApply(b2BInvoiceApplyRequest);
         if(respR.getCode()==1){
-            return new RespR<>(false,"申请失败");
+            return new RespR(false,"申请失败");
         }else{
             B2BInvoiceApplyResponse b2BInvoiceApplyResponse = respR.getData();
             SelfCarAppl selfCarAppl = new SelfCarAppl();
@@ -171,8 +172,19 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             selfCarAppl.setInvoiceCount(b2BInvoiceApplyResponse.getInvoiceCount());
             selfCarAppl.setInvoiceTaxAmount(b2BInvoiceApplyResponse.getInvoiceTaxAmount());
             selfCarApplMapper.insert(selfCarAppl);
+
+            //更新交易id申请开票时间，并将转态改为开票中
+            tradeIds.forEach(tradeId->{
+                SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(tradeId);
+                selfCarTrade.setStatus(2);
+                selfCarTrade.setAclTime(DateUtil.getCurrentDateStr());
+                selfCarTrade.setApplId(b2BInvoiceApplyResponse.getApplyId());
+                sellCarTradeMapper.updateByTradeId(selfCarTrade);
+            });
+            //SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(cardTradeModel.getTradeId());
+            return new RespR<>(b2BInvoiceApplyResponse.getApplyId());
         }
-        return new RespR<>(true);
+
     }
 
     @Override
@@ -197,8 +209,8 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             for(B2BInvoiceQueryByApplyModel b2BInvoiceQueryByApplyModel:b2BInvoiceQueryByApplyModels){
                 SelfCarInvoice selfCarInvoice = new SelfCarInvoice();
                 BeanUtils.copyProperties(b2BInvoiceQueryByApplyModel,selfCarInvoice);
-                selfCarInvoice.setInvoiceMakeTime(DateUtil.dateToTTime(selfCarInvoice.getInvoiceMakeTime()));
-                selfCarInvoice.setExTime(DateUtil.dateToTTime(selfCarInvoice.getExTime()));
+                selfCarInvoice.setInvoiceMakeTime(DateUtil.tTimeToDate(selfCarInvoice.getInvoiceMakeTime()));
+                selfCarInvoice.setExTime(DateUtil.tTimeToDate(selfCarInvoice.getExTime()));
                 if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
                     selfCarInvoiceMapper.insert(selfCarInvoice);
                 }
@@ -228,8 +240,8 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         B2BInvoiceQueryRequest b2BInvoiceQueryRequest = new B2BInvoiceQueryRequest();
         b2BInvoiceQueryRequest.setCompanyNum(customerRec.getCompanyNum());
         b2BInvoiceQueryRequest.setCardId(selfCarDueQueryVo.getCardId());
-        b2BInvoiceQueryRequest.setEndInvoiceMakeTime(selfCarDueQueryVo.getStartTime());
-        b2BInvoiceQueryRequest.setEndInvoiceMakeTime(selfCarDueQueryVo.getEndTime());
+        b2BInvoiceQueryRequest.setStartInvoiceMakeTime(DateUtil.dateFormate(selfCarDueQueryVo.getStartTime()));
+        b2BInvoiceQueryRequest.setEndInvoiceMakeTime(DateUtil.dateFormate(selfCarDueQueryVo.getEndTime()));
 
         RespR<B2BInvoiceQueryResponse> responseRespR = selfCarInterface.b2BInvoiceQuery(b2BInvoiceQueryRequest);
         if(responseRespR.getCode() == 1){
@@ -426,16 +438,21 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
     }
     @Override
     public RespR customerCarUnRec(List<CustomerCarRec> customerCarRecs) {
-        if(customerCarRecs!=null || customerCarRecs.size()<=0){
+        if(customerCarRecs==null || customerCarRecs.size()<=0){
             return new RespR(false,"无解绑信息");
         }
+
         StringBuffer res = new StringBuffer();
         try {
             for(CustomerCarRec customerCarRec:customerCarRecs){
-                if("0".equals(customerCarRec.getBusinessType())){
+                CustomerRec customerRecP = new CustomerRec();
+                customerRecP.setCustomerName(customerCarRec.getCustomerName());
+                customerRecP.setCompanyName(customerCarRec.getCompanyName());
+                CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
+                if("0".equals(customerRec.getBussinessType())){
                     CardUnbindToBRequest cardUnbindToBRequest = new CardUnbindToBRequest();
                     cardUnbindToBRequest.setCardId(customerCarRec.getEtcNum());
-                    cardUnbindToBRequest.setCompanyNum(customerCarRec.getCarNum());
+                    cardUnbindToBRequest.setCompanyNum(customerRec.getCompanyNum());
                     RespR<CardUnbindToBResponse> respR = selfCarInterface.cardUnbindToB(cardUnbindToBRequest);
                     if(respR.getCode() == 1){
                         res.append(customerCarRec.getEtcNum()+","+customerCarRec.getCarNum()+"解绑失败;"+"#");

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

@@ -14,6 +14,8 @@ public class HCInvoiceQueryVo {
      */
     private String companyName;
 
+    private String companyNum;
+
     /**
      * 查询月份 2017-02
      */
@@ -42,4 +44,12 @@ public class HCInvoiceQueryVo {
     public void setMonth(String month) {
         this.month = month;
     }
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
 }

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

@@ -5,9 +5,11 @@ import cn.com.taiji.sdk.comm.ETCCommHelper;
 import cn.com.taiji.sdk.model.comm.protocol.eoms.company.*;
 import com.jkcredit.invoice.service.upService.CommInterFace;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+@Slf4j
 @Service("commInterFace")
 public class CommInterFaceImpl implements CommInterFace{
     @Override
@@ -16,6 +18,7 @@ public class CommInterFaceImpl implements CommInterFace{
         try {
             //(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) {
             e.printStackTrace();
@@ -32,6 +35,7 @@ public class CommInterFaceImpl implements CommInterFace{
         try {
             //(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) {
             e.printStackTrace();
@@ -48,6 +52,8 @@ public class CommInterFaceImpl implements CommInterFace{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractAddResponse response=ETCCommHelper.upload(fileName, contractAddRequest, B2bContractAddResponse.class);
+            log.info("CommInterFaceImpl.b2bContractAdd上游接口返回：{},请求参数：{}", response.toString(), contractAddRequest.toString());
+            log.info("conName"+response.getContrantNum());
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -64,6 +70,8 @@ public class CommInterFaceImpl implements CommInterFace{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2bContractQueryResponse response=ETCCommHelper.upload(fileName, b2bContractQueryRequest, B2bContractQueryResponse.class);
+            log.info("CommInterFaceImpl.b2bContractQuery上游接口返回：{},请求参数：{}", response.toString(), b2bContractQueryRequest.toString());
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -9,9 +9,12 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
 import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+
+@Slf4j
 @Service("noCarInterface")
 public class NoCarInterfaceImpl implements NoCarInterface {
 
@@ -21,6 +24,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             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();
@@ -37,6 +42,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(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) {
             e.printStackTrace();
@@ -53,6 +60,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillStartResponse response=ETCCommHelper.upload(fileName, waybillStartRequest, WaybillStartResponse.class);
+            log.info("NoCarInterfaceImpl.waybillStart上游接口返回：{},请求参数：{}", response.toString(), waybillStartRequest.toString());
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -69,6 +78,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillEndResponse response=ETCCommHelper.upload(fileName, waybillEndRequest, WaybillEndResponse.class);
+            log.info("NoCarInterfaceImpl.waybillEnd上游接口返回：{},请求参数：{}", response.toString(), waybillEndRequest.toString());
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -85,6 +96,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(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) {
             e.printStackTrace();
@@ -101,6 +114,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(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) {
             e.printStackTrace();
@@ -117,6 +132,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(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) {
             e.printStackTrace();
@@ -133,6 +150,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             WaybillInvoiceRedQueryResponse response=ETCCommHelper.upload(fileName, waybillInvoiceRedQueryRequest, WaybillInvoiceRedQueryResponse.class);
+            log.info("NoCarInterfaceImpl.waybillInvoiceRedQuery上游接口返回：{},请求参数：{}", response.toString(), waybillInvoiceRedQueryRequest.toString());
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -149,6 +168,8 @@ public class NoCarInterfaceImpl implements NoCarInterface {
         try {
             //(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) {
             e.printStackTrace();

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

@@ -9,9 +9,12 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeResponse;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
 import com.jkcredit.invoice.util.RespR;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+
+@Slf4j
 @Service("selfCarInterface")
 public class SelfCarInterfaceImpl  implements SelfCarInterface{
     @Override
@@ -20,6 +23,8 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardBindQueryListToBResponse response=ETCCommHelper.upload(fileName, cardBindQueryListToBRequest, CardBindQueryListToBResponse.class);
+            log.info("SelfCarInterfaceImpl.cardBindQueryListToB上游接口返回：{},请求参数：{}", response.toString(), cardBindQueryListToBRequest.toString());
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -36,6 +41,8 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(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) {
             e.printStackTrace();
@@ -52,6 +59,9 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardBindingToBResponse response=ETCCommHelper.upload(fileName, cardBindingToBRequest, CardBindingToBResponse.class);
+            log.info("SelfCarInterfaceImpl.cardBindingToB上游接口返回：{},请求参数：{}", response.toString(), cardBindingToBRequest.toString());
+
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -68,6 +78,9 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardValidCodeToBResponse response=ETCCommHelper.upload(fileName, cardValidCodeToBRequest, CardValidCodeToBResponse.class);
+            log.info("SelfCarInterfaceImpl.cardValidCodeToB上游接口返回：{},请求参数：{}", response.toString(), cardValidCodeToBRequest.toString());
+
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -84,6 +97,9 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardUnbindToBResponse response=ETCCommHelper.upload(fileName, cardUnbindToBRequest, CardUnbindToBResponse.class);
+            log.info("SelfCarInterfaceImpl.cardUnbindToB上游接口返回：{},请求参数：{}", response.toString(), cardUnbindToBRequest.toString());
+
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -100,6 +116,9 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             CardTradeResponse response=ETCCommHelper.upload(fileName, cardTradeRequest, CardTradeResponse.class);
+            log.info("SelfCarInterfaceImpl.cardTrade上游接口返回：{},请求参数：{}", response.toString(), cardTradeRequest.toString());
+
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -116,6 +135,9 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2BInvoiceApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceApplyRequest, B2BInvoiceApplyResponse.class);
+            log.info("SelfCarInterfaceImpl.b2BInvoiceApply上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceApplyRequest.toString());
+
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -132,6 +154,9 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2BInvoiceQueryResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryRequest, B2BInvoiceQueryResponse.class);
+            log.info("SelfCarInterfaceImpl.b2BInvoiceQuery上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceQueryRequest.toString());
+
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -148,6 +173,8 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
             B2BInvoiceQueryByApplyResponse response=ETCCommHelper.upload(fileName, b2BInvoiceQueryByApplyRequest, B2BInvoiceQueryByApplyResponse.class);
+            log.info("SelfCarInterfaceImpl.b2bContractQuery上游接口返回：{},请求参数：{}", response.toString(), b2BInvoiceQueryByApplyRequest.toString());
+
             return new RespR<>(response);
         } catch (IOException e) {
             e.printStackTrace();
@@ -164,6 +191,8 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
         try {
             //(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) {
             e.printStackTrace();

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -36,7 +36,7 @@ public class ScheduledBillTask {
     /**
      * 实时运单开票（每天23点开始）
      */
-    @Scheduled(cron = "0 0 23 * * ?", zone = "Asia/Shanghai")
+    @Scheduled(cron = "0 0 0/1 * * ?", zone = "Asia/Shanghai")
     public void updateNocarBillInfo() {
         try {
             delGetInvoce(0);
@@ -47,24 +47,13 @@ public class ScheduledBillTask {
     public void delGetInvoce(Integer historyFlag){
         NoCarWayBill carWayBill = new NoCarWayBill();
         carWayBill.setHisFlag(historyFlag);
-        carWayBill.setBillwayStatus(0);
+        carWayBill.setBillwayStatus(2);
         List<NoCarWayBill> noCarWayBillsMdEnd = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
-        carWayBill.setBillwayStatus(1);
-        List<NoCarWayBill> noCarWayBillsDue = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
-
-        //指令结束的
         if(noCarWayBillsMdEnd!=null && noCarWayBillsMdEnd.size()>0){
             noCarWayBillsMdEnd.stream().forEach(noCarWayBill -> {
                 noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
             });
         }
-
-        //开票中的
-        if(noCarWayBillsDue!=null && noCarWayBillsDue.size()>0){
-            noCarWayBillsDue.stream().forEach(noCarWayBill -> {
-                noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
-            });
-        }
     }
     /**
      * 历史运单开票（每天整点点开始） todo 改成动态设置

src/main/java/com/jkcredit/invoice/util/DateUtil.java

@@ -125,7 +125,7 @@ public class DateUtil {
         return false;
     }
 
-    public static String dateToTTime(String time) {
+    public static String tTimeToDate(String time) {
         //转换前格式
         DateTimeFormatter format = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss");
         //转换后格式

src/main/java/com/jkcredit/invoice/util/WordUtil.java

@@ -0,0 +1,56 @@
+package com.jkcredit.invoice.util;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+
+import javax.servlet.http.HttpServletResponse;
+
+public class WordUtil {
+    public static void main(String [] args){
+       /* try {
+            testExportSimpleWord();
+        }catch (Exception e){
+
+        }*/
+
+    }
+    public static void ExportSimpleWord(Map<String,String> dataMap, String path, OutputStream outputStream) throws Exception {
+// 要填充的数据, 注意map的key要和word中${xxx}的xxx一致
+        /*Map<String, String> dataMap = new HashMap();
+        dataMap.put("a", "葛慧");
+        dataMap.put("b", "胡扬浩");
+        dataMap.put("c", "1234567890");
+        dataMap.put("d", "物资学院3号院");
+        dataMap.put("e", "17600977243");
+        dataMap.put("f", "工商银行物资学院支行");
+        dataMap.put("g", "2123123123123123");
+        dataMap.put("h", "08");
+        dataMap.put("i", "08");*/
+// Configuration用于读取ftl文件
+        Configuration configuration = new Configuration();
+        configuration.setDefaultEncoding("utf-8");
+
+        /*
+         * 以下是两种指定ftl文件所在目录路径的方式, 注意这两种方式都是 指定ftl文件所在目录的路径,而不是ftl文件的路径
+         */
+// 指定路径的第一种方式(根据某个类的相对路径指定)
+       configuration.setClassForTemplateLoading(WordUtil.class,path);
+
+// 指定路径的第二种方式,我的路径是C:/a.ftl
+        //configuration.setDirectoryForTemplateLoading(new File("D:\\workspace\\manage_invoice\\src\\main\\resources\\static\\templates\\excel\\"));
+
+// 输出文档路径及名称
+        File outFile = new File("e:/test.doc");
+
+// 以utf-8的编码读取ftl文件
+        Template t = configuration.getTemplate("word.ftl", "utf-8");
+        Writer out = new BufferedWriter(new OutputStreamWriter(
+                outputStream, "utf-8"), 10240);
+        t.process(dataMap, out);
+        out.close();
+    }
+}

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

@@ -25,11 +25,20 @@
     <include refid="Base_Column_List" />
     from  t_customer_carRec
     <where>
-      <if test="query.customerName != null and query.customerName != ''">
-        and customer_name LIKE CONCAT('%',#{query.customerName},'%')
+      <if test="query.carNum != null and query.carNum != ''">
+        and car_num LIKE CONCAT('%',#{query.carNum},'%')
       </if>
       <if test="query.companyName != null and query.companyName != ''">
-        and company_name = #{query.companyName}
+        and company_name LIKE CONCAT('%',#{query.companyName},'%')
+      </if>
+      <if test="query.companyNum != null and query.companyNum != ''">
+        and companyNum = #{query.companyNum}
+      </if>
+      <if test="query.etcNum != null and query.etcNum != ''">
+        and etc_num = #{query.etcNum}
+      </if>
+      <if test="query.recStatus != null and query.recStatus != ''">
+        and rec_status = (#{query.recStatus}-1)
       </if>
       <if test="query.businessType != null and query.businessType != ''">
         and bussiness_type = #{query.businessType}

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

@@ -26,12 +26,13 @@
     <result column="contractFileName" property="contractFileName" jdbcType="VARCHAR" />
     <result column="contractSuc" property="contractSuc" jdbcType="INTEGER" />
     <result column="base64Str" property="base64Str" jdbcType="VARCHAR" />
+    <result column="contrantNum" property="contrantNum" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, customerName,company_leader, company_leader_Phone, company_name, company_referenceNum, company_openbank,
     company_openbank_acc, company_adress, company_phone, createTime, company_belong_name, 
     rec_status, inter_type,bussiness_type,company_type,operating_rangeType,company_num,service_startTime
-    ,service_endTime,service_type,contractFileName,contractSuc
+    ,service_endTime,service_type,contractFileName,contractSuc,contrantNum
   </sql>
 
   <select id="selectAllByPage" resultMap="BaseResultMap">
@@ -74,14 +75,14 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
-    insert into t_customer_rec (id, customerName,company_leader, company_leader_Phone,
+    insert into t_customer_rec (customerName,company_leader, company_leader_Phone,
       company_name, company_referenceNum, company_openbank, 
       company_openbank_acc, company_adress, company_phone, 
       createTime, company_belong_name, rec_status, 
       inter_type,bussiness_type,company_type,operating_rangeType,company_num,
       service_startTime,service_endTime,service_type,contractFileName,base64Str,contractSuc
       )
-    values (#{id,jdbcType=INTEGER}, #{customerName,jdbcType=VARCHAR}, #{companyLeader,jdbcType=VARCHAR}, #{companyLeaderPhone,jdbcType=VARCHAR},
+    values (#{customerName,jdbcType=VARCHAR}, #{companyLeader,jdbcType=VARCHAR}, #{companyLeaderPhone,jdbcType=VARCHAR},
       #{companyName,jdbcType=VARCHAR}, #{companyReferencenum,jdbcType=VARCHAR}, #{companyOpenbank,jdbcType=VARCHAR}, 
       #{companyOpenbankAcc,jdbcType=VARCHAR}, #{companyAdress,jdbcType=VARCHAR}, #{companyPhone,jdbcType=VARCHAR}, 
       #{createtime,jdbcType=TIMESTAMP}, #{companyBelongName,jdbcType=VARCHAR}, #{recStatus,jdbcType=INTEGER}, 
@@ -243,7 +244,9 @@
       <if test="contractSuc != null" >
         contractSuc = #{contractSuc,jdbcType=INTEGER},
       </if>
-
+      <if test="contrantNum != null" >
+        contrantNum = #{contrantNum,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -270,7 +273,8 @@
       service_type = #{serviceType,jdbcType=INTEGER},
       contractFileName = #{contractFileName,jdbcType=VARCHAR},
       base64Str = #{base64Str,jdbcType=VARCHAR},
-      contractSuc = #{contractSuc,jdbcType=INTEGER}
+      contractSuc = #{contractSuc,jdbcType=INTEGER},
+      contrantNum = #{contrantNum,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -26,9 +26,9 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.CustomerRecharge" >
-    insert into t_customer_recharge (id, customer_name, recharge_mony, 
+    insert into t_customer_recharge ( customer_name, recharge_mony,
       recharge_time)
-    values (#{id,jdbcType=INTEGER}, #{customerName,jdbcType=VARCHAR}, #{rechargeMony,jdbcType=DOUBLE}, 
+    values ( #{customerName,jdbcType=VARCHAR}, #{rechargeMony,jdbcType=DOUBLE},
       #{rechargeTime,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jkcredit.invoice.model.entity.CustomerRecharge" >

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

@@ -4,6 +4,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.invoice.BillInvoice">
         <id column="id" property="id"/>
+        <result column="companyNum" property="companyNum"/>
+        <result column="customerName" property="customerName"/>
+        <result column="companyName" property="companyName"/>
         <result column="waybillNum" property="waybillNum"/>
         <result column="invoiceNum" property="invoiceNum"/>
         <result column="invoiceCode" property="invoiceCode"/>
@@ -35,6 +38,9 @@
 
     <sql id="baseSql">
         id,
+        companyNum,
+        customerName,
+        companyName,
         waybillNum,
         invoiceNum,
         invoiceCode,
@@ -66,9 +72,35 @@
         select
         <include refid="baseSql" />
         from t_billInvoice
+        <where>
+            <if test="billInvoice.companyName != null and billInvoice.companyName != ''">
+                and companyName LIKE CONCAT('%',#{billInvoice.companyName},'%')
+            </if>
+            <if test="billInvoice.waybillNum != null and billInvoice.waybillNum != ''">
+                and waybillNum = #{billInvoice.waybillNum}
+            </if>
+            <if test="billInvoice.buyerTaxpayerCode != null and billInvoice.buyerTaxpayerCode != ''">
+                and buyerTaxpayerCode = #{billInvoice.buyerTaxpayerCode}
+            </if>
+            <if test="billInvoice.plateNum != null and billInvoice.plateNum != ''">
+                and plateNum = #{billInvoice.plateNum}
+            </if>
+            <if test="billInvoice.invoiceCode != null and billInvoice.invoiceCode != ''">
+                and invoiceCode = #{billInvoice.invoiceCode}
+            </if>
+            <if test="billInvoice.invoiceNum != null and billInvoice.invoiceNum != ''">
+                and invoiceNum = #{billInvoice.invoiceNum}
+            </if>
+            <if test="billInvoice.invoiceMakeStart != null and billInvoice.invoiceMakeStart != ''">
+                and invoiceMakeTime BETWEEN #{billInvoice.invoiceMakeStart} and #{billInvoice.invoiceMakeEnd}
+            </if>
+        </where>
     </select>
     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.invoice.BillInvoice" >
         insert into t_billInvoice (
+            companyNum,
+           customerName,
+            companyName,
             waybillNum,
             invoiceNum,
             invoiceCode,
@@ -96,7 +128,7 @@
             buyerName,
             buyerTaxpayerCode
         )
-        values ( #{waybillNum,jdbcType=VARCHAR}, #{invoiceNum,jdbcType=VARCHAR},
+        values ( #{companyNum,jdbcType=VARCHAR},#{customerName,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{waybillNum,jdbcType=VARCHAR}, #{invoiceNum,jdbcType=VARCHAR},
                 #{invoiceCode,jdbcType=VARCHAR}, #{invoiceMakeTime,jdbcType=VARCHAR}, #{invoiceUrl,jdbcType=VARCHAR},
                 #{invoiceHtmlUrl,jdbcType=VARCHAR}, #{enStation,jdbcType=VARCHAR}, #{exStation,jdbcType=VARCHAR},
                 #{exTime,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER}, #{totalTaxAmount,jdbcType=INTEGER},
@@ -108,7 +140,12 @@
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.invoice.BillInvoice" >
         update t_billInvoice
-        set waybillNum	    = #{waybillNum,jdbcType=VARCHAR},
+        set
+
+        companyNum      = #{companyNum,jdbcType=VARCHAR},
+        customerName    = #{customerName,jdbcType=VARCHAR},
+        companyName     = #{companyName,jdbcType=VARCHAR},
+        waybillNum	    = #{waybillNum,jdbcType=VARCHAR},
         invoiceNum	    = #{invoiceNum,jdbcType=VARCHAR},
         invoiceCode     = #{invoiceCode,jdbcType=VARCHAR},
         invoiceMakeTime = #{invoiceMakeTime,jdbcType=VARCHAR},
@@ -139,7 +176,11 @@
 
     <update id="updateByInvoiceNum" parameterType="com.jkcredit.invoice.model.entity.invoice.BillInvoice" >
         update t_billInvoice
-        set waybillNum	    = #{waybillNum,jdbcType=VARCHAR},
+        set companyNum      = #{companyNum,jdbcType=VARCHAR},
+             customerName    = #{customerName,jdbcType=VARCHAR},
+             companyName     = #{companyName,jdbcType=VARCHAR},
+
+            waybillNum	    = #{waybillNum,jdbcType=VARCHAR},
             invoiceNum	    = #{invoiceNum,jdbcType=VARCHAR},
             invoiceCode     = #{invoiceCode,jdbcType=VARCHAR},
             invoiceMakeTime = #{invoiceMakeTime,jdbcType=VARCHAR},

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

@@ -17,11 +17,12 @@
         <result column="titleType" property="titleType"/>
         <result column="taxplayerCode" property="taxplayerCode"/>
         <result column="intfaceStartTime" property="intfaceStartTime"/>
-        <result column="InterfaceEndTime" property="InterfaceEndTime"/>
+        <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"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -39,24 +40,33 @@
         titleType,
         taxplayerCode,
         intfaceStartTime,
-        InterfaceEndTime,
+        interfaceEndTime,
         billwayStatus,
         hisFlag,
         companyAdress,
         companyBank,
         companyBankAcc,
-        companyTel,companyNum
+        companyTel,companyNum,updateTime
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
         from t_waybill_no
         <where>
-            <if test="noCarWayBill.customerName != null and noCarWayBill.customerName != ''">
-                and customerName LIKE CONCAT('%',#{noCarWayBill.customerName},'%')
+            <if test="noCarWayBill.companyName != null and noCarWayBill.companyName != ''">
+                and companyName LIKE CONCAT('%',#{noCarWayBill.companyName},'%')
             </if>
-            <if test="noCarWayBill.hisFlag != null and noCarWayBill.hisFlag != ''">
-                and hisFlag = #{noCarWayBill.hisFlag}
+            <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>
         </where>
     </select>
@@ -65,14 +75,23 @@
         <include refid="baseSql" />
         from t_waybill_no
         <where>
-            <if test="noCarWayBill.customerName != null and noCarWayBill.customerName != ''">
-                and customerName LIKE CONCAT('%',#{noCarWayBill.customerName},'%')
+            <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.hisFlag != null and noCarWayBill.hisFlag != ''">
-                and hisFlag = #{noCarWayBill.hisFlag}
+            <if test="noCarWayBill.endBegin != null and noCarWayBill.endBegin != ''">
+                and interfaceEndTime BETWEEN #{noCarWayBill.endBegin} and #{noCarWayBill.endEnd}
             </if>
 
-             and billwayStatus =2
+             and billwayStatus =4
         </where>
     </select>
     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
@@ -90,21 +109,21 @@
             titleType,
             taxplayerCode,
             intfaceStartTime,
-            InterfaceEndTime,
+            interfaceEndTime,
             billwayStatus,
             hisFlag,
             companyAdress,
             companyBank,
             companyBankAcc,
-            companyTel,companyNum
+            companyTel,companyNum,updateTime
         )
         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},
+        #{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}
+        , #{companyBankAcc,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR},#{companyNum,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
@@ -122,7 +141,7 @@
         titleType = #{titleType,jdbcType=INTEGER},
         taxplayerCode = #{taxplayerCode,jdbcType=VARCHAR},
         intfaceStartTime = #{intfaceStartTime,jdbcType=VARCHAR},
-        InterfaceEndTime = #{InterfaceEndTime,jdbcType=VARCHAR},
+        interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},
         billwayStatus = #{billwayStatus,jdbcType=INTEGER},
         hisFlag = #{hisFlag,jdbcType=INTEGER},
         companyAdress = #{companyAdress,jdbcType=VARCHAR},
@@ -148,7 +167,7 @@
         titleType = #{titleType,jdbcType=INTEGER},
         taxplayerCode = #{taxplayerCode,jdbcType=VARCHAR},
         intfaceStartTime = #{intfaceStartTime,jdbcType=VARCHAR},
-        InterfaceEndTime = #{InterfaceEndTime,jdbcType=VARCHAR},
+        interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},
         billwayStatus = #{billwayStatus,jdbcType=INTEGER},
         hisFlag = #{hisFlag,jdbcType=INTEGER},
         companyAdress = #{companyAdress,jdbcType=VARCHAR},