阿里巴巴代码规约问题修改-7 20230115

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

@@ -358,7 +358,7 @@ public class CustomerController {
             return new RespR(false, "企业维护信息缺失服务时间，请手动维护");
         }
         String fileName = "合作说明.doc";
-        Map<String, String> dataMap = new HashMap<>();
+        Map<String, String> dataMap = new HashMap<>(10);
         dataMap.put("a", customerRec.getCompanyBelongName());
         dataMap.put("b", customerRec.getCompanyName());
         dataMap.put("c", customerRec.getCompanyReferencenum());

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

@@ -22,7 +22,7 @@ import com.jkcredit.invoice.model.vo.CardAndTradeVo;
 import com.jkcredit.invoice.service.calculateinfor.SelfCarCalculateInfoService;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerservice.CheckHasAuthRole;
-import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.service.selfcar.SelfCarApplyService;
 import com.jkcredit.invoice.service.selfcar.SelfCarInvoiceService;
@@ -56,11 +56,11 @@ import static com.jkcredit.invoice.common.CommonConst.NULL;
  */
 public class SelfCarController {
     @Autowired
-    SelfCarServiceL selfCarServiceL;
+    SelfCarCustService selfCarCustService;
     @Autowired
     SelfCarService selfCarService;
     @Autowired
-    SelfCarServiceL selfCarServicel;
+    SelfCarCustService selfCarCustServicel;
     @Autowired
     SelfCarTradeService selfCarTradeService;
     @Autowired
@@ -149,7 +149,8 @@ public class SelfCarController {
             tradeRequestVo.setStartTime(selfCarTrade.getExTimeBegin());
             tradeRequestVo.setEndTime(selfCarTrade.getExTimeEnd());
             tradeRequestVo.setTradeStatus(selfCarTrade.getStatus());
-            tradeRequestVo.setInterType(1);//0 接口
+            //0 接口
+            tradeRequestVo.setInterType(1);
             if (StringUtils.isEmpty(selfCarTrade.getCardId())) {
                 List<CustomerCarRec> customerCarRecs = selfCarService.getEtcsByCompany(selfCarTrade.getCompanyName());
                 if (customerCarRecs != null && customerCarRecs.size() > 0) {
@@ -157,13 +158,13 @@ public class SelfCarController {
                         tradeRequestVo.setEtcId(customerCarRec.getEtcNum());
                         if (tradeRequestVo.getTradeStatus() == null) {
                             tradeRequestVo.setTradeStatus(1);
-                            selfCarServiceL.getTradeList(tradeRequestVo);
+                            selfCarCustService.getTradeList(tradeRequestVo);
                             tradeRequestVo.setTradeStatus(2);
-                            selfCarServiceL.getTradeList(tradeRequestVo);
+                            selfCarCustService.getTradeList(tradeRequestVo);
                             tradeRequestVo.setTradeStatus(3);
-                            selfCarServiceL.getTradeList(tradeRequestVo);
+                            selfCarCustService.getTradeList(tradeRequestVo);
                         } else {
-                            selfCarServiceL.getTradeList(tradeRequestVo);
+                            selfCarCustService.getTradeList(tradeRequestVo);
                         }
                     }
                 }
@@ -171,13 +172,13 @@ public class SelfCarController {
                 tradeRequestVo.setEtcId(selfCarTrade.getCardId());
                 if (tradeRequestVo.getTradeStatus() == null) {
                     tradeRequestVo.setTradeStatus(1);
-                    selfCarServiceL.getTradeList(tradeRequestVo);
+                    selfCarCustService.getTradeList(tradeRequestVo);
                     tradeRequestVo.setTradeStatus(2);
-                    selfCarServiceL.getTradeList(tradeRequestVo);
+                    selfCarCustService.getTradeList(tradeRequestVo);
                     tradeRequestVo.setTradeStatus(3);
-                    selfCarServiceL.getTradeList(tradeRequestVo);
+                    selfCarCustService.getTradeList(tradeRequestVo);
                 } else {
-                    selfCarServiceL.getTradeList(tradeRequestVo);
+                    selfCarCustService.getTradeList(tradeRequestVo);
                 }
             }
             RespR respR = new RespR(selfCarTradeService.findByPageAndTrade(page, selfCarTrade));
@@ -394,7 +395,7 @@ public class SelfCarController {
             tradeRequestVo.setEndTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getEndTime()))));
             tradeRequestVo.setTradeStatus(1);
             tradeRequestVo.setEtcId(customerCarRec.getEtcNum());
-            RespR<List<CardTradeModel>> respRbefore = selfCarServicel.getTradeList(tradeRequestVo);
+            RespR<List<CardTradeModel>> respRbefore = selfCarCustServicel.getTradeList(tradeRequestVo);
             if (respRbefore.getCode() == 0) {
                 cardTradeModels.addAll(respRbefore.getData());
             }
@@ -412,7 +413,7 @@ public class SelfCarController {
     public RespR applTradeList(@RequestBody TradeRequestCarNumVo tradeRequestCarNumVo, User user) {
         checkHasAuthRole.checkCompanyRole(user, tradeRequestCarNumVo.getCompanyName());
         String[] cardAndTrades = tradeRequestCarNumVo.getCarIdStr().split(",");
-        Map<String, InvoiceApplVo> map = new HashMap<>();
+        Map<String, InvoiceApplVo> map = new HashMap<>(10);
         for (int i = 0; i < cardAndTrades.length; i++) {
             if (!StringUtils.isEmpty(cardAndTrades[i])) {
                 String[] cardAndTrade = cardAndTrades[i].split("#");
@@ -432,7 +433,7 @@ public class SelfCarController {
         StringBuffer stringBuffer = new StringBuffer();
         for (Map.Entry<String, InvoiceApplVo> elm : map.entrySet()) {
             InvoiceApplVo invoiceApplVo = elm.getValue();
-            RespR respR = selfCarServicel.applInvoice(invoiceApplVo);
+            RespR respR = selfCarCustServicel.applInvoice(invoiceApplVo);
             if (respR.getCode() == 1) {
                 stringBuffer.append(invoiceApplVo.getCardId() + "开票申请失败原因:" + respR.getMsg() + "#");
             }
@@ -486,7 +487,7 @@ public class SelfCarController {
                 selfCarDueQueryVo.setStartTime(selfcarInvoiceByTimeVo.getStartTime());
                 selfCarDueQueryVo.setEndTime(selfcarInvoiceByTimeVo.getEndTime());
                 selfCarDueQueryVo.setCardId(customerCarRec.getEtcNum());
-                RespR<List<B2BInvoiceListModel>> respR = selfCarServicel.getSelfCarInvoicesByTime(selfCarDueQueryVo, customerRec1);
+                RespR<List<B2BInvoiceListModel>> respR = selfCarCustServicel.getSelfCarInvoicesByTime(selfCarDueQueryVo, customerRec1);
                 if (respR.getCode() == 0) {
                     allSelfInvocies.addAll(respR.getData());
                 }

src/main/java/com/jkcredit/invoice/controller/interserver/NoCarServiceController.java

@@ -10,7 +10,7 @@ import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.lowerservice.CheckHasAuthRole;
 import com.jkcredit.invoice.service.lowerservice.NoCarService;
-import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.HcInvoiceQueryVo;
 import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
@@ -59,7 +59,7 @@ public class NoCarServiceController {
     @PostMapping("/hCVoiceQuery")
     @ApiOperation(value = "红冲发票查询接口", notes = "红冲发票查询接口")
     @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
-    public RespR hcvoicequery(@RequestBody HCInvoiceQueryVo hcInvoiceQueryVo) {
+    public RespR hcvoicequery(@RequestBody HcInvoiceQueryVo hcInvoiceQueryVo) {
         return noCarService.hcinvoicequery(hcInvoiceQueryVo);
     }
 
@@ -70,7 +70,7 @@ public class NoCarServiceController {
     @PostMapping("/hCVoiceUpdate")
     @ApiOperation(value = "红冲发票更新接口", notes = "红冲发票更新接口")
     @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
-    public RespR hcvoiceupdate(@RequestBody HCInvoiceQueryVo hcInvoiceQueryVo) {
+    public RespR hcvoiceupdate(@RequestBody HcInvoiceQueryVo hcInvoiceQueryVo) {
         return noCarService.hcinvoiceupdate(hcInvoiceQueryVo);
     }
 

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

@@ -6,7 +6,7 @@ import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.lowerservice.CheckHasAuthRole;
-import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
@@ -30,7 +30,7 @@ import java.util.List;
 @RequestMapping(value = {"/selfCarService"})
 public class SelfCarServiceController {
     @Autowired
-    SelfCarServiceL selfCarService;
+    SelfCarCustService selfCarService;
     @Autowired
     private CheckHasAuthRole checkHasAuthRole;
 

src/main/java/com/jkcredit/invoice/controller/user/AuthenticationController.java

@@ -5,7 +5,7 @@ import cn.hutool.json.JSONObject;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.user.AuthenticationService;
 import com.jkcredit.invoice.service.user.UserService;
-import com.jkcredit.invoice.util.MD5Util;
+import com.jkcredit.invoice.util.Md5Util;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -50,7 +50,7 @@ public class AuthenticationController {
             return new RespR<>(Boolean.FALSE, "该账号已被锁定");
         } else if (STATUS_UN == userInDataBase.getIsLock()) {
             return new RespR<>(Boolean.FALSE, "该账号已停用");
-        } else if (!StrUtil.equals(MD5Util.encrypt(password), userInDataBase.getPassword())) {
+        } else if (!StrUtil.equals(Md5Util.encrypt(password), userInDataBase.getPassword())) {
             return new RespR<>(Boolean.FALSE, "密码不正确");
         } else {
             //获取token

src/main/java/com/jkcredit/invoice/controller/user/UserController.java

@@ -5,7 +5,7 @@ import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.service.user.UserService;
-import com.jkcredit.invoice.util.MD5Util;
+import com.jkcredit.invoice.util.Md5Util;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -41,7 +41,7 @@ public class UserController {
             @ApiImplicitParam(name = "id", value = "用id", required = true, dataType = "Integer")
     })
     public RespR user(@PathVariable Integer id, User user) {
-        if (!AuthenticationInterceptor.AUTH_ADMIN.equals(user.getRoleId()) && !(user.getId().compareTo(id) == 0)) {
+        if (!AuthenticationInterceptor.AUTH_ADMIN.equals(user.getRoleId()) && (user.getId().compareTo(id) != 0)) {
             return new RespR<>(false, "无权限");
         }
         return new RespR<>(userService.selectUserById(id));
@@ -71,7 +71,7 @@ public class UserController {
     @ApiOperation(value = "新增用户详细信息", notes = "新增用户详细信息")
     @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR user(@RequestBody User user) {
-        user.setPassword(MD5Util.encrypt(user.getPassword()));
+        user.setPassword(Md5Util.encrypt(user.getPassword()));
         User user1 = userService.selectUserByUserName(user.getUserName());
         if (null != user1) {
             return new RespR<>(Boolean.FALSE, "该用户已存在");
@@ -90,7 +90,7 @@ public class UserController {
     @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateUser(@RequestBody User user) {
         if (user.getPassword() != null) {
-            user.setPassword(MD5Util.encrypt(user.getPassword()));
+            user.setPassword(Md5Util.encrypt(user.getPassword()));
         }
         return new RespR<>(userService.updateUserInfo(user));
     }
@@ -119,7 +119,7 @@ public class UserController {
     @ApiOperation(value = "重置密码", notes = "重置密码")
     @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateUserInfoPassWord(@RequestBody User user) {
-        user.setPassword(MD5Util.encrypt(user.getPassword()));
+        user.setPassword(Md5Util.encrypt(user.getPassword()));
         return userService.restPassword(user);
     }
 

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

@@ -28,7 +28,14 @@ public class InterfaceCheckServer {
     @Autowired
     StatisRequestIdTimeComp statisRequestIdTimeComp;
 
-    //跳转到对应的Service服务处理逻辑
+    /**
+     * 跳转到对应的Service服务处理逻辑
+     * @param appKey
+     * @param api
+     * @param data
+     * @param requestid
+     * @return
+     */
     public DataResult doJumpHandler(String appKey, String api, String data, String requestid) {
         log.info("[-InterfaceCheckServer.doJumpHandler-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
         long startTime = System.currentTimeMillis();
@@ -48,7 +55,8 @@ public class InterfaceCheckServer {
         DataResult result;
         switch (api) {
             //----------------------------自有车、无车公共接口---------------------------------//
-            case "COMPANY_ADD_V1"://无车、自有车企业注册
+            //无车、自有车企业注册
+            case "COMPANY_ADD_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -58,7 +66,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "PROTOCOL_ADD_V1"://无车、自有车协议上传
+            //无车、自有车协议上传
+            case "PROTOCOL_ADD_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -68,7 +77,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "COMPANY_QUERY_V1"://无车、自有车企业查询
+            //无车、自有车企业查询
+            case "COMPANY_QUERY_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -78,7 +88,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "PROTOCOL_STATUS_V1"://自有车 无车、协议上传状态查询
+            //自有车 无车、协议上传状态查询
+            case "PROTOCOL_STATUS_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -89,7 +100,8 @@ public class InterfaceCheckServer {
                 }
                 break;
             //----------------------------自有车下游接口---------------------------------//
-            case "CARD_BIND_QUERY_LIST_V1"://自有车 用户卡列表查询
+            //自有车 用户卡列表查询
+            case "CARD_BIND_QUERY_LIST_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -99,7 +111,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "CARD_QUERY_CARD_V1"://自有车 卡信息查询
+            //自有车 卡信息查询
+            case "CARD_QUERY_CARD_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -109,7 +122,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "CARD_BINDING_V1"://自有车 下发短信验证码
+            //自有车 下发短信验证码
+            case "CARD_BINDING_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -119,7 +133,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "CARD_VALID_CODE_V1"://自有车 卡绑定接口 渠道调用此接口，上传用户收到的短信验证码
+            //自有车 卡绑定接口 渠道调用此接口，上传用户收到的短信验证码
+            case "CARD_VALID_CODE_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -129,7 +144,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "CARD_TRADE_V1"://自有车 交易查询接口 渠道通过此接口可以查询单张卡连续90天内的交易（待开票、开票中、已开票）
+            //自有车 交易查询接口 渠道通过此接口可以查询单张卡连续90天内的交易（待开票、开票中、已开票）
+            case "CARD_TRADE_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -139,7 +155,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "B2B_INVOICE_APPLY_V1"://自有车 申请开票接口 渠道通过此接口可以对该公司绑定的单张卡连续90天内的交易进行开票。
+            //自有车 申请开票接口 渠道通过此接口可以对该公司绑定的单张卡连续90天内的交易进行开票。
+            case "B2B_INVOICE_APPLY_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -149,7 +166,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "B2B_INVOICE_QUERY_V1"://自有车 已开发票查询接口 渠道通过此接口可以根据该公司绑定的单张卡查询此卡在某个月开具的发票。
+            //自有车 已开发票查询接口 渠道通过此接口可以根据该公司绑定的单张卡查询此卡在某个月开具的发票。
+            case "B2B_INVOICE_QUERY_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -159,7 +177,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "B2B_INVOICE_APPL_QUERY_V1"://自有车 已开发票查询接口 根据开票id进行查询。
+            //自有车 已开发票查询接口 根据开票id进行查询。
+            case "B2B_INVOICE_APPL_QUERY_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -169,7 +188,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "B2B_INVOICE_PACKAGE_V1"://自有车 发票下载 渠道通过此接口可以下载某公司某个月份开具的发票。
+            //自有车 发票下载 渠道通过此接口可以下载某公司某个月份开具的发票。
+            case "B2B_INVOICE_PACKAGE_V1":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -179,20 +199,25 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "CARD_UNBIND_V1"://自有车 卡解绑接口。
+            //自有车 卡解绑接口。
+            case "CARD_UNBIND_V1":
                 result = selfCarInterService.customerCarUnRec(appKey, api, data, requestid);
                 break;
-            case "B2B_CHANGE_CARD_V1"://自有车 用户卡换绑。
+            //自有车 用户卡换绑。
+            case "B2B_CHANGE_CARD_V1":
                 result = selfCarInterService.customerCardChange(appKey, api, data, requestid);
                 break;
-            case "B2B_CHANGE_CARD_QUERY_V1"://自有车 用户卡换绑查询。
+            //自有车 用户卡换绑查询。
+            case "B2B_CHANGE_CARD_QUERY_V1":
                 result = selfCarInterService.customerCardChangeQuery(appKey, api, data, requestid);
                 break;
-            case "B2B_QUERY_TRADE_APPLY_V1"://自有车 按交易查申请。
+            //自有车 按交易查申请。
+            case "B2B_QUERY_TRADE_APPLY_V1":
                 result = selfCarInterService.tradeApplyQuery(appKey, api, data, requestid);
                 break;
             //----------------------------无车下游接口---------------------------------//
-            case "VEHICLE_REGISTER"://无车 车辆备案接口
+            //无车 车辆备案接口
+            case "VEHICLE_REGISTER":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -202,7 +227,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "VEHICLE_REGISTER_QUERY"://无车 车辆备案查询接口
+            //无车 车辆备案查询接口
+            case "VEHICLE_REGISTER_QUERY":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -212,7 +238,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "WAY_BILL_START"://无车 实时运单开始指令
+            //无车 实时运单开始指令
+            case "WAY_BILL_START":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -222,7 +249,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "WAY_BILL_END"://无车 实时运单结束指令
+            //无车 实时运单结束指令
+            case "WAY_BILL_END":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -232,7 +260,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "WAY_BILL_HISTORY_START"://无车 历史运单开始指令
+            //无车 历史运单开始指令
+            case "WAY_BILL_HISTORY_START":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -242,7 +271,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "WAY_BILL_HISTORY_END"://无车 历史运单结束指令
+            //无车 历史运单结束指令
+            case "WAY_BILL_HISTORY_END":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -252,10 +282,12 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "WAY_BILL_NUM_FIND_INVOICE"://无车  运单号查询发票数据
+            //无车  运单号查询发票数据
+            case "WAY_BILL_NUM_FIND_INVOICE":
                 result = noCarInterService.noCarVoiceQuery(appKey, api, data, requestid);
                 break;
-            case "FIND_NO_SEARCH_NUM"://无车  获取未查询过发票的运单编号
+            //无车  获取未查询过发票的运单编号
+            case "FIND_NO_SEARCH_NUM":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -265,7 +297,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "BALANCE_QUERY"://无车   账号余额查询接口
+            //无车   账号余额查询接口
+            case "BALANCE_QUERY":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -275,7 +308,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "RED_INK_INVOICE_QUERY"://无车  红冲发票查询接口
+            //无车  红冲发票查询接口
+            case "RED_INK_INVOICE_QUERY":
                 if (StatisRequestIdTimeComp.isLimit) {
                     log.info("InterfaceCheckServer.doJumpHandler,appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid + "=被拒绝");
                     result = resultTimeOut;
@@ -285,7 +319,8 @@ public class InterfaceCheckServer {
                     statisRequestIdTimeComp.removeReQuestIdAndTime(requestid);
                 }
                 break;
-            case "WAY_BILL_NUM_FIND_OWNER_INVOICE"://无车  运单号查询发票数据 透传上游
+            //无车  运单号查询发票数据 透传上游
+            case "WAY_BILL_NUM_FIND_OWNER_INVOICE":
                 result = noCarInterService.noCarVoiceOwnerQuery(appKey, api, data, requestid);
                 break;
             default:

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

@@ -36,7 +36,9 @@ public class SimpleCoreFilter implements Filter {
     private static final String PASS_API = "api=credit.sec.data";
     private static final String PASS_GATEWAY = "/gateway";
     private static final String PASS_REST = "/api/rest";
-    //全局定义ApiConstant
+    /**
+     * 全局定义ApiConstant
+     */
     private final static Map<String, String> API_MAPS = new HashMap<String, String>() {
         {
 

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

@@ -63,11 +63,16 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             log.info("[-CustomerInterLowerServiceImpl.customeInterRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
 
-            Integer interType = 0;//0-接口 1-平台 3.手工录入
-
-            String name = jsonObject.getString("name");//公司名称 companyName
-            String taxpayerCode = jsonObject.getString("taxplayerCode");//企业税号 companyReferencenum
-            String customerName = appKey;//客户名称
+            /**
+             * 0-接口 1-平台 3.手工录入
+             */
+            Integer interType = 0;
+            //公司名称 companyName
+            String name = jsonObject.getString("name");
+            //企业税号 companyReferencenum
+            String taxpayerCode = jsonObject.getString("taxplayerCode");
+            //客户名称
+            String customerName = appKey;
 
             Customer cust = customerMapper.selectByCustomerName(customerName);
 
@@ -87,17 +92,26 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
              * 运营范围
              */
             Integer operatingRangeType = jsonObject.getInteger("operatingRangeType");
-            String contact = jsonObject.getString("contact");//联系人
-            String tel = jsonObject.getString("tel");//联系人电话
-            String emergencyContact = jsonObject.getString("emergencyContact");//紧急联系人  companyLeader
-            String emergencyTel = jsonObject.getString("emergencyTel");//紧急联系人电话 companyLeaderPhone
-
-            String buyerName = jsonObject.getString("buyerName");//购方客户名称
-            String buyerTaxpayerCode = jsonObject.getString("buyerTaxpayerCode");//购方税号
-            String buyerAddr = jsonObject.getString("buyerAddr");//购方单位地址
-            String buyerTel = jsonObject.getString("buyerTel");//购方电话
-            String buyerBank = jsonObject.getString("buyerBank");//购方开户行
-            String buyerBankAccount = jsonObject.getString("buyerBankAccount");//购方银行账号
+            //联系人
+            String contact = jsonObject.getString("contact");
+            //联系人电话
+            String tel = jsonObject.getString("tel");
+            //紧急联系人  companyLeader
+            String emergencyContact = jsonObject.getString("emergencyContact");
+            //紧急联系人电话 companyLeaderPhone
+            String emergencyTel = jsonObject.getString("emergencyTel");
+            //购方客户名称
+            String buyerName = jsonObject.getString("buyerName");
+            //购方税号
+            String buyerTaxpayerCode = jsonObject.getString("buyerTaxpayerCode");
+            //购方单位地址
+            String buyerAddr = jsonObject.getString("buyerAddr");
+            //购方电话
+            String buyerTel = jsonObject.getString("buyerTel");
+            //购方开户行
+            String buyerBank = jsonObject.getString("buyerBank");
+            //购方银行账号
+            String buyerBankAccount = jsonObject.getString("buyerBankAccount");
 
 
             if (StringUtils.isEmpty(data) || null == jsonObject
@@ -171,19 +185,32 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
 
     private CustomerRec getCustomerRec(Integer interType, String name, String taxpayerCode, String customerName, Customer cust, Integer companyType, Integer operatingRangeType, String contact, String tel, String buyerAddr, String buyerTel, String buyerBank, String buyerBankAccount) {
         CustomerRec customerRec = new CustomerRec();
-        customerRec.setCustomerName(customerName);//客户名称
-        customerRec.setCompanyLeader(contact);//紧急联系人
-        customerRec.setCompanyLeaderPhone(tel);//紧急联系人电话
-        customerRec.setCompanyName(name);//企业名称
-        customerRec.setCompanyReferencenum(taxpayerCode);//企业税号
-        customerRec.setCompanyOpenbank(buyerBank);//公司开户行
-        customerRec.setCompanyOpenbankAcc(buyerBankAccount);//公司开户行电话
-        customerRec.setCompanyAdress(buyerAddr);//公司地址
-        customerRec.setCompanyPhone(buyerTel);//公司电话
-        customerRec.setInterType(interType);////0-接口 1-平台
-        customerRec.setBussinessType(String.valueOf(cust.getBussinessType()));//业务类型 0 -自有车 1-外协车 2-无车
-        customerRec.setOperatingRangeType(operatingRangeType);//运用类型
-        customerRec.setCompanyType(companyType);//所属类型
+        //客户名称
+        customerRec.setCustomerName(customerName);
+        //紧急联系人
+        customerRec.setCompanyLeader(contact);
+        //紧急联系人电话
+        customerRec.setCompanyLeaderPhone(tel);
+        //企业名称
+        customerRec.setCompanyName(name);
+        //企业税号
+        customerRec.setCompanyReferencenum(taxpayerCode);
+        //公司开户行
+        customerRec.setCompanyOpenbank(buyerBank);
+        //公司开户行电话
+        customerRec.setCompanyOpenbankAcc(buyerBankAccount);
+        //公司地址
+        customerRec.setCompanyAdress(buyerAddr);
+        //公司电话
+        customerRec.setCompanyPhone(buyerTel);
+        //0-接口 1-平台
+        customerRec.setInterType(interType);
+        //业务类型 0 -自有车 1-外协车 2-无车
+        customerRec.setBussinessType(String.valueOf(cust.getBussinessType()));
+        //运用类型
+        customerRec.setOperatingRangeType(operatingRangeType);
+        //所属类型
+        customerRec.setCompanyType(companyType);
         return customerRec;
     }
 
@@ -210,8 +237,10 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         try {
             log.info("[-CustomerInterLowerServiceImpl.customeInterRecQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyName = jsonObject.getString("companyName");//企业名称
-            String taxpayerCode = jsonObject.getString("taxplayerCode");//企业税号
+            //企业名称
+            String companyName = jsonObject.getString("companyName");
+            //企业税号
+            String taxpayerCode = jsonObject.getString("taxplayerCode");
             if (StringUtils.isEmpty(data) || null == jsonObject) {
                 return result;
             }
@@ -268,12 +297,18 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         try {
             log.info("[-CustomerInterLowerServiceImpl.customeProtocolUpLoad-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//公司编号
-            String serviceStartTime = jsonObject.getString("serviceStartTime");//服务开始时间
-            String serviceEndTime = jsonObject.getString("serviceEndTime");//服务结束时间
-            String contractFileName = jsonObject.getString("contractFileName");//协议文件名
-            String base64Str = jsonObject.getString("base64Str");//上传文件转换的base64
-            Integer serviceType = jsonObject.getInteger("serviceType");//协议类型
+            //公司编号
+            String companyNum = jsonObject.getString("companyNum");
+            //服务开始时间
+            String serviceStartTime = jsonObject.getString("serviceStartTime");
+            //服务结束时间
+            String serviceEndTime = jsonObject.getString("serviceEndTime");
+            //协议文件名
+            String contractFileName = jsonObject.getString("contractFileName");
+            //上传文件转换的base64
+            String base64Str = jsonObject.getString("base64Str");
+            //协议类型
+            Integer serviceType = jsonObject.getInteger("serviceType");
             if (StringUtils.isEmpty(data) || null == jsonObject) {
                 return result;
             }
@@ -333,15 +368,21 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
 
     private DataResult getDataResult(String appKey, String data, long costtimestart, DataResult result, String companyNum, String serviceStartTime, String serviceEndTime, String contractFileName, String base64Str, Integer serviceType) {
         CustomerRec customerRec = new CustomerRec();
-        customerRec.setServiceStartTime(DateUtil.getDistanceHoursFormat(serviceStartTime));//服务开始时间
-        customerRec.setServiceEndTime(DateUtil.getDistanceHoursFormat(serviceEndTime));//服务结束时间
-        customerRec.setServiceType(serviceType);//协议类型
-        customerRec.setLowerFileName(contractFileName);//协议名称
-        customerRec.setLowerBase64Str(base64Str);//协议base64编码
-        customerRec.setCustomerName(appKey);//客户名称
+        //服务开始时间
+        customerRec.setServiceStartTime(DateUtil.getDistanceHoursFormat(serviceStartTime));
+        //服务结束时间
+        customerRec.setServiceEndTime(DateUtil.getDistanceHoursFormat(serviceEndTime));
+        //协议类型
+        customerRec.setServiceType(serviceType);
+        //协议名称
+        customerRec.setLowerFileName(contractFileName);
+        //协议base64编码
+        customerRec.setLowerBase64Str(base64Str);
+        //客户名称
+        customerRec.setCustomerName(appKey);
         customerRec.setCompanyNum(companyNum);
-        customerRec.setInterType(0);//接口
-
+        //接口
+        customerRec.setInterType(0);
         List<CustomerRec> customerRecs = new ArrayList<CustomerRec>();
         customerRecs.add(customerRec);
         RespR rs = lowerService.customeRecUpload(customerRecs);
@@ -385,7 +426,8 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
         try {
             log.info("[-CustomerInterLowerServiceImpl.customeProtocolStatus-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//公司编号
+            //公司编号
+            String companyNum = jsonObject.getString("companyNum");
 
             if (StringUtils.isEmpty(data) || null == jsonObject) {
                 return result;
@@ -411,9 +453,11 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
 
 
             CustomerRec customerRec = new CustomerRec();
-            customerRec.setCustomerName(appKey);//客户名称
+            //客户名称
+            customerRec.setCustomerName(appKey);
             customerRec.setCompanyNum(companyNum);
-            customerRec.setInterType(0);//接口
+            //接口
+            customerRec.setInterType(0);
 
             RespR rs = lowerService.customeRecUploadStatus(customerRec);
             long costtimeend = System.currentTimeMillis();

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

@@ -16,7 +16,7 @@ import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.lowerservice.NoCarService;
-import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.HcInvoiceQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.util.DateUtil;
@@ -81,7 +81,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         // 差集 (list1 - list2)
         List<String> reduce1 = list1.stream().filter(item -> !list2.contains(item)).collect(toList());
         System.out.println("---差集 reduce1 (list1 - list2)---");
-        reduce1.parallelStream().forEach(System.out::println);    // 并集
+        // 并集
+        reduce1.parallelStream().forEach(System.out::println);
         List<String> listAll = list1.parallelStream().collect(toList());
         List<String> listAll2 = list2.parallelStream().collect(toList());
         listAll.addAll(listAll2);
@@ -123,9 +124,12 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.customerCarRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyName = jsonObject.getString("companyName");//企业名称 选输
-            String plateNumber = jsonObject.getString("plateNumber");//plateNumber 必输
-            String plateColor = jsonObject.getString("plateColor");//plateColor 必输
+            //企业名称 选输
+            String companyName = jsonObject.getString("companyName");
+            //plateNumber 必输
+            String plateNumber = jsonObject.getString("plateNumber");
+            //plateColor 必输
+            String plateColor = jsonObject.getString("plateColor");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(plateNumber)
                     || StringUtils.isEmpty(plateColor)
 
@@ -150,12 +154,14 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             }
             customerCarRec.setCompanyName(customerRec1.getCompanyName());
             customerCarRec.setCustomerName(customerRec1.getCustomerName());
-            customerCarRec.setBusinessType("2");//无车
+            //无车
+            customerCarRec.setBusinessType("2");
             customerCarRec.setCarColor(plateColor);
             customerCarRec.setCarNum(plateNumber);
             customerCarRec.setInterType(0);
             if (SELF_CAR.equals(customerCarRec.getCarColor())) {
-                customerCarRec.setServiceOperation(1);//默认运营车辆
+                //默认运营车辆
+                customerCarRec.setServiceOperation(1);
             }
 
             customerCarRecList.add(customerCarRec);
@@ -206,9 +212,12 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.customeRecUpperQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String waybillSource = jsonObject.getString("waybillSource");//备案来源 选输
-            String plateNumber = jsonObject.getString("plateNumber");//plateNumber 必输
-            String plateColor = jsonObject.getString("plateColor");//plateColor 必输
+            //备案来源 选输
+            String waybillSource = jsonObject.getString("waybillSource");
+            //plateNumber 必输
+            String plateNumber = jsonObject.getString("plateNumber");
+            //plateColor 必输
+            String plateColor = jsonObject.getString("plateColor");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(plateNumber)
                     || StringUtils.isEmpty(plateColor)
 
@@ -220,12 +229,15 @@ public class NoCarInterServiceImpl implements NoCarInterService {
 
             CustomerCarRec customerCarRec = new CustomerCarRec();
             Param param = paramService.getParamsByParamName("REQUEST_COMPANY_NUM");
-            customerCarRec.setCompanyNum(param.getParamValue());//无车，车辆备案，运单上传，运单查询都是统一用交科的企业编号;自有车用客户的企业编号
+            //无车，车辆备案，运单上传，运单查询都是统一用交科的企业编号;自有车用客户的企业编号
+            customerCarRec.setCompanyNum(param.getParamValue());
             customerCarRec.setCarColor(plateColor);
             customerCarRec.setCarNum(plateNumber);
             customerCarRec.setCustomerName(appKey);
-            customerCarRec.setBusinessType("2");//无车
-            customerCarRec.setInterType(8);//此处代表仅查询上游接口，无任何处理逻辑
+            //无车
+            customerCarRec.setBusinessType("2");
+            //此处代表仅查询上游接口，无任何处理逻辑
+            customerCarRec.setInterType(8);
 
             RespR rs = noCarService.customerCarRecQueryUpper(customerCarRec);
             long costtimeend = System.currentTimeMillis();
@@ -276,16 +288,26 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.noCarBillStart-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String num = jsonObject.getString("num");//运单编号 必选
-            String plateNumber = jsonObject.getString("plateNumber");//车牌号 必选
-            String plateColor = jsonObject.getString("plateColor");//车牌颜色 必选
-            String startTime = jsonObject.getString("startTime");//运单开始时间 必选
-            String sourceAddr = jsonObject.getString("sourceAddr");//运单开始地址 必选
-            String destAddr = jsonObject.getString("destAddr");//运单目的地址 必选
-            String predictEndTime = jsonObject.getString("predictEndTime");//运单预计完成时间 必选
-            Integer fee = jsonObject.getInteger("fee");//运单费用 必选
-            Integer titleType = jsonObject.getInteger("titleType");//发票抬头类型 必选
-            String taxplayerCode = jsonObject.getString("taxplayerCode");//税号 必选
+            //运单编号 必选
+            String num = jsonObject.getString("num");
+            //车牌号 必选
+            String plateNumber = jsonObject.getString("plateNumber");
+            //车牌颜色 必选
+            String plateColor = jsonObject.getString("plateColor");
+            //运单开始时间 必选
+            String startTime = jsonObject.getString("startTime");
+            //运单开始地址 必选
+            String sourceAddr = jsonObject.getString("sourceAddr");
+            //运单目的地址 必选
+            String destAddr = jsonObject.getString("destAddr");
+            //运单预计完成时间 必选
+            String predictEndTime = jsonObject.getString("predictEndTime");
+            //运单费用 必选
+            Integer fee = jsonObject.getInteger("fee");
+            //发票抬头类型 必选
+            Integer titleType = jsonObject.getInteger("titleType");
+            //税号 必选
+            String taxplayerCode = jsonObject.getString("taxplayerCode");
             if (StringUtils.isEmpty(data) || null == jsonObject
                     || StringUtils.isEmpty(num)
                     || StringUtils.isEmpty(plateNumber)
@@ -339,12 +361,15 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerCarRec.setCarNum(noCarWayBill.getPlateNum());
             customerCarRec.setCarColor(noCarWayBill.getPlateColor());
             customerCarRec.setCustomerName(appKey);
-            customerCarRec.setInterType(0);//接口
+            //接口
+            customerCarRec.setInterType(0);
             customerCarRec.setCompanyNum(customerRec.getCompanyNum());
             customerCarRec.setBusinessType("2");
-            customerCarRec.setServiceOperation(1);//默认运营车辆
+            //默认运营车辆
+            customerCarRec.setServiceOperation(1);
             noCarWayBill.setTitleType(2);
-            noCarWayBill.setInterType(0);//接口
+            //接口
+            noCarWayBill.setInterType(0);
             return getDataResult(data, costtimestart, result, noCarWayBill, customerCarRecs, customerCarRec);
         } catch (Exception e) {
             log.error("[-NoCarInterServiceImpl.noCarBillStart-] get httpclient exception is "
@@ -408,9 +433,12 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.noCarBillEnd-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String num = jsonObject.getString("num");//运单号 必输
-            String realDestAddr = jsonObject.getString("realDestAddr");//运单实际目的地址 必输
-            String endTime = jsonObject.getString("endTime");//运单实际结束时间 必输
+            //运单号 必输
+            String num = jsonObject.getString("num");
+            //运单实际目的地址 必输
+            String realDestAddr = jsonObject.getString("realDestAddr");
+            //运单实际结束时间 必输
+            String endTime = jsonObject.getString("endTime");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(num)
                     || StringUtils.isEmpty(realDestAddr)
                     || StringUtils.isEmpty(endTime)
@@ -432,7 +460,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setDestAddr(realDestAddr);
             noCarWayBill.setPredictEndTime(DateUtil.getDistanceHoursFormat(endTime));
             noCarWayBill.setHisFlag(0);
-            noCarWayBill.setInterType(0);//接口
+            //接口
+            noCarWayBill.setInterType(0);
             RespR rs = noCarService.noCarWaybillEnd(noCarWayBill);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarBillEnd-] result is "
@@ -475,16 +504,26 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillStart-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String num = jsonObject.getString("num");//运单编号 必选
-            String plateNumber = jsonObject.getString("plateNumber");//车牌号 必选
-            String plateColor = jsonObject.getString("plateColor");//车牌颜色 必选
-            String startTime = jsonObject.getString("startTime");//运单开始时间 必选
-            String sourceAddr = jsonObject.getString("sourceAddr");//运单开始地址 必选
-            String destAddr = jsonObject.getString("destAddr");//运单目的地址 必选
-            String predictEndTime = jsonObject.getString("predictEndTime");//运单预计完成时间 必选
-            Integer fee = jsonObject.getInteger("fee");//运单费用 必选
-            Integer titleType = jsonObject.getInteger("titleType");//发票抬头类型 必选
-            String taxplayerCode = jsonObject.getString("taxplayerCode");//税号 必选
+            //运单编号 必选
+            String num = jsonObject.getString("num");
+            //车牌号 必选
+            String plateNumber = jsonObject.getString("plateNumber");
+            //车牌颜色 必选
+            String plateColor = jsonObject.getString("plateColor");
+            //运单开始时间 必选
+            String startTime = jsonObject.getString("startTime");
+            //运单开始地址 必选
+            String sourceAddr = jsonObject.getString("sourceAddr");
+            //运单目的地址 必选
+            String destAddr = jsonObject.getString("destAddr");
+            //运单预计完成时间 必选
+            String predictEndTime = jsonObject.getString("predictEndTime");
+            //运单费用 必选
+            Integer fee = jsonObject.getInteger("fee");
+            //发票抬头类型 必选
+            Integer titleType = jsonObject.getInteger("titleType");
+            //税号 必选
+            String taxplayerCode = jsonObject.getString("taxplayerCode");
             if (StringUtils.isEmpty(data) || null == jsonObject
                     || StringUtils.isEmpty(num)
                     || StringUtils.isEmpty(plateNumber)
@@ -532,7 +571,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setHisFlag(1);
             noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
             noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
-            noCarWayBill.setInterType(0);//接口
+            //接口
+            noCarWayBill.setInterType(0);
             List<CustomerCarRec> customerCarRecs = new ArrayList<>();
             CustomerCarRec customerCarRec = new CustomerCarRec();
             customerCarRec.setCompanyName(noCarWayBill.getCompanyName());
@@ -542,7 +582,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerCarRec.setInterType(0);
             customerCarRec.setCompanyNum(customerRec.getCompanyNum());
             customerCarRec.setBusinessType("2");
-            customerCarRec.setServiceOperation(1);//默认运营车辆
+            //默认运营车辆
+            customerCarRec.setServiceOperation(1);
             noCarWayBill.setTitleType(2);
             //先查询上游是否已经备案
             RespR<VehicleQueryResponse> respRquery = noCarService.customerCarRecQueryUpper(customerCarRec);
@@ -580,7 +621,10 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         return result;
     }
 
-    //插入或者更新运单
+    /**
+     * 插入或者更新运单
+     * @param noCarWayBill
+     */
     public void insertOrUpdateBillStart(NoCarWayBill noCarWayBill) {
         noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
@@ -617,9 +661,12 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String num = jsonObject.getString("num");//运单号 必输
-            String realDestAddr = jsonObject.getString("realDestAddr");//运单实际目的地址 必输
-            String endTime = jsonObject.getString("endTime");//运单实际结束时间 必输
+            //运单号 必输
+            String num = jsonObject.getString("num");
+            //运单实际目的地址 必输
+            String realDestAddr = jsonObject.getString("realDestAddr");
+            //运单实际结束时间 必输
+            String endTime = jsonObject.getString("endTime");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(num)
                     || StringUtils.isEmpty(realDestAddr)
                     || StringUtils.isEmpty(endTime)
@@ -642,7 +689,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             noCarWayBill.setPredictEndTime(DateUtil.getDistanceHoursFormat(endTime));
             noCarWayBill.setHisFlag(1);
             noCarWayBill.setCustomerName(appKey);
-            noCarWayBill.setInterType(0);//接口
+            //接口
+            noCarWayBill.setInterType(0);
             RespR rs = noCarService.noCarHisWaybillEnd(noCarWayBill);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.noCarHisWaybillEnd-] result is "
@@ -689,7 +737,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.noCarVoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String num = jsonObject.getString("num");//运单号 必输
+            //运单号 必输
+            String num = jsonObject.getString("num");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(num)
 
             ) {
@@ -887,10 +936,14 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.redInkInvoiceQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String taxplayerCode = jsonObject.getString("taxplayerCode");//企业税号 必输
-            String month = jsonObject.getString("month");//开票月份 样例：yyyy-MM   必输
-            Long pageNo = jsonObject.getLong("pageNo");//查询第几页  示例1,2,3,4…
-            Long pageSize = jsonObject.getLong("pageSize");//查询第几页  示例1,2,3,4… 没有就默认1000
+            //企业税号 必输
+            String taxplayerCode = jsonObject.getString("taxplayerCode");
+            //开票月份 样例：yyyy-MM   必输
+            String month = jsonObject.getString("month");
+            //查询第几页  示例1,2,3,4…
+            Long pageNo = jsonObject.getLong("pageNo");
+            //查询第几页  示例1,2,3,4… 没有就默认1000
+            Long pageSize = jsonObject.getLong("pageSize");
 
             if (StringUtils.isEmpty(data) || null == jsonObject) {
                 return result;
@@ -904,7 +957,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg("日期格式不正确！");
                 return result;
             }
-            HCInvoiceQueryVo hcInvoiceQueryVo = new HCInvoiceQueryVo();
+            HcInvoiceQueryVo hcInvoiceQueryVo = new HcInvoiceQueryVo();
             hcInvoiceQueryVo.setBuyerTaxpayerCode(taxplayerCode);
             hcInvoiceQueryVo.setMonth(month);
             hcInvoiceQueryVo.setPageSize(pageSize);
@@ -956,7 +1009,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         try {
             log.info("[-NoCarInterServiceImpl.noCarVoiceOwnerQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String num = jsonObject.getString("num");//运单号 必输
+            //运单号 必输
+            String num = jsonObject.getString("num");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(num)
 
             ) {

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

@@ -10,7 +10,7 @@ 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;
-import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
@@ -35,7 +35,7 @@ import static com.jkcredit.invoice.common.CommonConst.TWO_NUM;
 public class SelfCarInterServiceImpl implements SelfCarInterService {
 
     @Autowired
-    SelfCarServiceL selfCarService;
+    SelfCarCustService selfCarService;
 
     @Autowired
     CustomerRecService customerRecMapper;
@@ -63,10 +63,14 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerETCQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String cardId = jsonObject.getString("cardId");//卡号  非必输
-            String plateNum = jsonObject.getString("plateNum");//车牌号 非必输
-            Integer plateColor = jsonObject.getInteger("plateColor");//车牌颜色 非必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //卡号  非必输
+            String cardId = jsonObject.getString("cardId");
+            //车牌号 非必输
+            String plateNum = jsonObject.getString("plateNum");
+            //车牌颜色 非必输
+            Integer plateColor = jsonObject.getInteger("plateColor");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)) {
                 result.setData(3);
                 result.setMsg("请输入必输项!");
@@ -85,11 +89,16 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             }
 
             EtcQueryVo etcQueryVo = new EtcQueryVo();
-            etcQueryVo.setCustomerName(appKey);//客户名称
-            etcQueryVo.setCompanyName(customerRec1.getCompanyName());//企业名称
-            etcQueryVo.setPlateNum(plateNum);//车牌号 非必输
-            etcQueryVo.setCardId(cardId);//卡号 非必输
-            etcQueryVo.setPlateColor(plateColor);//车牌颜色 非必输
+            //客户名称
+            etcQueryVo.setCustomerName(appKey);
+            //企业名称
+            etcQueryVo.setCompanyName(customerRec1.getCompanyName());
+            //车牌号 非必输
+            etcQueryVo.setPlateNum(plateNum);
+            //卡号 非必输
+            etcQueryVo.setCardId(cardId);
+            //车牌颜色 非必输
+            etcQueryVo.setPlateColor(plateColor);
             RespR rs = selfCarService.getEtcInfo(etcQueryVo);
             long costtimeend = System.currentTimeMillis();
             log.info("[-SelfCarInterServiceImpl.customerETCQuery-] result is "
@@ -144,8 +153,10 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerQueryEtcInfo-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            JSONArray vehicleList = jsonObject.getJSONArray("vehicleList");//车牌的json字符串 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //车牌的json字符串 必输
+            JSONArray vehicleList = jsonObject.getJSONArray("vehicleList");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || null == vehicleList
             ) {
@@ -165,14 +176,18 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             }
 
             EtcBindVo etcQueryVo = new EtcBindVo();
-            etcQueryVo.setCustomerName(appKey);//客户名称
-            etcQueryVo.setCompanyName(customerRec1.getCompanyName());//企业名称
+            //客户名称
+            etcQueryVo.setCustomerName(appKey);
+            //企业名称
+            etcQueryVo.setCompanyName(customerRec1.getCompanyName());
 
             List<CarVo> cards = new ArrayList<CarVo>();
             for (int i = 0; i < vehicleList.size(); i++) {
                 JSONObject jb = vehicleList.getJSONObject(i);
-                String plateNum = jb.getString("plateNum");//车牌号
-                Integer plateColor = jb.getInteger("plateColor");//车牌颜色
+                //车牌号
+                String plateNum = jb.getString("plateNum");
+                //车牌颜色
+                Integer plateColor = jb.getInteger("plateColor");
                 if (null == jb || StringUtils.isEmpty(plateNum)
                         || null == plateColor
                 ) {
@@ -237,9 +252,12 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerETCRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String mobile = jsonObject.getString("mobile");//企业预留手机号 必输
-            JSONArray cardIdList = jsonObject.getJSONArray("cardIdList");//ETC卡编号列表 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //企业预留手机号 必输
+            String mobile = jsonObject.getString("mobile");
+            //ETC卡编号列表 必输
+            JSONArray cardIdList = jsonObject.getJSONArray("cardIdList");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(mobile)
                     || null == cardIdList
@@ -260,13 +278,17 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
                 return result;
             }
             EtcBindVo etcQueryVo = new EtcBindVo();
-            etcQueryVo.setCustomerName(appKey);//客户名称
-            etcQueryVo.setCompanyName(customerRec1.getCompanyName());//企业名称
-            etcQueryVo.setMobile(mobile);//企业预留手机号
+            //客户名称
+            etcQueryVo.setCustomerName(appKey);
+            //企业名称
+            etcQueryVo.setCompanyName(customerRec1.getCompanyName());
+            //企业预留手机号
+            etcQueryVo.setMobile(mobile);
             List<CarVo> cards = new ArrayList<CarVo>();
             for (int i = 0; i < cardIdList.size(); i++) {
                 JSONObject jb = cardIdList.getJSONObject(i);
-                String cardId = jb.getString("cardId");//用户卡Id
+                //用户卡Id
+                String cardId = jb.getString("cardId");
 
                 if (null == jb || StringUtils.isEmpty(cardId)
                 ) {
@@ -328,9 +350,12 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerETCRecValid-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String mobile = jsonObject.getString("mobile");//企业预留手机号 必输
-            String validCode = jsonObject.getString("validCode");//验证码 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //企业预留手机号 必输
+            String mobile = jsonObject.getString("mobile");
+            //验证码 必输
+            String validCode = jsonObject.getString("validCode");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(mobile)
                     || StringUtils.isEmpty(validCode)
@@ -355,7 +380,8 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             etcValidVo.setCompanyName(customerRec1.getCompanyName());
             etcValidVo.setValidCode(validCode);
             etcValidVo.setMobile(mobile);
-            etcValidVo.setInterType(0);//接口
+            //接口
+            etcValidVo.setInterType(0);
 
             RespR rs = selfCarService.customerEtcRecValid(etcValidVo);
             long costtimeend = System.currentTimeMillis();
@@ -404,11 +430,16 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.getTradeList-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String cardId = jsonObject.getString("cardId");//卡号 必输
-            Integer tradeStatus = jsonObject.getInteger("tradeStatus");//交易状态 必输
-            String startExTime = jsonObject.getString("startExTime");//开始时间 必输
-            String endExTime = jsonObject.getString("endExTime");//结束时间 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //卡号 必输
+            String cardId = jsonObject.getString("cardId");
+            //交易状态 必输
+            Integer tradeStatus = jsonObject.getInteger("tradeStatus");
+            //开始时间 必输
+            String startExTime = jsonObject.getString("startExTime");
+            //结束时间 必输
+            String endExTime = jsonObject.getString("endExTime");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
                     || null == tradeStatus
@@ -447,7 +478,8 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             tradeRequestVo.setEndTime(DateUtil.getDistanceHoursFormat(endExTime));
             tradeRequestVo.setEtcId(cardId);
             tradeRequestVo.setTradeStatus(tradeStatus);
-            tradeRequestVo.setInterType(0);//0 接口
+            //0 接口
+            tradeRequestVo.setInterType(0);
 
             if (tradeRequestVo.getTradeStatus() == null) {
                 tradeRequestVo.setTradeStatus(1);
@@ -523,9 +555,12 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.applInvoice-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String cardId = jsonObject.getString("cardId");//卡号 必输
-            JSONArray tradeIdModel = jsonObject.getJSONArray("tradeIdModel");//交易ID集合 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //卡号 必输
+            String cardId = jsonObject.getString("cardId");
+            //交易ID集合 必输
+            JSONArray tradeIdModel = jsonObject.getJSONArray("tradeIdModel");
 
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
@@ -549,13 +584,15 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             invoiceApplVo.setCustomerName(appKey);
             invoiceApplVo.setCompanyName(customerRec1.getCompanyName());
             invoiceApplVo.setCardId(cardId);
-            invoiceApplVo.setInterType(0);//接口
+            //接口
+            invoiceApplVo.setInterType(0);
 
 
             List<String> tradeIds = new ArrayList<String>();
             for (int i = 0; i < tradeIdModel.size(); i++) {
                 JSONObject jb = tradeIdModel.getJSONObject(i);
-                String tradeId = jb.getString("tradeId");//交易ID
+                //交易ID
+                String tradeId = jb.getString("tradeId");
                 if (null == jb || StringUtils.isEmpty(tradeId)
                 ) {
                     return result;
@@ -602,9 +639,12 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicesByAppl-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String cardId = jsonObject.getString("cardId");//卡号 必输
-            String applyId = jsonObject.getString("applyId");//申请id 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //卡号 必输
+            String cardId = jsonObject.getString("cardId");
+            //申请id 必输
+            String applyId = jsonObject.getString("applyId");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
                     || StringUtils.isEmpty(applyId)
@@ -676,10 +716,14 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicesByTime-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String cardId = jsonObject.getString("cardId");//卡号 必输
-            String startInvoiceMakeTime = jsonObject.getString("startInvoiceMakeTime");//开始时间 必输
-            String endInvoiceMakeTime = jsonObject.getString("endInvoiceMakeTime");//结束时间 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //卡号 必输
+            String cardId = jsonObject.getString("cardId");
+            //开始时间 必输
+            String startInvoiceMakeTime = jsonObject.getString("startInvoiceMakeTime");
+            //结束时间 必输
+            String endInvoiceMakeTime = jsonObject.getString("endInvoiceMakeTime");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
                     || StringUtils.isEmpty(startInvoiceMakeTime)
@@ -767,8 +811,10 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.getSelfCarInvoicePackage-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String makeMonth = jsonObject.getString("makeMonth");//发票开具月份 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //发票开具月份 必输
+            String makeMonth = jsonObject.getString("makeMonth");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(makeMonth)
 
@@ -843,8 +889,10 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.customerCarUnRec-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输
-            String cardId = jsonObject.getString("cardId");//Etc卡号 必输
+            //企业编号 必输
+            String companyNum = jsonObject.getString("companyNum");
+            //Etc卡号 必输
+            String cardId = jsonObject.getString("cardId");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
 
@@ -1011,9 +1059,12 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
         try {
             log.info("[-SelfCarInterServiceImpl.tradeApplyQuery-] request appKey=" + appKey + " ,api=" + api + " ,data=" + data + " ,requestid=" + requestid);
             JSONObject jsonObject = JSONObject.parseObject(data);
-            String companyNum = jsonObject.getString("companyNum");//企业编号 必输 不超过32个字符
-            String cardId = jsonObject.getString("cardId");//卡号 必输 20位数字字符
-            String tradeId = jsonObject.getString("tradeId");//交易ID 必输 字符串
+            //企业编号 必输 不超过32个字符
+            String companyNum = jsonObject.getString("companyNum");
+            //卡号 必输 20位数字字符
+            String cardId = jsonObject.getString("cardId");
+            //交易ID 必输 字符串
+            String tradeId = jsonObject.getString("tradeId");
             if (StringUtils.isEmpty(data) || null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
                     || StringUtils.isEmpty(tradeId)

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

@@ -11,13 +11,19 @@ public class Customer {
      */
     private Double fee = 5d;
 
-    //appKey
+    /**
+     * appKey
+     */
     private String customerName;
 
-    //appSecret
+    /**
+     * appSecret
+     */
     private String appSecret;
 
-    //无车最后一次扣费时间
+    /**
+     * 无车最后一次扣费时间
+     */
     private String invoiceTime;
 
     private Integer usenumAll;
@@ -35,7 +41,9 @@ public class Customer {
     private Integer integrationType = 0;
 
     private String firstSign;
-    //0 -正常 1-停用
+    /**
+     * 0 -正常 1-停用
+     */
     private Integer accstatus;
 
     private String company;

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

@@ -10,7 +10,9 @@ public class CustomerCarRec {
     private String companyName;
 
     private String companyNum;
-    //0 -自有车 1 -外协车 2 -无车
+    /**
+     * 0 -自有车 1 -外协车 2 -无车
+     */
     private String businessType;
 
     private String carNum;
@@ -18,7 +20,9 @@ public class CustomerCarRec {
      * 车辆颜色 蓝牌车需要 填运营类型
      **/
     private String carColor;
-    //运营类型,当为蓝牌车时为必填选项
+    /**
+     * 运营类型,当为蓝牌车时为必填选项
+     */
     private Integer serviceOperation;
     private String custPhone;
 
@@ -39,7 +43,10 @@ public class CustomerCarRec {
      */
     private Integer recStatus = 0;
 
-    private Integer interType = 1; //0-接口 1-平台
+    /**
+     * 0-接口 1-平台
+     */
+    private Integer interType = 1;
 
     private String failReason;
 

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

@@ -83,7 +83,10 @@ public class CustomerRec {
      */
     private Integer recStatus;
 
-    private Integer interType = 1; //0-接口 1-平台
+    /**
+     * 0-接口 1-平台
+     */
+    private Integer interType = 1;
 
     /**
      * 业务类型 0 -自有车 1-外协车 2-无车

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

@@ -183,7 +183,10 @@ public class NoCarWayBill implements Cloneable {
      */
     private String success;
 
-    private Integer interType = 1;//类型 0 接口 1平台 4 迁移取票完成
+    /**
+     * 类型 0 接口 1平台 4 迁移取票完成
+     */
+    private Integer interType = 1;
 
     public Integer getInterType() {
         return interType;

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

@@ -89,8 +89,10 @@ public class SelfCarTrade {
 
     private String days;
 
-
-    private Integer interType = 1; //0-接口 1-平台
+    /**
+     * 0-接口 1-平台
+     */
+    private Integer interType = 1;
 
     public Integer getInterType() {
         return interType;

src/main/java/com/jkcredit/invoice/model/vo/SearchInvoiceResultVo.java

@@ -67,7 +67,9 @@ public class SearchInvoiceResultVo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "车牌号")
     private String plateNum;
 
-    //    @Excel(name = "车型")
+    /**
+     * @Excel(name = "车型")
+     */
     @ApiModelProperty(value = "车型")
     private int vehicleType;
 
@@ -75,7 +77,9 @@ public class SearchInvoiceResultVo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "运单编号")
     private String waybillNum;
 
-    //    @Excel(name = "运单状态")
+    /**
+     *   @Excel(name = "运单状态")
+     */
     @ApiModelProperty(value = "运单状态")
     private int waybillStatus;
 

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

@@ -2,7 +2,7 @@ package com.jkcredit.invoice.service.lowerservice;
 
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
-import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.HcInvoiceQueryVo;
 import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.util.RespR;
 
@@ -81,7 +81,7 @@ public interface NoCarService {
      * @param hcInvoiceQueryVo
      * @return
      */
-    RespR hcinvoicequery(HCInvoiceQueryVo hcInvoiceQueryVo);
+    RespR hcinvoicequery(HcInvoiceQueryVo hcInvoiceQueryVo);
 
     /**
      * 红冲发票查询接口
@@ -89,7 +89,7 @@ public interface NoCarService {
      * @param hcInvoiceQueryVo
      * @return
      */
-    RespR hcinvoicequeryinter(HCInvoiceQueryVo hcInvoiceQueryVo);
+    RespR hcinvoicequeryinter(HcInvoiceQueryVo hcInvoiceQueryVo);
 
     /**
      * 红冲发票更新
@@ -97,7 +97,7 @@ public interface NoCarService {
      * @param hcInvoiceQueryVo
      * @return
      */
-    RespR hcinvoiceupdate(HCInvoiceQueryVo hcInvoiceQueryVo);
+    RespR hcinvoiceupdate(HcInvoiceQueryVo hcInvoiceQueryVo);
 
 
     /**

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

@@ -17,7 +17,7 @@ import java.util.List;
  * 自有车掉上游接口服务
  * @author mumuxigua
  */
-public interface SelfCarServiceL {
+public interface SelfCarCustService {
     /**
      * 获取交易列表
      *

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

@@ -26,7 +26,7 @@ import com.jkcredit.invoice.model.entity.invoice.HcInvoice;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.lowerservice.NoCarService;
-import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.HcInvoiceQueryVo;
 import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.HcInvoiceService;
@@ -118,7 +118,8 @@ public class NoCarServiceImpl implements NoCarService {
     public RespR customerCarRecForNoCar(List<CustomerCarRec> customerCarRecs, StringBuffer res, CustomerRec customerRec) {
         try {
 
-            String resprresult = "";//上游成功返回结果
+            //上游成功返回结果
+            String resprresult = "";
             for (CustomerCarRec customerCarRec : customerCarRecs) {
                 if (!customerRec.getBussinessType().equals(customerCarRec.getBusinessType())) {
                     res.append("#客户：" + customerCarRec.getCustomerName() + "企业:" + customerCarRec.getCompanyName() + "车辆:" + customerCarRec.getCarNum() + "业务类型错误");
@@ -164,7 +165,8 @@ public class NoCarServiceImpl implements NoCarService {
                     customerCarRec.setFailReason(respR.getMsg());
                     customerCarRec.setFailTime(DateUtil.getCurrentDateStr());
                 } else {
-                    resprresult = respR.getData().toString();//车辆备案成功
+                    //车辆备案成功
+                    resprresult = respR.getData().toString();
                     customerCarRec.setRecStatus(CommonConstants.REC_STATUS_SUC);
                     customerCarRec.setSuccTime(DateUtil.getCurrentDateStr());
                 }
@@ -200,14 +202,16 @@ public class NoCarServiceImpl implements NoCarService {
         VehicleQueryRequest vehicleQueryRequest = new VehicleQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         vehicleQueryRequest.setCompanyNum(companyNum);
-        vehicleQueryRequest.setWaybillSource(1);//1 无车承运人
+        //1 无车承运人
+        vehicleQueryRequest.setWaybillSource(1);
         vehicleQueryRequest.setPlateNum(customerCarRec.getCarNum());
         vehicleQueryRequest.setPlateColor(Integer.valueOf(customerCarRec.getCarColor()));
 
         RespR<VehicleQueryResponse> respR = noCarInterface.vehicleQuery(vehicleQueryRequest);
         if (respR.getCode() == 1) {
             log.info("车辆备案查询失败NoCarServiceImpl.customerCarRecQueryUpper{},msg{}", customerCarRec, respR.getMsg());
-        } else if (EIGHT_NUM != customerCarRec.getInterType()) {//此处表示仅适用接口查询，不走业务逻辑
+        } else if (EIGHT_NUM != customerCarRec.getInterType()) {
+            //此处表示仅适用接口查询，不走业务逻辑
             customerCarRec.setRecStatus(1);
             updateCustomerCarRec(customerCarRec);
         }
@@ -277,7 +281,10 @@ public class NoCarServiceImpl implements NoCarService {
         return new RespR(responseRespR.getData());
     }
 
-    //插入或者更新运单
+    /**
+     * 插入或者更新运单
+     * @param noCarWayBill
+     */
     public void insertOrUpdateBillStart(NoCarWayBill noCarWayBill) {
         noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
@@ -328,7 +335,8 @@ public class NoCarServiceImpl implements NoCarService {
             customerRecParm.setCustomerName(noCarWayBill.getCustomerName());
             CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecParm);
             if (customerRec == null || customerRec.getRecStatus() != 1) {
-                return new RespR(true);//
+                //
+                return new RespR(true);
             }
             noCarWayBill.setCompanyNum(customerRec.getCompanyNum());
             noCarWayBill.setCompanyAdress(customerRec.getCompanyAdress());
@@ -404,7 +412,10 @@ public class NoCarServiceImpl implements NoCarService {
         return new RespR(waybillEndResponseRespR.getData());
     }
 
-    //插入或者更新运单
+    /**
+     * 插入或者更新运单
+     * @param noCarWayBill
+     */
     public void insertOrUpdateBillEnd(NoCarWayBill noCarWayBill) {
         noCarWayBill.setInterfaceEndTime(DateUtil.getCurrentDateStr());
         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
@@ -419,7 +430,10 @@ public class NoCarServiceImpl implements NoCarService {
         }
     }
 
-    //插入或者更新运单
+    /**
+     * 插入或者更新运单
+     * @param noCarWayBill
+     */
     public void insertOrUpdateBill(NoCarWayBill noCarWayBill) {
         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
         NoCarWayBill curr = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
@@ -749,7 +763,7 @@ public class NoCarServiceImpl implements NoCarService {
     }
 
     @Override
-    public RespR hcinvoicequery(HCInvoiceQueryVo hcInvoiceQueryVo) {
+    public RespR hcinvoicequery(HcInvoiceQueryVo hcInvoiceQueryVo) {
         log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}", hcInvoiceQueryVo);
         HcInvoice hcInvoiceParam = new HcInvoice();
         hcInvoiceParam.setBuyerName(hcInvoiceQueryVo.getBuyerName());
@@ -758,13 +772,13 @@ public class NoCarServiceImpl implements NoCarService {
         if (hcInvoices == null) {
             hcInvoices = new ArrayList<>();
         }
-        Map<String, List<HcInvoice>> map = new HashMap<>();
+        Map<String, List<HcInvoice>> map = new HashMap<>(10);
         map.put("result", hcInvoices);
         return new RespR(map);
     }
 
     @Override
-    public RespR hcinvoicequeryinter(HCInvoiceQueryVo hcInvoiceQueryVo) {
+    public RespR hcinvoicequeryinter(HcInvoiceQueryVo hcInvoiceQueryVo) {
         Page page = new Page();
         page.setCurrent(hcInvoiceQueryVo.getPageNo());
         if (StringUtils.isEmpty(hcInvoiceQueryVo.getPageSize())) {
@@ -776,7 +790,7 @@ public class NoCarServiceImpl implements NoCarService {
         hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
         hcInvoiceParam.setYearMonth(hcInvoiceQueryVo.getMonth());
         IPage<HcInvoice> byPageAndWayBill = hcInvoiceService.findByPageAndWayBill(page, hcInvoiceParam);
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(10);
         map.put("result", byPageAndWayBill.getRecords());
         map.put("total", byPageAndWayBill.getTotal());
         map.put("pages", byPageAndWayBill.getPages());
@@ -785,7 +799,7 @@ public class NoCarServiceImpl implements NoCarService {
 
     @Override
     @Transactional
-    public RespR hcinvoiceupdate(HCInvoiceQueryVo hcInvoiceQueryVo) {
+    public RespR hcinvoiceupdate(HcInvoiceQueryVo hcInvoiceQueryVo) {
         log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}", hcInvoiceQueryVo);
         WaybillInvoiceRedQueryRequest redQueryRequest = new WaybillInvoiceRedQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();

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

@@ -23,7 +23,7 @@ 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.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.service.upservice.SelfCarInterface;
 import com.jkcredit.invoice.util.DateUtil;
@@ -47,7 +47,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class SelfCarServiceLImpl implements SelfCarServiceL {
+public class SelfCarCustServiceImpl implements SelfCarCustService {
     @Autowired
     SelfCarInterface selfCarInterface;
     @Autowired
@@ -210,8 +210,10 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
                 carCalculateInfor.setCustomId(customerRec.getCustomerName());
                 carCalculateInfor.setCompanyNum(customerRec.getCompanyNum());
-                carCalculateInfor.setCompanyName(customerRec.getCompanyName());//公司名称
-                carCalculateInfor.setCompanyLongName(customerRec.getCompanyBelongName());//主体名称
+                //公司名称
+                carCalculateInfor.setCompanyName(customerRec.getCompanyName());
+                //主体名称
+                carCalculateInfor.setCompanyLongName(customerRec.getCompanyBelongName());
                 carCalculateInfor.setCalTime(StringUtils.substring(selfCarTrade.getExTime(), 0, 7));
                 carCalculateInfor.setFee(customer.getFee());
                 carCalculateInfor.setCompanyReferencenum(customerRec.getCompanyReferencenum());
@@ -339,10 +341,14 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             return new RespR(false, "客户未备案");
         }
         CardBindQueryListToBRequest list = new CardBindQueryListToBRequest();
-        list.setCompanyNum(customerRec.getCompanyNum());//企业编号，必输
-        list.setCardId(etcQueryVo.getCardId());//卡户 ,非必输
-        list.setPlateNum(etcQueryVo.getPlateNum());//车牌号,非必输
-        list.setPalteColor(etcQueryVo.getPlateColor());//车牌颜色.非必输
+        //企业编号，必输
+        list.setCompanyNum(customerRec.getCompanyNum());
+        //卡户 ,非必输
+        list.setCardId(etcQueryVo.getCardId());
+        //车牌号,非必输
+        list.setPlateNum(etcQueryVo.getPlateNum());
+        //车牌颜色.非必输
+        list.setPalteColor(etcQueryVo.getPlateColor());
         RespR<CardBindQueryListToBResponse> respR = selfCarInterface.cardBindQueryListToB(list);
         if (respR.getCode() == 1) {
             log.info("获取etc信息失败：SelfCarServiceLImpl.getEtcInfo{},msg{}", etcQueryVo, respR.getMsg());

src/main/java/com/jkcredit/invoice/service/lowerservice/vo/EtcValidVo.java

@@ -26,7 +26,10 @@ public class EtcValidVo {
     private String validCode;
 
 
-    private Integer interType = 1; //0-接口 1-平台
+    /**
+     * 0-接口 1-平台
+     */
+    private Integer interType = 1;
 
 
     public String getMobile() {

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

@@ -4,7 +4,7 @@ package com.jkcredit.invoice.service.lowerservice.vo;
  * 红冲发票查询
  * @author mumuxigua
  */
-public class HCInvoiceQueryVo {
+public class HcInvoiceQueryVo {
     /**
      * 客户名称
      */

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

@@ -5,19 +5,31 @@ package com.jkcredit.invoice.service.lowerservice.vo;
  * @author mumuxigua
  */
 public class MonthAccountQueryVo {
-    //客户名称
+    /**
+     * 客户名称
+     */
     private String customeName;
-    //企业名称
+    /**
+     * 企业名称
+     */
     private String companyName;
-    //企业税号
+    /**
+     * 企业名称
+     */
     private String taxCode;
-    //交易匹配月份
+    /**
+     * 交易匹配月份
+     */
     private String tradeMonth;
 
-    //交易来源
+    /**
+     * 交易来源
+     */
     private int waybillSource = 1;
 
-    //页码
+    /**
+     * 页码
+     */
     private int pageNo;
 
     public String getCustomeName() {

src/main/java/com/jkcredit/invoice/service/lowerservice/vo/TradeRequestVo.java

@@ -10,10 +10,15 @@ public class TradeRequestVo {
     private String companyName;
     private String customerName;
     private String etcId;
-    private Integer interType = 1;//0 接口 1平台
-    /*待开票	1
-    开票中	2
-    已开票	3*/
+    /**
+     * 0 接口 1平台
+     */
+    private Integer interType = 1;
+    /**
+      待开票	1
+      开票中	2
+      已开票	3
+    */
     private Integer tradeStatus;
 
 

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

@@ -71,7 +71,10 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper, NoC
         return noCarWaybillMapper.selectAllByPageException(page, noCarWayBill);
     }
 
-    //插入或者更新运单
+    /**
+     * 插入或者更新运单
+     * @param noCarWayBill
+     */
     public void insertOrUpdateBillStart(NoCarWayBill noCarWayBill) {
         noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());

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

@@ -2,7 +2,7 @@ package com.jkcredit.invoice.service.selfcar.impl;
 
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
-import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.selfcar.SelfCarService;
 import com.jkcredit.invoice.util.RespR;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ import java.util.List;
 @Service
 public class SelfCarServiceImpl implements SelfCarService {
     @Autowired
-    SelfCarServiceL selfCarService;
+    SelfCarCustService selfCarService;
     @Autowired
     CustomerCarRecMapper customerCarRecMapper;
 

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
-import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.TradeRequestVo;
 import com.jkcredit.invoice.service.selfcar.SelfCarTradeService;
 import com.jkcredit.invoice.util.DateUtil;
@@ -28,7 +28,7 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper, Sel
     @Autowired
     SellCarTradeMapper sellCarTradeMapper;
     @Autowired
-    SelfCarServiceL selfCarService;
+    SelfCarCustService selfCarService;
 
     @Override
     public IPage<List<SelfCarTrade>> findByPageAndTrade(Page page, SelfCarTrade selfCarTrade) {
@@ -60,7 +60,7 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper, Sel
 
     @Override
     public boolean updateTrades(List<SelfCarTrade> selfCarTrades) {
-        Map<String, TradeRequestVo> map = new HashMap<>();
+        Map<String, TradeRequestVo> map = new HashMap<>(10);
         selfCarTrades.forEach(selfCarTrade -> {
             TradeRequestVo tradeRequestVo = map.get(selfCarTrade.getCardId());
             if (tradeRequestVo == null) {

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

@@ -8,7 +8,7 @@ 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.SelfCarCustService;
 import com.jkcredit.invoice.service.lowerservice.vo.SelfCarDueQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.selfcar.SelfCarTradeService;
@@ -51,7 +51,7 @@ public class ScheduledBillTask {
     NoCarService noCarService;
 
     @Autowired
-    SelfCarServiceL selfCarService;
+    SelfCarCustService selfCarService;
 
     @Autowired
     CustomerCarRecMapper customerCarRecMapper;
@@ -150,7 +150,10 @@ public class ScheduledBillTask {
         }
     }
 
-    //@Scheduled(cron = "0 0 23 * * ?", zone = "Asia/Shanghai")
+    /**
+     * @Scheduled(cron = "0 0 23 * * ?", zone = "Asia/Shanghai")
+     * @throws Exception
+     */
     public void getSefCarInvoice() throws Exception {
         InetAddress addr = InetAddress.getLocalHost();
         String ip = paramService.getParamsByParamName("CURR_SELF_IP").getParamValue();

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

@@ -47,7 +47,13 @@ public class Base64Util {
         return Base64.encodeBase64String(totalbyte);
     }
 
-    //合并数组
+    /**
+     * 合并数组
+     * @param totalArr
+     * @param mergerArr
+     * @param mergerLen
+     * @return
+     */
     public static byte[] byteMerger(byte[] totalArr, byte[] mergerArr, int mergerLen) {
         if (null == totalArr || null == mergerArr) {
             return totalArr;
@@ -62,7 +68,12 @@ public class Base64Util {
         return reArr;
     }
 
-    //根据 url 获取输入流
+    /**
+     * 根据 url 获取输入流
+     * @param path
+     * @return
+     * @throws IOException
+     */
     public static InputStream getStream(String path) throws IOException {
         File file = new File(path);
         InputStream in = new FileInputStream(file);
@@ -144,13 +155,14 @@ public class Base64Util {
     }
 
 
-    /*
+    /**
      * 将base64编码转换成PDF
      * @param base64sString
-     * 1.使用BASE64Decoder对编码的字符串解码成字节数组
-     *  2.使用底层输入流ByteArrayInputStream对象从字节数组中获取数据；
-     *  3.建立从底层输入流中读取数据的BufferedInputStream缓冲输出流对象；
-     *  4.使用BufferedOutputStream和FileOutputSteam输出数据到指定的文件中
+     *     1.使用BASE64Decoder对编码的字符串解码成字节数组
+     *     2.使用底层输入流ByteArrayInputStream对象从字节数组中获取数据；
+     *     3.建立从底层输入流中读取数据的BufferedInputStream缓冲输出流对象；
+     *     4.使用BufferedOutputStream和FileOutputSteam输出数据到指定的文件中
+     * @param base64sString
      */
     public static void base64StringToPdf(String base64sString) {
         BufferedInputStream bin = null;

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

@@ -11,14 +11,20 @@ import java.util.Base64;
  */
 public class Base64Utils {
 
-    // Base64 编码与解码
+    /**
+     * Base64 编码与解码
+     */
     private static final Base64.Decoder DECODER_64 = Base64.getDecoder();
     private static final Base64.Encoder ENCODER_64 = Base64.getEncoder();
 
-    // dpi越大转换后的图片越清晰，相对转换速度越慢
+    /**
+     * dpi越大转换后的图片越清晰，相对转换速度越慢
+     */
     private static final Integer DPI = 200;
 
-    // 编码、解码格式
+    /**
+     * 编码、解码格式
+     */
     private static final String CODE_FORMATE = "UTF-8";
 
     /**
@@ -147,7 +153,6 @@ public class Base64Utils {
     }
 
 
-    // 测试
     public static void main(String[] args) {
         // 1.测试：text明文 转 Base64字符串
         String text = "这是一串需要编码的明文，可以是URL、图片、文件或其他。";

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

@@ -8,7 +8,7 @@ import java.security.MessageDigest;
  * @create: 2019-06-24 16:55
  * @version: V1.0
  **/
-public class MD5Util {
+public class Md5Util {
 
     public final static String encrypt(String s) {
         char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};

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

@@ -11,7 +11,7 @@ import java.util.Iterator;
 /**
  * @author mashengyi
  */
-public class QueryDemo_Test {
+public class QueryDemoTest {
 
     /**
      * 测试地址
@@ -39,7 +39,7 @@ public class QueryDemo_Test {
      * @param args
      */
     public static void main(String[] args) throws Exception {
-        QueryDemo_Test demo = new QueryDemo_Test();
+        QueryDemoTest demo = new QueryDemoTest();
         demo.runMainService();
     }
 
@@ -95,7 +95,8 @@ public class QueryDemo_Test {
          * 基本参数
          */
         JSONObject paramJsonObj = new JSONObject();
-        paramJsonObj.put("api", "PROTOCOL_ADD_V1");//CMCC_MOBILE_CHECK_V8//CMCC_3RD_V2//CMCC_3RD_DETAIL_V1//
+        //CMCC_MOBILE_CHECK_V8//CMCC_3RD_V2//CMCC_3RD_DETAIL_V1//
+        paramJsonObj.put("api", "PROTOCOL_ADD_V1");
         paramJsonObj.put("appKey", APP_KEY);
         paramJsonObj.put("appSecret", APP_SECRET);