代码规范调整-120220118

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

@@ -5,10 +5,10 @@ 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.model.vo.CardChangeQueryVo;
+import com.jkcredit.invoice.model.vo.CardChangeVo;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
@@ -963,23 +963,23 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
 
-            CardChangeQueryDto cardChangeQueryDto = JSON.parseObject(data, CardChangeQueryDto.class);
+            CardChangeQueryVo cardChangeQueryVo = JSON.parseObject(data, CardChangeQueryVo.class);
 
-            if (cardChangeQueryDto == null || StringUtils.isEmpty(cardChangeQueryDto.getCompanyNum())
-                    || StringUtils.isEmpty(cardChangeQueryDto.getApplyId()) || StringUtils.isEmpty(cardChangeQueryDto.getCardId())) {
+            if (cardChangeQueryVo == null || StringUtils.isEmpty(cardChangeQueryVo.getCompanyNum())
+                    || StringUtils.isEmpty(cardChangeQueryVo.getApplyId()) || StringUtils.isEmpty(cardChangeQueryVo.getCardId())) {
                 result.setMsg("必传参数不足");
                 return result;
             }
 
             CustomerRec customerRec = new CustomerRec();
             customerRec.setCustomerName(appKey);
-            customerRec.setCompanyNum(cardChangeQueryDto.getCompanyNum());
+            customerRec.setCompanyNum(cardChangeQueryVo.getCompanyNum());
             CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec);
             if (null == customerRec1) {
                 result.setMsg("该企业编号未注册企业!");
                 return result;
             }
-            RespR rs = selfCarService.customerCardChangeQuery(cardChangeQueryDto);
+            RespR rs = selfCarService.customerCardChangeQuery(cardChangeQueryVo);
             long costtimeend = System.currentTimeMillis();
             log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="
@@ -1014,26 +1014,26 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
 
-            CardChangeDto cardChangeDto = JSON.parseObject(data, CardChangeDto.class);
+            CardChangeVo cardChangeVo = JSON.parseObject(data, CardChangeVo.class);
 
-            if (cardChangeDto == null || StringUtils.isEmpty(cardChangeDto.getCompanyNum())
-                    || StringUtils.isEmpty(cardChangeDto.getTargetCompanyNum()) || cardChangeDto.getCardIdList() == null
-                    || cardChangeDto.getCardIdList().size() == 0) {
+            if (cardChangeVo == null || StringUtils.isEmpty(cardChangeVo.getCompanyNum())
+                    || StringUtils.isEmpty(cardChangeVo.getTargetCompanyNum()) || cardChangeVo.getCardIdList() == null
+                    || cardChangeVo.getCardIdList().size() == 0) {
                 result.setMsg("必传参数不足");
                 return result;
             }
 
             CustomerRec customerRec = new CustomerRec();
             customerRec.setCustomerName(appKey);
-            customerRec.setCompanyNum(cardChangeDto.getCompanyNum());
+            customerRec.setCompanyNum(cardChangeVo.getCompanyNum());
             CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec);
             if (null == customerRec1) {
                 result.setMsg("该企业编号未注册企业!");
                 return result;
             }
-            cardChangeDto.setCompanyName(customerRec1.getCompanyName());
-            cardChangeDto.setCustomerId(customerRec1.getCustomerName());
-            RespR rs = selfCarService.customerCardChange(cardChangeDto);
+            cardChangeVo.setCompanyName(customerRec1.getCompanyName());
+            cardChangeVo.setCustomerId(customerRec1.getCustomerName());
+            RespR rs = selfCarService.customerCardChange(cardChangeVo);
             long costtimeend = System.currentTimeMillis();
             log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="

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

@@ -1,6 +1,6 @@
 package com.jkcredit.invoice.model.entity.customer;
 
-import com.jkcredit.invoice.credit.dto.CardChangeDto;
+import com.jkcredit.invoice.model.vo.CardChangeVo;
 
 import java.util.ArrayList;
 
@@ -94,13 +94,13 @@ public class CustomerEtcChangeInfo {
         this.customerId = customerId;
     }
 
-    public void copyFromChangeDto(CardChangeDto cardChangeDto) {
-        this.setCustomerId(cardChangeDto.getCustomerId());
-        this.companyName = cardChangeDto.getCompanyName();
-        this.companyNum = cardChangeDto.getCompanyNum();
-        this.targetCompanyName = cardChangeDto.getTargetCompanyName();
-        this.targetCompanyNum = cardChangeDto.getTargetCompanyNum();
-        this.cardIdList = cardChangeDto.getCardIdList();
+    public void copyFromChangeDto(CardChangeVo cardChangeVo) {
+        this.setCustomerId(cardChangeVo.getCustomerId());
+        this.companyName = cardChangeVo.getCompanyName();
+        this.companyNum = cardChangeVo.getCompanyNum();
+        this.targetCompanyName = cardChangeVo.getTargetCompanyName();
+        this.targetCompanyNum = cardChangeVo.getTargetCompanyNum();
+        this.cardIdList = cardChangeVo.getCardIdList();
     }
 
     public String getChangeTime() {

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

@@ -1,10 +1,10 @@
-package com.jkcredit.invoice.credit.dto;
+package com.jkcredit.invoice.model.vo;
 
 /**
  * 换绑查询DTO
  * @author mumuxigua
  */
-public class CardChangeQueryDto {
+public class CardChangeQueryVo {
 
     private String companyNum;
 

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

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.credit.dto;
+package com.jkcredit.invoice.model.vo;
 
 import java.util.ArrayList;
 
@@ -7,7 +7,7 @@ import java.util.ArrayList;
  *  etc换绑参数
  * @author mumuxigua
  */
-public class CardChangeDto {
+public class CardChangeVo {
     /**
      * 客户名称
      */

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

@@ -4,10 +4,10 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2BInvoiceListMod
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2BInvoiceQueryByApplyModel;
 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.vo.CardChangeQueryVo;
+import com.jkcredit.invoice.model.vo.CardChangeVo;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.util.RespR;
 
@@ -97,18 +97,18 @@ public interface SelfCarCustService {
 
     /**
      * 自有车 卡换绑绑接口
-     * @param cardChangeDto
+     * @param cardChangeVo
      * @return
      */
-    RespR customerCardChange(CardChangeDto cardChangeDto);
+    RespR customerCardChange(CardChangeVo cardChangeVo);
 
 
     /**
      * 自有车 卡换绑绑查询接口。
-     * @param cardChangeQueryDto
+     * @param cardChangeQueryVo
      * @return
      */
-    RespR customerCardChangeQuery(CardChangeQueryDto cardChangeQueryDto);
+    RespR customerCardChangeQuery(CardChangeQueryVo cardChangeQueryVo);
 
 
     /**

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

@@ -4,8 +4,6 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.card.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.*;
 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;
@@ -22,6 +20,8 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
+import com.jkcredit.invoice.model.vo.CardChangeQueryVo;
+import com.jkcredit.invoice.model.vo.CardChangeVo;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
@@ -543,9 +543,9 @@ public class SelfCarCustServiceImpl implements SelfCarCustService {
     }
 
     @Override
-    public RespR customerCardChange(CardChangeDto cardChangeDto) {
+    public RespR customerCardChange(CardChangeVo cardChangeVo) {
         CardChangeTitleRequest cardChangeTitleRequest = new CardChangeTitleRequest();
-        List<String> cards = cardChangeDto.getCardIdList();
+        List<String> cards = cardChangeVo.getCardIdList();
         List<CardBindingToBModel> models = new ArrayList<>();
         for (String card : cards) {
             CardBindingToBModel model = new CardBindingToBModel();
@@ -553,12 +553,12 @@ public class SelfCarCustServiceImpl implements SelfCarCustService {
             models.add(model);
         }
         cardChangeTitleRequest.setCardIdList(models);
-        cardChangeTitleRequest.setCompanyNum(cardChangeDto.getCompanyNum());
-        cardChangeTitleRequest.setTargetCompanyNum(cardChangeDto.getTargetCompanyNum());
+        cardChangeTitleRequest.setCompanyNum(cardChangeVo.getCompanyNum());
+        cardChangeTitleRequest.setTargetCompanyNum(cardChangeVo.getTargetCompanyNum());
 
         RespR<CardChangeTitleResponse> respR = selfCarInterface.changeCardTile(cardChangeTitleRequest);
         if (respR.getCode() == 1) {
-            log.info("etc换绑失败：SelfCarServiceLImpl.customerCardChange{},msg", cardChangeDto, respR.getMsg());
+            log.info("etc换绑失败：SelfCarServiceLImpl.customerCardChange{},msg", cardChangeVo, respR.getMsg());
             return new RespR(false, respR.getMsg());
         } else {
 
@@ -571,7 +571,7 @@ public class SelfCarCustServiceImpl implements SelfCarCustService {
                 });
                 //2.换绑信息入库
                 CustomerEtcChangeInfo custometEtcChangeInfo = new CustomerEtcChangeInfo();
-                custometEtcChangeInfo.copyFromChangeDto(cardChangeDto);
+                custometEtcChangeInfo.copyFromChangeDto(cardChangeVo);
                 custometEtcChangeInfo.setApplyId(applyId);
                 customerChangeInfoMapper.insertCardChangeInfo(custometEtcChangeInfo);
             } catch (Exception e) {
@@ -582,14 +582,14 @@ public class SelfCarCustServiceImpl implements SelfCarCustService {
     }
 
     @Override
-    public RespR customerCardChangeQuery(CardChangeQueryDto cardChangeQueryDto) {
+    public RespR customerCardChangeQuery(CardChangeQueryVo cardChangeQueryVo) {
         CardChangeQueryRequest cardChangeQueryRequest = new CardChangeQueryRequest();
-        cardChangeQueryRequest.setApplyId(cardChangeQueryDto.getApplyId());
-        cardChangeQueryRequest.setCardId(cardChangeQueryDto.getCardId());
-        cardChangeQueryRequest.setCompanyNum(cardChangeQueryDto.getCompanyNum());
+        cardChangeQueryRequest.setApplyId(cardChangeQueryVo.getApplyId());
+        cardChangeQueryRequest.setCardId(cardChangeQueryVo.getCardId());
+        cardChangeQueryRequest.setCompanyNum(cardChangeQueryVo.getCompanyNum());
         RespR<CardChangeQueryResponse> respR = selfCarInterface.queryChangeCard(cardChangeQueryRequest);
         if (respR.getCode() == 1) {
-            log.info("etc换绑失败：SelfCarServiceLImpl.customerCardChange{},msg", cardChangeQueryDto, respR.getMsg());
+            log.info("etc换绑失败：SelfCarServiceLImpl.customerCardChange{},msg", cardChangeQueryVo, respR.getMsg());
             return new RespR(false, respR.getMsg());
         } else {
             return new RespR(respR.getData());