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

pom.xml

@@ -308,11 +308,11 @@
         </dependency>
         <!--有车-->
         <dependency>
-            <groupId>sdk-b2b-protocol-1.5.1</groupId>
+            <groupId>sdk-b2b-protocol-1.5.3</groupId>
             <artifactId>sdk</artifactId>
             <scope>system</scope>
             <version>1.0</version>
-            <systemPath>${project.basedir}/lib/sdk-b2b-protocol-1.5.1.jar</systemPath>
+            <systemPath>${project.basedir}/lib/sdk-b2b-protocol-1.5.3.jar</systemPath>
         </dependency>
         <!--调用第三方的依赖包-->
         <dependency>

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

@@ -168,8 +168,12 @@ public class InterfaceCheckServer {
                 result = selfCarInterService.customerCarUnRec(appKey,api,data,requestid);
                 break;
 
-
-
+            case "B2B_CHANGE_CARD_VI":
+                result = selfCarInterService.customerCardChange(appKey,api,data,requestid);
+                break;
+            case "B2B_CHANGE_CARD_QUERY_VI":
+                result = selfCarInterService.customerCardChangeQuery(appKey,api,data,requestid);
+                break;
 
             //----------------------------无车下游接口---------------------------------//
             case "VEHICLE_REGISTER"://无车 车辆备案接口

src/main/java/com/jkcredit/invoice/credit/dto/CardChangeDto.java

@@ -0,0 +1,75 @@
+package com.jkcredit.invoice.credit.dto;
+
+import com.jkcredit.invoice.common.BaseEntity;
+
+import java.util.ArrayList;
+
+/**
+ * etc换绑参数
+ */
+public class CardChangeDto {
+    /**
+     *原公司编号
+     */
+    private String companyNum;
+
+    /**
+     * 原公司名称
+     */
+    private String companyName;
+
+    /**
+     * 目标公司编号
+     */
+    private String targetCompanyNum;
+
+    /**
+     * 目标公司名称
+     */
+    private String targetCompanyName;
+
+    /**
+     * 换绑的卡号集合
+     */
+    private ArrayList<String> cardIdList;
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
+
+    public String getTargetCompanyNum() {
+        return targetCompanyNum;
+    }
+
+    public void setTargetCompanyNum(String targetCompanyNum) {
+        this.targetCompanyNum = targetCompanyNum;
+    }
+
+    public ArrayList<String> getCardIdList() {
+        return cardIdList;
+    }
+
+    public void setCardIdList(ArrayList<String> cardIdList) {
+        this.cardIdList = cardIdList;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getTargetCompanyName() {
+        return targetCompanyName;
+    }
+
+    public void setTargetCompanyName(String targetCompanyName) {
+        this.targetCompanyName = targetCompanyName;
+    }
+}

src/main/java/com/jkcredit/invoice/credit/dto/CardChangeQueryDto.java

@@ -0,0 +1,37 @@
+package com.jkcredit.invoice.credit.dto;
+
+/**
+ * 换绑查询DTO
+ */
+public class CardChangeQueryDto {
+
+    private String companyNum;
+
+    private String applyId;
+
+    private String cardId;
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
+
+    public String getApplyId() {
+        return applyId;
+    }
+
+    public void setApplyId(String applyId) {
+        this.applyId = applyId;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+}

src/main/java/com/jkcredit/invoice/credit/interserver/SelfCarInterService.java

@@ -32,4 +32,11 @@ public interface SelfCarInterService {
 
     //自有车 卡解绑接口。
     DataResult customerCarUnRec(String appKey, String api, String data, String requestid);
+
+    //自有车 卡换绑绑接口。
+    DataResult customerCardChange(String appKey, String api, String data, String requestid);
+
+
+    //自有车 卡换绑绑查询接口。
+    DataResult customerCardChangeQuery(String appKey, String api, String data, String requestid);
 }

src/main/java/com/jkcredit/invoice/credit/interserver/SelfCarInterServiceImpl.java

@@ -1,9 +1,12 @@
 package com.jkcredit.invoice.credit.interserver;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.common.DataResult;
+import com.jkcredit.invoice.credit.dto.CardChangeDto;
+import com.jkcredit.invoice.credit.dto.CardChangeQueryDto;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
@@ -807,4 +810,109 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         }
         return result;
     }
+
+    @Override
+    public DataResult customerCardChange(String appKey, String api, String data, String requestid) {
+        long costtimestart = System.currentTimeMillis();
+        DataResult result = new DataResult();
+        result.setData(3);
+        result.setCode(200);
+        result.setRequestid(requestid);
+        result.setMsg("无法认证");
+
+        try {
+            log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+
+            CardChangeQueryDto cardChangeQueryDto = JSON.parseObject(data,CardChangeQueryDto.class);
+
+            if(cardChangeQueryDto == null || StringUtils.isEmpty(cardChangeQueryDto.getCompanyNum())
+                    || StringUtils.isEmpty(cardChangeQueryDto.getApplyId()) || StringUtils.isEmpty(cardChangeQueryDto.getCardId()))
+            {
+                result.setMsg("必传参数不足");
+                return  result;
+            }
+
+            CustomerRec customerRec = new CustomerRec();
+            customerRec.setCustomerName(appKey);
+            customerRec.setCompanyNum(cardChangeQueryDto.getCompanyNum());
+            CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec);
+            if (null == customerRec1){
+                result.setMsg("该企业编号未注册企业!");
+                return result;
+            }
+            RespR rs = selfCarService.customerCardChangeQuery(cardChangeQueryDto);
+            long costtimeend = System.currentTimeMillis();
+            log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "
+                    + rs.toString() + ", request is " + data + " ,costtime="
+                    + (costtimeend - costtimestart));
+            if(null != rs && rs.getCode() == 0){
+                result.setData(1);
+                result.setCode(200);
+                result.setMsg(rs.getData().toString());
+                return result;
+            } else {
+                result.setData(3);
+                result.setCode(200);
+                result.setMsg(rs.getMsg());
+                return result;
+            }
+        } catch (Exception e) {
+            log.error("[-SelfCarInterServiceImpl.customerCarUnRec-] get httpclient exception is "
+                    + e + ", request is " + data);
+        }
+        return result;
+    }
+
+    @Override
+    public DataResult customerCardChangeQuery(String appKey, String api, String data, String requestid) {
+        long costtimestart = System.currentTimeMillis();
+        DataResult result = new DataResult();
+        result.setData(3);
+        result.setCode(200);
+        result.setRequestid(requestid);
+        result.setMsg("无法认证");
+
+        try {
+            log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" +data+ " ,requestid=" +requestid);
+
+            CardChangeDto cardChangeDto = JSON.parseObject(data,CardChangeDto.class);
+
+            if(cardChangeDto == null || StringUtils.isEmpty(cardChangeDto.getCompanyNum())
+                    || StringUtils.isEmpty(cardChangeDto.getTargetCompanyNum()) || cardChangeDto.getCardIdList()==null
+                    || cardChangeDto.getCardIdList().size()==0)
+            {
+                result.setMsg("必传参数不足");
+                return  result;
+            }
+
+            CustomerRec customerRec = new CustomerRec();
+            customerRec.setCustomerName(appKey);
+            customerRec.setCompanyNum(cardChangeDto.getCompanyNum());
+            CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec);
+            if (null == customerRec1){
+                result.setMsg("该企业编号未注册企业!");
+                return result;
+            }
+            RespR rs = selfCarService.customerCardChange(cardChangeDto);
+            long costtimeend = System.currentTimeMillis();
+            log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "
+                    + rs.toString() + ", request is " + data + " ,costtime="
+                    + (costtimeend - costtimestart));
+            if(null != rs && rs.getCode() == 0){
+                result.setData(1);
+                result.setCode(200);
+                result.setMsg(rs.getData().toString());
+                return result;
+            } else {
+                result.setData(3);
+                result.setCode(200);
+                result.setMsg(rs.getMsg());
+                return result;
+            }
+        } catch (Exception e) {
+            log.error("[-SelfCarInterServiceImpl.customerCarUnRec-] get httpclient exception is "
+                    + e + ", request is " + data);
+        }
+        return result;
+    }
 }

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

@@ -3,6 +3,8 @@ package com.jkcredit.invoice.service.lowerservice;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2BInvoiceListModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2bInvoicePackageModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
+import com.jkcredit.invoice.credit.dto.CardChangeDto;
+import com.jkcredit.invoice.credit.dto.CardChangeQueryDto;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
@@ -82,4 +84,12 @@ public interface SelfCarServiceL {
      * @return
      */
     RespR customerCarUnRec(List<CustomerCarRec> customerCarRec);
+
+
+    //自有车 卡换绑绑接口。
+    RespR customerCardChange(CardChangeDto cardChangeDto);
+
+
+    //自有车 卡换绑绑查询接口。
+    RespR customerCardChangeQuery(CardChangeQueryDto cardChangeQueryDto);
 }

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

@@ -5,6 +5,8 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 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.common.CommonConstants;
+import com.jkcredit.invoice.credit.dto.CardChangeDto;
+import com.jkcredit.invoice.credit.dto.CardChangeQueryDto;
 import com.jkcredit.invoice.mapper.binvoce.SelfCarApplMapper;
 import com.jkcredit.invoice.mapper.binvoce.SelfCarInvoiceMapper;
 import com.jkcredit.invoice.mapper.calculateinfor.SelfCarCalculateInforMapper;
@@ -598,4 +600,48 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
         }
 
     }
+
+    @Override
+    public RespR customerCardChange(CardChangeDto cardChangeDto) {
+        CardChangeTitleRequest cardChangeTitleRequest  = new CardChangeTitleRequest();
+        List<String> cards = cardChangeDto.getCardIdList();
+        List<CardBindingToBModel> cardBindingToBModels = new ArrayList<>();
+        for(String card:cards){
+            CardBindingToBModel cardBindingToBModel = new CardBindingToBModel();
+            cardBindingToBModel.setCardId(card);
+            cardBindingToBModels.add(cardBindingToBModel);
+        }
+        cardChangeTitleRequest.setCardIdList(cardBindingToBModels);
+        cardChangeTitleRequest.setCompanyNum(cardChangeDto.getCompanyNum());
+        cardChangeTitleRequest.setTargetCompanyNum(cardChangeDto.getTargetCompanyNum());
+
+        RespR<CardChangeTitleResponse> respR = selfCarInterface.changeCardTile(cardChangeTitleRequest);
+        if(respR.getCode() == 1){
+            log.info("etc换绑失败：SelfCarServiceLImpl.customerCardChange{},msg",cardChangeDto,respR.getMsg());
+            return new RespR(false,respR.getMsg());
+        }else{
+            /**
+             * TODO 数据库处理换绑信息
+             */
+            return new RespR(respR.getData());
+        }
+    }
+
+    @Override
+    public RespR customerCardChangeQuery(CardChangeQueryDto cardChangeQueryDto) {
+        CardChangeQueryRequest cardChangeQueryRequest = new CardChangeQueryRequest();
+        cardChangeQueryRequest.setApplyId(cardChangeQueryDto.getApplyId());
+        cardChangeQueryRequest.setCardId(cardChangeQueryDto.getCardId());
+        cardChangeQueryRequest.setCompanyNum(cardChangeQueryDto.getCompanyNum());
+        RespR<CardChangeQueryResponse> respR = selfCarInterface.queryChangeCard(cardChangeQueryRequest);
+        if(respR.getCode() == 1){
+            log.info("etc换绑失败：SelfCarServiceLImpl.customerCardChange{},msg",cardChangeQueryDto,respR.getMsg());
+            return new RespR(false,respR.getMsg());
+        }else{
+            /**
+             * TODO 数据库处理换绑信息
+             */
+            return new RespR(respR.getData());
+        }
+    }
 }

src/main/java/com/jkcredit/invoice/service/upService/SelfCarInterface.java

@@ -81,4 +81,18 @@ public interface SelfCarInterface {
      * @return
      */
     RespR<B2bInvoicePackageResponse> b2bInvoicePackage(B2bInvoicePackageRequest b2bInvoicePackageRequest);
+
+    /**
+     *Etc更换绑定企业
+     * @param cardChangeTitleRequest
+     * @return
+     */
+    RespR<CardChangeTitleResponse> changeCardTile(CardChangeTitleRequest cardChangeTitleRequest);
+
+    /**
+     * 查询Etc换绑记录
+     * @param cardChangeQueryRequest
+     * @return
+     */
+    RespR<CardChangeQueryResponse> queryChangeCard(CardChangeQueryRequest cardChangeQueryRequest);
 }

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

@@ -251,4 +251,50 @@ public class SelfCarInterfaceImpl  implements SelfCarInterface{
             return new RespR(false,apie.getMessage());
         }
     }
+
+    @Override
+    public RespR<CardChangeTitleResponse> changeCardTile(CardChangeTitleRequest cardChangeTitleRequest) {
+        String fileName = cardChangeTitleRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
+        try {
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游请求参数：{}", cardChangeTitleRequest.toString());
+            //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            CardChangeTitleResponse response=ETCCommHelper.upload(fileName, cardChangeTitleRequest, CardChangeTitleResponse.class);
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardChangeTitleRequest.toString(),System.currentTimeMillis()-startTime);
+
+            return new RespR<>(response);
+        } catch (IOException e) {
+            log.error(e.getMessage()+ " ,请求参数："+cardChangeTitleRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            e.printStackTrace();
+            return new RespR(false,"网络异常,请联系管理人员");
+        }catch (ApiRequestException apie) {
+            log.error(apie.getMessage()+ " ,请求参数："+cardChangeTitleRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            apie.printStackTrace();
+            return new RespR(false,apie.getMessage());
+        }
+    }
+
+    @Override
+    public RespR<CardChangeQueryResponse> queryChangeCard(CardChangeQueryRequest cardChangeQueryRequest) {
+        String fileName = cardChangeQueryRequest.getFilename();
+        long startTime = System.currentTimeMillis();
+
+        try {
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游请求参数：{}", cardChangeQueryRequest.toString());
+            //(4)指定协议的响应模型（IssuerUploadResponse），调用upload 发送数据
+            CardChangeQueryResponse response=ETCCommHelper.upload(fileName, cardChangeQueryRequest, CardChangeQueryResponse.class);
+            log.info("SelfCarInterfaceImpl.b2bInvoicePackage上游接口返回：{},请求参数：{},cost={}ms", response.toString(), cardChangeQueryRequest.toString(),System.currentTimeMillis()-startTime);
+
+            return new RespR<>(response);
+        } catch (IOException e) {
+            log.error(e.getMessage()+ " ,请求参数："+cardChangeQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            e.printStackTrace();
+            return new RespR(false,"网络异常,请联系管理人员");
+        }catch (ApiRequestException apie) {
+            log.error(apie.getMessage()+ " ,请求参数："+cardChangeQueryRequest.toString()+" ,cost="+(System.currentTimeMillis()-startTime)+"ms");
+            apie.printStackTrace();
+            return new RespR(false,apie.getMessage());
+        }
+    }
 }