~

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

@@ -218,15 +218,16 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
         throwBisExceptionOn(hasText(product.getVehiclePalce()) && !product.getVehiclePalce().contains(vehicleRegion), "超出当前产品的车籍范围");
         throwBisExceptionOn(!EnableStatus.ENABLE.equals(product.getStatus()) || !EnableStatus.ENABLE.equals(promotion.getStatus()), "当前选择的产品未上架");
         throwBisExceptionOn(!product.getVanType().contains(request.getVanType().toString()), "当前选择的产品与车辆类型不符");
-        throwBisExceptionOn(!request.getAgentId().equals(request.getOrgCode()) || !promotion.getAgencyId().contains(request.getAgentId()), "当前选择的产品与渠道不匹配");
+        throwBisExceptionOn(!request.getOrgCode().equals(MyFinals.QTZL_AGENCY_ID) && (!request.getAgentId().equals(request.getOrgCode())
+                || !promotion.getAgencyId().contains(request.getAgentId())), "当前选择的产品与渠道不匹配");
         if (product.getCustomerType() != 3 && product.getCustomerType().intValue() != request.getUserType().intValue()) {
             throw newBusinessException("当前选择的产品与用户类型不符");
         }
         if (product.getPromotionMode().intValue() != request.getIssueType().intValue()) {
             throw newBusinessException("当前选择的产品与订单发行模式不符");
         }
-        if (!product.getExtensionTool().contains(request.getSourceType().name())) {
-            throw newBusinessException("当前选择的产品不支持"+ request.getSourceType().getName()+"办理");
+        if (!product.getExtensionTool().contains(request.getSourceType())) {
+            throw newBusinessException("当前选择的产品不支持"+ request.getSourceType()+"办理");
         }
         dataStream.put(PRODUCT, product);
     }
@@ -295,7 +296,7 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
         String orderNo = now.format(TimeTools.yyyyMMddHHmmss) + request.getAgentId() + (int)((Math.random() * 9 + 1) * Math.pow(10, 6));
         order.setInsertTime(now);
         order.setOrderNo(orderNo);
-        order.setOrderSource(request.getSourceType());
+        order.setOrderSource(SourceType.valueOf(request.getSourceType()));
         order.setVehicleId(request.getVehiclePlate() + "_" + request.getVehiclePlateColor());
         order.setVehiclePlate(request.getVehiclePlate());
         order.setVehiclePlateColor(request.getVehiclePlateColor());