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

src/main/java/com/jkcredit/invoice/controller/business/SelfCarController.java

@@ -113,9 +113,6 @@ public class SelfCarController {
             if(StringUtils.isEmpty(selfCarTrade.getCompanyName())){
                 return new RespR(false,"需要输入公司名称");
             }
-            if(StringUtils.isEmpty(selfCarTrade.getCardId())){
-                return new RespR(false,"需要输入etc卡号");
-            }
             if(StringUtils.isEmpty(selfCarTrade.getExTimeBegin())){
                 return new RespR(false,"需要交易开始时间");
             }
@@ -128,19 +125,37 @@ public class SelfCarController {
             tradeRequestVo.setCompanyName(selfCarTrade.getCompanyName());
             tradeRequestVo.setStartTime(selfCarTrade.getExTimeBegin());
             tradeRequestVo.setEndTime(selfCarTrade.getExTimeEnd());
-            tradeRequestVo.setEtcId(selfCarTrade.getCardId());
             tradeRequestVo.setTradeStatus(selfCarTrade.getStatus());
             tradeRequestVo.setInterType(1);//0 接口
-
-            if(tradeRequestVo.getTradeStatus() ==null){
-                tradeRequestVo.setTradeStatus(1);
-                selfCarServiceL.getTradeList(tradeRequestVo);
-                tradeRequestVo.setTradeStatus(2);
-                selfCarServiceL.getTradeList(tradeRequestVo);
-                tradeRequestVo.setTradeStatus(3);
-                selfCarServiceL.getTradeList(tradeRequestVo);
+            if(StringUtils.isEmpty(selfCarTrade.getCardId())){
+                List<CustomerCarRec> customerCarRecs = selfCarService.getEtcsByCompany(selfCarTrade.getCompanyName());
+                if(customerCarRecs!=null && customerCarRecs.size()>0){
+                    for(CustomerCarRec customerCarRec:customerCarRecs){
+                        tradeRequestVo.setEtcId(customerCarRec.getEtcNum());
+                        if(tradeRequestVo.getTradeStatus() ==null){
+                            tradeRequestVo.setTradeStatus(1);
+                            selfCarServiceL.getTradeList(tradeRequestVo);
+                            tradeRequestVo.setTradeStatus(2);
+                            selfCarServiceL.getTradeList(tradeRequestVo);
+                            tradeRequestVo.setTradeStatus(3);
+                            selfCarServiceL.getTradeList(tradeRequestVo);
+                        }else{
+                            selfCarServiceL.getTradeList(tradeRequestVo);
+                        }
+                    }
+                }
             }else{
-                selfCarServiceL.getTradeList(tradeRequestVo);
+                tradeRequestVo.setEtcId(selfCarTrade.getCardId());
+                if(tradeRequestVo.getTradeStatus() ==null){
+                    tradeRequestVo.setTradeStatus(1);
+                    selfCarServiceL.getTradeList(tradeRequestVo);
+                    tradeRequestVo.setTradeStatus(2);
+                    selfCarServiceL.getTradeList(tradeRequestVo);
+                    tradeRequestVo.setTradeStatus(3);
+                    selfCarServiceL.getTradeList(tradeRequestVo);
+                }else{
+                    selfCarServiceL.getTradeList(tradeRequestVo);
+                }
             }
             RespR respR = new RespR(selfCarTradeService.findByPageAndTrade(page, selfCarTrade));
             return respR;

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

@@ -41,4 +41,5 @@ public interface CustomerCarRecMapper extends BaseMapper<CustomerCarRec> {
     int upDateCompanySelf(CompanyVo companyVo);
 
     int upDateCompanyNo(CompanyVo companyVo);
+    List<CustomerCarRec> selectAllEtcByCompany(String companyName);
 }

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

@@ -60,7 +60,7 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,Custom
     public synchronized CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record) {
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(record);
 
-        if(customerRec == null){
+        /*if(customerRec == null){
             //根据税号查询企业，若业务类型一致自动挂到当前客户下
            List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyReference(customerRec.getCompanyReferencenum());
            if(customerRecs!=null && customerRecs.size()>0){
@@ -73,7 +73,8 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,Custom
                    }
                }
            }
-        }
+        }*/
+        if(customerRec == null || customerRec.getRecStatus()!=1){customerRec = null;}
         return customerRec;
     }
 
@@ -85,7 +86,7 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,Custom
     @Override
     public synchronized CustomerRec selectByCustomerNameAndCompanyNum(CustomerRec record) {
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompanyNum(record);
-        if(customerRec == null){
+        /*if(customerRec == null){
             //根据税号查询企业，若业务类型一致自动挂到当前客户下
             List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyNum(customerRec);
             if(customerRecs!=null && customerRecs.size()>0){
@@ -99,6 +100,7 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,Custom
                 }
             }
         }
+        if(customerRec == null || customerRec.getRecStatus()!=1){customerRec = null;}*/
         if(customerRec == null || customerRec.getRecStatus()!=1){customerRec = null;}
         return customerRec;
     }

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

@@ -410,12 +410,12 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         cardQueryCardToBRequest.setPalteColor(etcQueryVo.getPlateColor());//车牌颜色.非必输
         RespR<CardBindQueryListToBResponse> respR = selfCarInterface.cardBindQueryListToB(cardQueryCardToBRequest);
 
-        if(customerRec.getInterType() == 0){
+        /*if(customerRec.getInterType() == 0){
             if(respR.getCode() == 0 && (respR.getData().getResult()==null||respR.getData().getResult().size()<=0)){
                 respR.setCode(2);
             }
             return respR;
-        }
+        }*/
         if(respR.getCode() == 1){
             log.info("获取etc信息失败：SelfCarServiceLImpl.getEtcInfo{},msg{}",etcQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());

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

@@ -93,4 +93,5 @@ public class NoCarRecServiceImpl extends ServiceImpl<CustomerCarRecMapper,Custom
         }
         return customerCarRecMapper.selectAllByPage(page,customerCarRec);
     }
+
 }

src/main/java/com/jkcredit/invoice/service/selfcar/SelfCarService.java

@@ -22,4 +22,11 @@ public interface SelfCarService {
      * @return
      */
     List<CustomerCarRec> getEtcsByCarNum(String carNum);
+
+    /**
+     * 根据车牌号查询ETC信息
+     * @param comapanyName
+     * @return
+     */
+    List<CustomerCarRec> getEtcsByCompany(String comapanyName);
 }

src/main/java/com/jkcredit/invoice/service/selfcar/impl/SelfCarServiceImpl.java

@@ -31,4 +31,9 @@ public class SelfCarServiceImpl implements SelfCarService{
     public List<CustomerCarRec> getEtcsByCarNum(String carNum) {
         return customerCarRecMapper.selectBySelfCarNum(carNum);
     }
+
+    @Override
+    public List<CustomerCarRec> getEtcsByCompany(String comapanyName) {
+        return customerCarRecMapper.selectAllEtcByCompany(comapanyName);
+    }
 }

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

@@ -85,6 +85,12 @@
     from t_customer_carRec
     where  car_num = BINARY #{carNum,jdbcType=VARCHAR} and bussiness_type=0
   </select>
+  <select id="selectAllEtcByCompany" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_carRec
+    where  company_name = BINARY #{companyName,jdbcType=VARCHAR} and bussiness_type=0
+  </select>
   <select id="selectByETC" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />