Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/issue/QdCallUtil.java

@@ -66,16 +66,21 @@ public class QdCallUtil extends CommonAbstract {
         }
         List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo());
         List<OrderPayStatus> list = pays.stream().map(IssueOrderPay::getPayStatus).collect(Collectors.toList());
-        boolean b = list.stream().allMatch(t -> t == OrderPayStatus.SUCCESS);
-        if (!isEmpty(pays) && b) {
-            List<PayInfoModelQd> payInfoList = pays.stream().map(pay -> {
-                PayInfoModelQd payInfoModelQd = new PayInfoModelQd();
-                payInfoModelQd.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
-                payInfoModelQd.setPayOrderNo(pay.getExternalOrderNo());
-                payInfoModelQd.setFee(pay.getFee());
-                return payInfoModelQd;
-            }).collect(Collectors.toList());
-            callbackModel.setPayInfoList(payInfoList);
+
+        if (!isEmpty(pays)) {
+            boolean b = list.stream().allMatch(t -> t == OrderPayStatus.SUCCESS);
+            if (b) {
+                //全部支付成功，返回支付信息
+                List<PayInfoModelQd> payInfoList = pays.stream().map(pay -> {
+                    PayInfoModelQd payInfoModelQd = new PayInfoModelQd();
+                    payInfoModelQd.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+                    payInfoModelQd.setPayOrderNo(pay.getPayOrderNo());
+                    payInfoModelQd.setExternalOrderNo(pay.getExternalOrderNo());
+                    payInfoModelQd.setFee(pay.getFee());
+                    return payInfoModelQd;
+                }).collect(Collectors.toList());
+                callbackModel.setPayInfoList(payInfoList);
+            }
         }
         AssAgencyConfig agencyConfig = assAgencyConfigRepo.findByAgencyId(order.getAgencyId());
         if (agencyConfig == null || !hasText(agencyConfig.getNoticeUrl())){

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/model/PayInfoModelQd.java

@@ -8,7 +8,8 @@ import lombok.Setter;
 @Setter
 public class PayInfoModelQd extends BaseModel {
 
-    private String payOrderNo;
+    private String payOrderNo;//商户单号
+    private String externalOrderNo;//交易单号
     private Long fee;
     private String payTime;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/PayInfoModel.java

@@ -7,7 +7,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class PayInfoModel extends BaseModel {
-    private String payOrderNo;
+    private String payOrderNo;//商户单号
+    private String externalOrderNo;//交易单号
     private Long fee;
     private String payTime;
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/SignQueryResponse.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.core.model.comm.protocol.ias.order;
 
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import lombok.Getter;
 import lombok.Setter;
@@ -29,6 +30,8 @@ public class SignQueryResponse extends AbstractSignTypeResponse {
 //    private String sellerId;
 //    private String sellerAppId;
 
+    private IssueOrderStep step;//订单状态 是(不是签约参数，用于通知小程序订单状态）
+
 
     private String userState;//用户签约状态 是
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/SignQueryResponseDTO.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.iaw.dto.issue.order;
 
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +14,8 @@ import lombok.Data;
 @Data
 @ApiModel(description = "签约检测响应")
 public class SignQueryResponseDTO {
+    @ApiModelProperty(value = "订单阶段（通知小程序订单阶段）")
+    private IssueOrderStep step;
     @ApiModelProperty(value = "用户签约状态 UNAUTHORIZED 未签约")
     private String userState;//用户签约状态 是
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/config/AppConfig.java

@@ -82,16 +82,16 @@ public class AppConfig extends AbstractManager {
     public SequenceJdbcDao sequenceJdbcDao() {
         return new SequenceJdbcDao(dataSource, MyFinals.SEQUENCE_NUM_TABLE, 0L);
     }
-    @Bean
-    public WebMvcConfigurer corsConfigurer() {
-        return new WebMvcConfigurer() {
-            @Override
-            public void addCorsMappings(CorsRegistry registry) {
-                registry.addMapping("/**")
-                        .allowedOrigins("*")
-                        .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-                        .allowedHeaders("*");
-            }
-        };
-    }
+//    @Bean
+//    public WebMvcConfigurer corsConfigurer() {
+//        return new WebMvcConfigurer() {
+//            @Override
+//            public void addCorsMappings(CorsRegistry registry) {
+//                registry.addMapping("/**")
+//                        .allowedOrigins("*")
+//                        .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+//                        .allowedHeaders("*");
+//            }
+//        };
+//    }
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -13,7 +13,9 @@ import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.invw.InvwWarehousePageRequest;
 import cn.com.taiji.invw.dto.warehouse.*;
 import cn.com.taiji.invw.manager.AbstractInvwManager;
+import cn.com.taiji.invw.model.MyFinals;
 import cn.com.taiji.invw.model.warehouse.InvwWarehouseIdNameModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class InvwWarehouseManagerImpl extends AbstractInvwManager implements InvwWarehouseManager {
@@ -45,12 +48,15 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
             req.setInsertTimeEnd(request.getInsertTimeEnd().plusDays(1).atStartOfDay());
         }
         Staff staff = staffRepo.findByStaffId(request.getStaffId());
-        if (staff == null) throw new ManagerException("员工非法！");
-        // 如果不是管理员，只能查询本渠道的仓库
-        if (!"MANAGER".equals(staff.getIdentityType())) {
-            String agencyId = staff.getAgencyId();
-            if (!hasText(agencyId)) throw new ManagerException("渠道获取失败！");
-            req.setAgencyId(agencyId);
+        if (staff == null) {
+            throw new ManagerException("员工非法！");
+        }
+        // 如果不是管理员，已及非黔通的只能查询本渠道的仓库
+        if (ObjectUtils.isNotEmpty(staff)){
+            req.setAgencyId(staff.getAgencyId());
+            if ("MANAGER".equals(staff.getIdentityType()) || MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())){
+                req.setAgencyId(null);
+            }
         }
         return warehouseRepo.page(req).convertResult(this::convert);
     }
@@ -146,81 +152,76 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
         if (warehouse == null) {
             throw new ManagerException("仓库不存在");
         }
-        //一级仓库
+        if (!hasText(req.getName())) {
+            throw new ManagerException("仓库名称不能为空");
+        }
+
+        // 一级仓库
         if (warehouse.getWarehouseLevel() == 1) {
-            if (hasText(req.getParentId()) || hasText(req.getAgencyId())) {
+            if (!warehouse.getParentId().equals(req.getParentId()) || !warehouse.getAgencyId().equals(req.getAgencyId())) {
                 throw new ManagerException("一级仓库只能修改仓库名称");
             }
-            if (hasText(req.getName())) {
-                warehouse.setName(req.getName());
-                warehouse.setUpdateTime(LocalDateTime.now());
-                warehouseRepo.saveAndFlush(warehouse);
-            }
+            warehouse.setName(req.getName());
         } else if (warehouse.getWarehouseLevel() == 2) {
-            //二级仓库
-            if (hasText(req.getParentId()) || hasText(req.getAgencyId())) {
-                //查询下级仓库
-                List<InvwWarehouse> warehouseList = warehouseRepo.findChiByIdAndStatus(warehouse.getId(), EnableStatus.ENABLE);
-                if (warehouseList.size() > 0) {
-                    throw new ManagerException("该仓库有下级仓库，只能修改仓库名称");
-                }
-                long obuCount = obuDetailsRepo.findCountByStoreCode(warehouse.getCode());
-                if (obuCount > 0) {
-                    throw new ManagerException("该仓库有设备，只能修改仓库名称");
-                }
-                long cardCount = cardDetailsRepo.findCountByStoreCode(warehouse.getCode());
-                if (cardCount > 0) {
-                    throw new ManagerException("该仓库有设备，只能修改仓库名称");
-                }
-                if (hasText(req.getParentId())) {
-                    InvwWarehouse parentWarehouse = warehouseRepo.findById(req.getParentId()).orElse(null);
-                    if (parentWarehouse == null) {
-                        throw new ManagerException("上级仓库不存在");
-                    }
-                    warehouse.setWarehouseLevel(parentWarehouse.getWarehouseLevel() + 1);
-                    warehouse.setParentId(req.getParentId());
-                }
-                if (hasText(req.getAgencyId())) {
-                    warehouse.setAgencyId(req.getAgencyId());
-                }
+            // 二级仓库
+            boolean canModifyStructure = canModifyWarehouseStructure(warehouse.getId(), warehouse.getCode());
+
+            if (!canModifyStructure && (!warehouse.getParentId().equals(req.getParentId()) || !warehouse.getAgencyId().equals(req.getAgencyId()))) {
+                throw new ManagerException("该仓库有下级仓库或设备，只能修改仓库名称");
             }
-            if (hasText(req.getName())) {
-                warehouse.setName(req.getName());
+
+            if (hasText(req.getParentId())) {
+                InvwWarehouse parentWarehouse = warehouseRepo.findById(req.getParentId()).orElseThrow(() -> new ManagerException("上级仓库不存在"));
+                warehouse.setParentId(parentWarehouse.getId());
+                warehouse.setWarehouseLevel(parentWarehouse.getWarehouseLevel() + 1);
+            } else {
+                throw new ManagerException("上级仓库不能为空");
+            }
+
+            if (hasText(req.getAgencyId())) {
+                warehouse.setAgencyId(req.getAgencyId());
             }
-            warehouse.setUpdateTime(LocalDateTime.now());
-            warehouseRepo.saveAndFlush(warehouse);
 
+            warehouse.setName(req.getName());
         } else if (warehouse.getWarehouseLevel() == 3) {
-            //三级仓库
-            if (hasText(req.getParentId()) || hasText(req.getChannelId())) {
-                long obuCount = obuDetailsRepo.findCountByStoreCode(warehouse.getCode());
-                if (obuCount > 0) {
-                    throw new ManagerException("该仓库有设备，只能修改仓库名称");
-                }
-                long cardCount = cardDetailsRepo.findCountByStoreCode(warehouse.getCode());
-                if (cardCount > 0) {
-                    throw new ManagerException("该仓库有设备，只能修改仓库名称");
-                }
-                if (hasText(req.getParentId())) {
-                    InvwWarehouse parentWarehouse = warehouseRepo.findById(req.getParentId()).orElse(null);
-                    if (parentWarehouse == null) {
-                        throw new ManagerException("上级仓库不存在");
-                    }
-                    warehouse.setWarehouseLevel(parentWarehouse.getWarehouseLevel() + 1);
-                    warehouse.setParentId(req.getParentId());
-                }
-                warehouse.setChannelId(req.getChannelId());
+            // 三级仓库
+            if (!req.getAgencyId().equals(warehouse.getAgencyId())) {
+                throw new ManagerException("三级仓库不能修改渠道");
+            }
+
+            boolean canModifyStructure = canModifyWarehouseStructure(warehouse.getId(), warehouse.getCode());
 
+            if (!canModifyStructure && (!Objects.equals(warehouse.getParentId(), req.getParentId()) ||
+                !Objects.equals(warehouse.getChannelId(), req.getChannelId()))) {
+                throw new ManagerException("该仓库有设备，只能修改仓库名称");
             }
-            if (hasText(req.getName())) {
-                warehouse.setName(req.getName());
+
+            if (hasText(req.getParentId())) {
+                InvwWarehouse parentWarehouse = warehouseRepo.findById(req.getParentId()).orElseThrow(() -> new ManagerException("上级仓库不存在"));
+                warehouse.setParentId(parentWarehouse.getId());
+                warehouse.setWarehouseLevel(parentWarehouse.getWarehouseLevel() + 1);
             }
-            warehouse.setUpdateTime(LocalDateTime.now());
-            warehouseRepo.saveAndFlush(warehouse);
+            warehouse.setChannelId(req.getChannelId());
+            warehouse.setName(req.getName());
         }
+
+        warehouse.setUpdateTime(LocalDateTime.now());
+        warehouseRepo.saveAndFlush(warehouse);
         persistOperateLog(OperateType.UPDATE_WAREHOUSE, warehouse.getId(), req.getOrderSource(), findOpenIdByToken(req.getAccessToken()), "仓库修改");
     }
 
+    private boolean canModifyWarehouseStructure(String warehouseId, String warehouseCode) {
+        // 检查是否有下级仓库
+        List<InvwWarehouse> warehouseList = warehouseRepo.findChiByIdAndStatus(warehouseId, EnableStatus.ENABLE);
+        if (!warehouseList.isEmpty()) {
+            return false;
+        }
+        // 检查设备数量
+        long obuCount = obuDetailsRepo.findCountByStoreCode(warehouseCode);
+        long cardCount = cardDetailsRepo.findCountByStoreCode(warehouseCode);
+        return obuCount == 0 && cardCount == 0;
+    }
+
     @Override
     public void delete(InvwWarehouseDeleteRequestDTO req) throws ManagerException {
         InvwWarehouse warehouse = warehouseRepo.findByIdAndStatus(req.getId(), EnableStatus.ENABLE);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderPayQueryManager.java

@@ -79,6 +79,12 @@ public class OrderPayQueryManager extends AbstractOrderManager<OrderPayQueryRequ
 //            detectionStatus.getValue());
     }
 
+    @Override
+    protected void onSuccessInternal(OrderPayQueryRequest req, ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException {
+        IssueOrderinfo order = (IssueOrderinfo)dataStream.get(ORDER);
+        asyCallBackQd(order, "");
+    }
+
     @Override
     protected AbstractSignTypeResponse getRes(OrderPayQueryRequest req, ServiceLogEvent event,
         Map<String, Object> dataStream) throws ServiceHandleException {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderStatusQueryManager.java

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
+import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
 import cn.com.taiji.core.entity.issue.IssueOrderPay;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
@@ -64,20 +65,26 @@ public class OrderStatusQueryManager extends AbstractOrderManager<OrderStatusQue
     @Override
     protected AbstractSignTypeResponse getRes(OrderStatusQueryRequest req, ServiceLogEvent event,
         Map<String, Object> dataStream) throws ServiceHandleException {
+        OrderStatusQueryResponse res = new OrderStatusQueryResponse();
         IssueOrderinfo order = (IssueOrderinfo)dataStream.get(ORDER);
 
         List<IssueOrderPay> pays = orderPayRepo.listByOrderNo(order.getOrderNo());
-        List<PayInfoModel> payInfoList = pays.stream().map(pay -> {
-            PayInfoModel payInfoModel = new PayInfoModel();
-            if (pay.getPayTime()!=null) {
-                payInfoModel.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+        if (!isEmpty(pays)){
+            List<OrderPayStatus> list = pays.stream().map(IssueOrderPay::getPayStatus).collect(Collectors.toList());
+            boolean b = list.stream().allMatch(t -> t == OrderPayStatus.SUCCESS);
+            if (b) {
+                //全部支付成功，返回支付信息
+                List<PayInfoModel> payInfoList = pays.stream().map(pay -> {
+                    PayInfoModel payInfoModel = new PayInfoModel();
+                    payInfoModel.setPayTime(pay.getPayTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
+                    payInfoModel.setPayOrderNo(pay.getPayOrderNo());
+                    payInfoModel.setExternalOrderNo(pay.getExternalOrderNo());
+                    payInfoModel.setFee(pay.getFee());
+                    return payInfoModel;
+                }).collect(Collectors.toList());
+                res.setPayInfoList(payInfoList);
             }
-            payInfoModel.setPayOrderNo(pay.getExternalOrderNo());
-            payInfoModel.setFee(pay.getFee());
-            return payInfoModel;
-        }).collect(Collectors.toList());
-        OrderStatusQueryResponse res = new OrderStatusQueryResponse();
-        res.setPayInfoList(payInfoList);
+        }
         res.setOrderStep(order.getOrderStep().getCode());
         res.setOrderStatus(order.getOrderStatus().getCode());
         res.setCustomerName(order.getCustomerName());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/SignQueryManager.java

@@ -70,6 +70,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             case BLUE:
             case GREEN:
                 res = signCommonManager.carSignV2(request.getSubOpenId(), order.getProductId(), order.getVehicleId());
+                res.setStep(order.getOrderStep());
                 flag = !"UNAUTHORIZED".equals(res.getUserState());
                 break;
             case YELLOW:
@@ -84,6 +85,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
                     idNum = order.getAgentIdNum();
                 }
                 res = signCommonManager.carSignV3(request.getSubOpenId(), order.getProductId(), order.getVehicleId(), name, idNum);
+                res.setStep(order.getOrderStep());
                 flag = "OPENED".equals(res.getUserState());
                 break;
             default:

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardBlackQueryManagerImpl.java

@@ -14,6 +14,7 @@ import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,7 @@ public class CardBlackQueryManagerImpl  extends AbstractManager implements CardB
 
     @Override
     public OqsCardBlackResponse serviceHandle(OqsCardBlackRequest req) throws ServiceHandleException {
+        logger.info("老库、新库卡下黑查询开始{}，参数{}", LocalDateTime.now(),req.toJson());
         List<DsiBlackCard> dsiBlackCards = dsiBlackCardRepo.listCardBlackByStatus(req.getCardId(),1);
         List<QtkBlackCard> qtkBlackCards = qtkBlackCardRepo.listCardBlackByStatus(req.getCardId(),1);
         OqsCardBlackResponse response = getResponse(dsiBlackCards, qtkBlackCards);

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/IssueOrderQueryManagerImpl.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
@@ -19,6 +20,7 @@ public class IssueOrderQueryManagerImpl  extends AbstractManager implements Issu
 
     @Override
     public OqsIssueOrderQueryResponse serviceHandle(OqsIssueOrderQueryRequest req) {
+        logger.info("老库、新库订单查询开始{}，参数{}", LocalDateTime.now(),req.toJson());
         if (!StringUtils.isEmpty(req.getVehicleId())){
             return isExistNormalOrder(req);
         }else {

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/ObuBlackQueryManagerImpl.java

@@ -15,6 +15,7 @@ import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +33,7 @@ public class ObuBlackQueryManagerImpl  extends AbstractManager implements ObuBla
 
     @Override
     public OqsObuBlackResponse serviceHandle(OqsObuBlackRequest req) throws ServiceHandleException {
-
+        logger.info("老库、新库签下黑查询开始{}，参数{}", LocalDateTime.now(),req.toJson());
         List<DsiBlackObu> dsiBlackObus = dsiBlackObuRepo.listObuBlackByStatus(req.getObuId(), 1);
         List<QtkBlackObu> qtkBlackObus = qtkBlackObuRepo.listObuBlackByStatus(req.getObuId(), 1);
         OqsObuBlackResponse response = getResponse(dsiBlackObus, qtkBlackObus);

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/ObuQueryManagerImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,7 @@ public class ObuQueryManagerImpl  extends AbstractManager implements ObuQueryMan
 
     @Override
     public OqsObuQueryResponse serviceHandle(OqsObuQueryRequest req) {
+        logger.info("老库、新库签查询开始{}，参数{}", LocalDateTime.now(),req.toJson());
         if (!StringUtils.isEmpty(req.getObuId())){
             return findByObuId(req);
         }else if(!StringUtils.isEmpty(req.getVehicleId())){

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/UserQueryManagerImpl.java

@@ -15,6 +15,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -27,6 +28,7 @@ public class UserQueryManagerImpl extends AbstractManager implements UserQueryMa
 
     @Override
     public OqsUserQueryResponse serviceHandle(OqsUserQueryRequest req) throws ServiceHandleException {
+        logger.info("老库、新库用户查询开始{}，参数{}", LocalDateTime.now(),req.toJson());
         Result result = new Result(new DsiCustomerInfo(), new QtkCustomerInfo());
         if (!StringUtils.isEmpty(req.getCustomerId())){
             result = findByCustomerId(req);

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/VehicleQueryManagerImpl.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -28,6 +29,7 @@ public class VehicleQueryManagerImpl  extends AbstractManager implements Vehicle
 
     @Override
     public OqsVehicleQueryResponse serviceHandle(OqsVehicleQueryRequest req) throws ServiceHandleException {
+        logger.info("老库、新库车辆查询开始{}，参数{}", LocalDateTime.now(),req.toJson());
         if (!StringUtils.isEmpty(req.getVehicleId())){
             return findByVehicleId(req);
         } else if (!StringUtils.isEmpty(req.getVehicleVin())) {