无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRecMapper.java

@@ -28,6 +28,8 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
     CustomerRec selectByCustomerNameAndCompanyReferenceAll(CustomerRec record);
 
     List<CustomerRec> selectByCompanyReference(String companyReference);
+
+    List<CustomerRec> selectByCompanyName(String comapanyName);
     //根据客户名称和 企业编码查询唯一数据
     CustomerRec selectByCustomerNameAndCompanyNum(CustomerRec record);
     List<CustomerRec> selectByCompanyNum(CustomerRec record);

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

@@ -20,7 +20,7 @@ public interface SellCarTradeMapper extends BaseMapper<SelfCarTrade> {
     int updateByTradeId(SelfCarTrade record);
 
     SelfCarTrade selectByTradeId(String tradeId);
-
+    List<SelfCarTrade> selectByCardIdByStatus(SelfCarTrade record);
     List<SelfCarTrade> selectByCardId(String cardId);
 
     int upDateCompany(CompanyVo companyVo);

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

@@ -89,7 +89,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     }
     public RespR contractAdd(CustomerRec customerRec){
         MIX_LOG.info("开始上传协议：CustomerServiceImpl.contractAdd{}",customerRec);
-        customerRecMapper.updateByPrimaryKeySelective(customerRec);
         if(customerRec.getRecStatus().intValue() == 2){
             return new RespR(false,"无法上传协议，未注册");
         }

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

@@ -613,26 +613,26 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     public RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo) {
         MIX_LOG.info("取月票啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"开始");
-        Customer customer = customerMapper.selectByCustomerName(monthAccountQueryVo.getCustomeName());
-        if(customer==null || customer.getAccstatus() ==1){
-            MIX_LOG.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"客户不存在或者已经停用");
-            return new RespR(false,"客户不存在或者已经停用");
-        }
         CustomerRec customerRecParm = new CustomerRec();
-        customerRecParm.setCompanyName(monthAccountQueryVo.getComPanyName());
+        customerRecParm.setCompanyName(monthAccountQueryVo.getCompanyName());
         customerRecParm.setCustomerName(monthAccountQueryVo.getCustomeName());
-        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecParm);
+        CustomerRec customerRec = null;
+        List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyName(monthAccountQueryVo.getCompanyName());
+        if(customerRecs != null && customerRecs.size()>0){
+            customerRec = customerRecs.get(0);
+        }
         if(customerRec == null || customerRec.getRecStatus()!=1){
-            MIX_LOG.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"客户未备案企业或运单编号与查询主体不符");
-            return new RespR(false,"客户未备案企业或运单编号与查询主体不符");
+            MIX_LOG.info("取月票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",monthAccountQueryVo,"企业未备案成功,查询失败");
+            return new RespR(false,"企业未备案成功,查询失败");
         }
         WaybillCountQueryRequest waybillCountQueryRequest = new WaybillCountQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         waybillCountQueryRequest.setCompanyNum(companyNum);
-        waybillCountQueryRequest.setTaxCode(monthAccountQueryVo.getTaxCode());
+        waybillCountQueryRequest.setTaxCode(customerRec.getCompanyReferencenum());
         waybillCountQueryRequest.setTradeMonth(monthAccountQueryVo.getTradeMonth());
         waybillCountQueryRequest.setWaybillSource(monthAccountQueryVo.getWaybillSource());
         waybillCountQueryRequest.setPageNo(monthAccountQueryVo.getPageNo());
+        waybillCountQueryRequest.setPageSize(1000);
         RespR<WaybillCountQueryResponse> waybillCountQueryResponseRespR =  noCarInterface.waybillCountQuery(waybillCountQueryRequest);
         MIX_LOG.info("取月票结束：NoCarServiceImpl.hCInvoiceQuery{},msg{}",waybillCountQueryResponseRespR,waybillCountQueryResponseRespR.getMsg());
         return waybillCountQueryResponseRespR;

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

@@ -589,18 +589,8 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 customerRecP.setCompanyName(customerCarRec.getCompanyName());
                 CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
                 if("0".equals(customerRec.getBussinessType())){
-                    CardUnbindToBRequest cardUnbindToBRequest = new CardUnbindToBRequest();
-                    cardUnbindToBRequest.setCardId(customerCarRec.getEtcNum());
-                    cardUnbindToBRequest.setCompanyNum(customerRec.getCompanyNum());
-                    RespR<CardUnbindToBResponse> respR = selfCarInterface.cardUnbindToB(cardUnbindToBRequest);
-                    if(respR.getCode() == 1){
-                        MIX_LOG.info("etc解绑失败：SelfCarServiceLImpl.customerCarUnRec{}，msg{}",customerCarRecs,respR.getMsg());
-                        res.append(customerCarRec.getEtcNum()+","+customerCarRec.getCarNum()+"解绑失败;"+"#");
-                    }else{
-                        customerCarRec.setRecStatus(2);
-                        customerCarRecMapper.updateETCByPrimaryKeySelective(customerCarRec);
-                        resRespon = respR.getData().toString();
-                    }
+                    customerCarRec.setRecStatus(2);
+                    customerCarRecMapper.updateETCByPrimaryKeySelective(customerCarRec);
                 }
             }
             if(org.springframework.util.StringUtils.isEmpty(res.toString())){

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

@@ -7,7 +7,7 @@ public class MonthAccountQueryVo {
     //客户名称
     private String customeName;
     //企业名称
-    private String comPanyName;
+    private String companyName;
     //企业税号
     private String taxCode;
     //交易匹配月份
@@ -27,12 +27,12 @@ public class MonthAccountQueryVo {
         this.customeName = customeName;
     }
 
-    public String getComPanyName() {
-        return comPanyName;
+    public String getCompanyName() {
+        return companyName;
     }
 
-    public void setComPanyName(String comPanyName) {
-        this.comPanyName = comPanyName;
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
     }
 
     public String getTaxCode() {
@@ -71,7 +71,7 @@ public class MonthAccountQueryVo {
     public String toString() {
         return "MonthAccountQueryVo{" +
                 "customeName='" + customeName + '\'' +
-                ", comPanyName='" + comPanyName + '\'' +
+                ", comPanyName='" + companyName + '\'' +
                 ", taxCode='" + taxCode + '\'' +
                 ", tradeMonth='" + tradeMonth + '\'' +
                 ", waybillSource=" + waybillSource +

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

@@ -3,13 +3,16 @@ package com.jkcredit.invoice.task;
 import com.jkcredit.invoice.mapper.Binvoce.SelfCarApplMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
+import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.SelfCarDueQueryVo;
 import com.jkcredit.invoice.service.lowerService.vo.TradeRequestVo;
 import com.jkcredit.invoice.service.manager.ParamService;
+import com.jkcredit.invoice.service.selfCar.SelfCarTradeService;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.LogFileName;
 import com.jkcredit.invoice.util.LoggerUtil;
@@ -42,6 +45,9 @@ public class ScheduledBillTask {
     SelfCarApplMapper selfCarApplMapper;
 
     @Autowired
+    SellCarTradeMapper sellCarTradeMapper;
+
+    @Autowired
     NoCarService noCarService;
 
     @Autowired
@@ -52,6 +58,8 @@ public class ScheduledBillTask {
 
     @Autowired
     ParamService paramService;
+    @Autowired
+    SelfCarTradeService selfCarTradeService;
     /**
      * 实时运单开票（每天23点开始）
      */
@@ -138,13 +146,12 @@ public class ScheduledBillTask {
               selfCarDueQueryVo.setStartTime(befor+" 00:00:00");
               selfCarDueQueryVo.setEndTime(after+"00:00:00");
               //查询交易id
-              TradeRequestVo tradeRequestVo = new TradeRequestVo();
-              tradeRequestVo.setStartTime(befor+" 00:00:00");
-              tradeRequestVo.setEndTime(after+"00:00:00");
-              tradeRequestVo.setCompanyName(customerCarRec.getCustomerName());
-              tradeRequestVo.setEtcId(customerCarRec.getEtcNum());
-              tradeRequestVo.setTradeStatus(3);
-              selfCarService.getTradeList(tradeRequestVo);
+              //根据etc卡查询所有的交易id
+              SelfCarTrade param = new SelfCarTrade();
+              param.setStatus(2);
+              param.setCardId(customerCarRec.getEtcNum());
+              List<SelfCarTrade> selfCarTrades = sellCarTradeMapper.selectByCardIdByStatus(param);
+              selfCarTradeService.updateTrades(selfCarTrades);
               selfCarService.getSelfCarInvoicesByTime(selfCarDueQueryVo);
           }catch (Exception e){
               e.printStackTrace();

src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml

@@ -115,6 +115,6 @@
         )
     </insert>
     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
-        UPDATE t_CalculateInfor set companyName = #{newCompanyName} where companyName = #{oldCompanyName}
+        UPDATE t_CalculateInfor set buyerName = #{newCompanyName} where buyerName = #{oldCompanyName}
     </update>
 </mapper>

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

@@ -156,6 +156,12 @@
         from t_customer_rec
         where  company_num =  #{companyNum,jdbcType=VARCHAR} and rec_status =1
     </select>
+  <select id="selectByCompanyName" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_rec
+    where  company_name =  #{companyName,jdbcType=VARCHAR} and rec_status =1
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from t_customer_rec
     where id = #{id,jdbcType=INTEGER}

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

@@ -110,7 +110,6 @@
 
             </if>
         </where>
-        order by id DESC
     </select>
 
 

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

@@ -89,7 +89,7 @@
             <if test="noCarWayBill.success == 2">
                 and billwayStatus in(-1,-2,-3)
             </if>
-        </where>  ORDER by id desc
+        </where>
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
         select

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

@@ -94,7 +94,6 @@
                 and billwayStatus in(-1,-2,-3)
             </if>
         </where>
-        order by id desc
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
         select

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

@@ -133,7 +133,12 @@
         from t_SellCarTrade
         where  cardId = BINARY #{cardId,jdbcType=VARCHAR}
     </select>
-
+    <select id="selectByCardIdByStatus" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.waybill.SelfCarTrade" >
+        select
+        <include refid="baseSql" />
+        from t_SellCarTrade
+        where  cardId = BINARY #{cardId,jdbcType=VARCHAR} and  status = #{status,jdbcType=VARCHAR}
+    </select>
 
     <update id="upDateCompany" parameterType="com.jkcredit.invoice.model.vo.CompanyVo">
         UPDATE t_SellCarTrade set companyName = #{newCompanyName} where companyName = #{oldCompanyName}