ias 发行调整

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/audit/VerificationRuleManager.java

@@ -37,12 +37,12 @@ public class VerificationRuleManager extends AbstractCommManager {
 
     public String autoVerify(OrderVerificationModel model) throws ManagerException {
         StringBuilder builder = new StringBuilder();
-//        // 1-校验车型-接口传的和系统算的比对(注释掉，车型直接由后端系统自己计算，不需要校验）
-//        Integer vehicleClass = IssueTools.getVehicleClass(model.getVanType(), model.getVehicleDimensions(),
-//                model.getApprovedCount(), model.getAxleCount(), model.getTotalMass());
-//        if (vehicleClass.intValue() != model.getFeeVehicleType().intValue()) {
-//            builder.append("收费车型【" + model.getFeeVehicleType() + "】与系统计算结果【" + vehicleClass + "】不一致；");
-//        }
+        // 1-校验车型-接口传的和系统算的比对
+        Integer vehicleClass = IssueTools.getVehicleClass(model.getVanType(), model.getVehicleDimensions(),
+                model.getApprovedCount(), model.getAxleCount(), model.getTotalMass());
+        if (vehicleClass.intValue() != model.getFeeVehicleType().intValue()) {
+            builder.append("收费车型【" + model.getFeeVehicleType() + "】与系统计算结果【" + vehicleClass + "】不一致；");
+        }
         // 2-OCR结果比对
         varifyCustomer(model, builder);// 人
         varifyVehicle(model, builder);// 车

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

@@ -73,7 +73,7 @@ public class GetH5UrlManager extends AbstractOrderManager<GetH5UrlRequest>{
         OrderInitRequest request = (OrderInitRequest) dataStream.get(INIT_ORDER_RES);
         OrderInitResponse response = orderInitManager.getRes(request, event, dataStream);
         GetH5UrlResponse res = copyProperties(response, new GetH5UrlResponse());
-        res.setOrderApplyUrl(h5url + "?qdOrderNo=" + response.getOrderNo());
+        res.setOrderApplyUrl(h5url + "?orderNo=" + response.getOrderNo());
         res.setOrderApplyStatus(1);
         res.setQdOrderNo(req.getQdOrderNo());
         res.setOrderNo(response.getOrderNo());

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

@@ -202,6 +202,7 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
         OrderInitResponse res = new OrderInitResponse();
         res.setReceiveTime(getReceiveTimeStr(event));
         res.setOrderNo(order.getOrderNo());
+        res.setId(order.getId());
         return res;
     }
 

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

@@ -175,6 +175,7 @@ public class UserUploadManager extends AbstractOrderManager<UserUploadRequest> {
         UserUploadResponse res = new UserUploadResponse();
         res.setReceiveTime(getReceiveTimeStr(event));
         res.setCustomerId(order.getCustomerId());
+        res.setId(order.getId());
         return res;
     }
 

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

@@ -12,7 +12,6 @@ import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
 import cn.com.taiji.core.entity.issue.IssueProduct;
 import cn.com.taiji.core.entity.issue.TransactionStatus;
-import cn.com.taiji.core.manager.tools.issue.IssueTools;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.order.VehicleUploadRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.VehicleUploadResponse;
@@ -38,7 +37,6 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
 
     public static final String VEHICLE_INFO = "vehicleInfo";
     public static final String ORDER_EXT = "orderExt";
-    public static final String VEHICLE_CLASS= "vehicleClass";
 
     @Autowired
     private VerificationRuleManager verificationRuleManager;
@@ -80,17 +78,13 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         if (!order.getVehicleId().equals(request.getVehiclePlate()+"_"+request.getVehiclePlateColor())) {
             throw newBusinessException("当前车牌与订单车牌不一致");
         }
-        //计算收费车型
-        Integer vehicleClass = null;
-        try {
-            vehicleClass = IssueTools.getVehicleClass(request.getVanType(), request.getVehicleDimensions(),
-                    request.getApprovedCount(), request.getAxleCount(), request.getTotalMass());
-        } catch (ManagerException e) {
-            throw newBusinessException(e.getMessage());
-        }
+        // 校验产品是否支持当前车型
+//        Integer vehicleClass = getVehicleClass(request);
+        // 校验车型
+//        throwBisExceptionOn(vehicleClass.intValue() != request.getFeeVehicleType().intValue(),"车型与行驶证不符");
         IssueProduct product = issueProductRepo.findByReleaseId(order.getProductId());
-        if (!product.getVehicleType().contains(vehicleClass + "")) {
-            throw newBusinessException(String.format("当前产品不支持%s发行", VehicleType.fromCode(vehicleClass).getValue()));
+        if (!product.getVehicleType().contains(request.getFeeVehicleType() + "")) {
+            throw newBusinessException(String.format("当前产品不支持%s发行", VehicleType.fromCode(request.getFeeVehicleType()).getValue()));
         }
         // 车辆所有人不是持卡人
         if (!order.getCustomerName().equals(request.getOwnerName())) {
@@ -102,7 +96,6 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         // 车辆数量校验
         validCount(order.getCustomerId(), order.getUserType().getCode());
         dataStream.put(ORDER, order);
-        dataStream.put(VEHICLE_CLASS, vehicleClass);
     }
 
     @Override
@@ -110,7 +103,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         Map<String, Object> dataStream) throws ServiceHandleException {
         IssueOrderinfo order = (IssueOrderinfo)dataStream.get(ORDER);
         // 保存车辆
-        QtkVehicleInfo vehicleInfo = saveVehicle(order, request,dataStream);
+        QtkVehicleInfo vehicleInfo = saveVehicle(order, request);
         // 保存订单
         IssueOrderinfoExt ext = saveOrder(order, vehicleInfo, request);
         // 自动审核 货车类型走 人工审核
@@ -132,10 +125,12 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
     protected AbstractSignTypeResponse getRes(VehicleUploadRequest req, ServiceLogEvent event,
         Map<String, Object> dataStream) throws ServiceHandleException {
         IssueOrderinfoExt orderinfoExt = (IssueOrderinfoExt)dataStream.get(ORDER_EXT);
+        IssueOrderinfo orderinfo = (IssueOrderinfo) dataStream.get(ORDER);
         VehicleUploadResponse res = new VehicleUploadResponse();
         res.setReceiveTime(getReceiveTimeStr(event));
         res.setApprovalStatus(!hasText(orderinfoExt.getAuditReason())?1:2);
         res.setReason(orderinfoExt.getAuditReason());
+        res.setId(orderinfo.getId());
         return res;
     }
 
@@ -218,7 +213,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         return ext;
     }
 
-    private QtkVehicleInfo saveVehicle(IssueOrderinfo order, VehicleUploadRequest request,Map<String, Object> dataStream) throws ServiceHandleException {
+    private QtkVehicleInfo saveVehicle(IssueOrderinfo order, VehicleUploadRequest request) throws ServiceHandleException {
         QtkVehicleInfo vehicle = getVehicle(request);
         QtkCustomerInfo customer = customerInfoRepo.findByCustomerId(order.getCustomerId());
         boolean hasOldVehicle = vehicle != null;
@@ -234,7 +229,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         vehicle.setCustomerId(order.getCustomerId());
 //        vehicle.setCustomerInfo(customer);
         vehicle.setVehicleType(request.getVehicleType());
-        vehicle.setType((Integer) dataStream.get(VEHICLE_CLASS));
+        vehicle.setType(request.getFeeVehicleType());
         // 办理人不是车主
         if (!order.getCustomerName().equals(request.getOwnerName())) {
             vehicle.setOwnerName(request.getOwnerName());

zhywpt-service-ias/src/main/resources/bootstrap.yml

@@ -96,6 +96,7 @@ app:
     #    自定义服务地址map，key为服务名、value为服务地址。如果配置了服务地址，接口调用时请求到该地址，如果没配置，默认请求到gateway
     serviceAddr:
       ias: http://127.0.0.1:8090
+      ods: http://100.64.2.98:8092
 
 # 退费接口相关参数
 refund:

zhywpt-service-ias/src/test/java/cn/com/taiji/oqs/client/demo/OneTest.java

@@ -1,13 +1,20 @@
 package cn.com.taiji.oqs.client.demo;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.order.GetCustomerIdRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.GetCustomerIdResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.vaild.VehiclePlateCheckRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.vaild.VehiclePlateCheckResponse;
+import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsCardQueryRequest;
+import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsCardQueryResponse;
 import cn.com.taiji.ias.Application;
 import cn.com.taiji.ias.manager.AbstractCommManager;
+import cn.com.taiji.ias.manager.valid.VehiclePlateCheckManager;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 /**
@@ -43,4 +50,22 @@ public class OneTest extends AbstractCommManager {
             throw new RuntimeException(e);
         }
     }
+    @Autowired
+    private VehiclePlateCheckManager vehiclePlateCheckManager;
+    @Test
+    public void tes() throws ServiceHandleException {
+        VehiclePlateCheckRequest req = new VehiclePlateCheckRequest();
+        req.setVehiclePlate("贵Z100011");
+        req.setVehiclePlateColor(4);
+        VehiclePlateCheckResponse response = vehiclePlateCheckManager.serviceHandle(req);
+        System.out.println(response.toJson(true));
+    }
+
+    @Test
+    public void OqsCardQueryRequestTest() throws ManagerException {
+        OqsCardQueryRequest request = new OqsCardQueryRequest();
+        request.setVehicleId("贵Z10001_4");
+        OqsCardQueryResponse oqsCardQueryResponse = jsonPostRepeat(request);
+        System.out.println(oqsCardQueryResponse.toJson(true));
+    }
 }