20211205后端日志更新代码_2

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

@@ -105,6 +105,10 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 customerRec.setCustomerName(appKey);
                 customerRec.setCompanyName(cust.getCompany());
                 CustomerRec customerRec1 =  customerRecMapper.selectByCustomerNameAndCompanyConcat(customerRec);
+                if(null == customerRec1){
+                    result.setMsg("该客户: "+appKey+" 未备案企业");
+                    return result;
+                }
                 customerCarRec.setCompanyName(customerRec1.getCompanyName());
                 customerCarRec.setCustomerName(customerRec1.getCustomerName());
             customerCarRec.setBusinessType("2");//无车
@@ -196,11 +200,13 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                     result.setData(2);
                     result.setMsg("车辆未备案");
                 }
+                result.setData(1);
+                result.setMsg("车辆已备案");
                 return result;
             } else {
                 result.setData(3);
                 result.setCode(200);
-                result.setMsg(rs.getMsg());
+                result.setMsg("查询失败");
                 return result;
             }
         } catch (Exception e) {

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

@@ -88,7 +88,7 @@ public class NoCarServiceImpl implements NoCarService{
         customerRecP.setCustomerName(customerCarRec2.getCustomerName());
         customerRecP.setCompanyName(customerCarRec2.getCompanyName());
         CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
-        if(customerRec == null || customerRec.getRecStatus()!=1){
+        if(customerRec == null){
             res.append("#客户："+customerCarRec2.getCustomerName()+"企业:"+customerCarRec2.getCompanyName()+"备案信息不存在");
             MIX_LOG.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
             return new RespR(false,res.toString());
@@ -111,6 +111,10 @@ public class NoCarServiceImpl implements NoCarService{
                 vehicleQueryRequest.setPlateColor(Integer.parseInt(customerCarRec.getCarColor()));
                 vehicleQueryRequest.setPlateNum(customerCarRec.getCarNum());
                 vehicleQueryRequest.setWaybillSource(1);
+
+
+                //如果是接口，直接调用上游车辆备案
+                if(0 != customerCarRec.getInterType() ){
                 RespR<VehicleQueryResponse> respRB = noCarInterface.vehicleQuery(vehicleQueryRequest);
                 if(respRB.getCode()!=1 && respRB.getData().getResult()!=null && respRB.getData().getResult().size()>0){
                     customerCarRec.setRecStatus(CommonConstants.REC_STATUS_SUC);
@@ -118,6 +122,7 @@ public class NoCarServiceImpl implements NoCarService{
                     //根据车牌号查询是新增还是更新
                     updateCustomerCarRec(customerCarRec);
                     continue;
+                   }
                 }
                 //如果业务类型是无车
                 VehicleRegisterRequest vehicleRegisterRequest = new VehicleRegisterRequest();
@@ -139,6 +144,7 @@ public class NoCarServiceImpl implements NoCarService{
                     customerCarRec.setFailReason(respR.getMsg());
                     customerCarRec.setFailTime(DateUtil.getCurrentDateStr());
                 } else {
+                    respRResult = respR.getMsg();//车辆备案成功
                     customerCarRec.setRecStatus(CommonConstants.REC_STATUS_SUC);
                     customerCarRec.setSuccTime(DateUtil.getCurrentDateStr());
                 }
@@ -148,7 +154,7 @@ public class NoCarServiceImpl implements NoCarService{
             }
             if(StringUtils.isEmpty(res.toString())){
                 MIX_LOG.info("车辆备案成功");
-                return new RespR("车辆备案成功");
+                return new RespR(respRResult);
             }else {
                 MIX_LOG.info("车辆备案异常NoCarServiceImpl.customerCarRec{},msg{}",customerCarRecs,res.toString());
                 return new RespR(false,res.toString());