ias

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

@@ -223,12 +223,11 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
             && product.getCustomerType().intValue() != request.getUserType().intValue()) {
             throw newBusinessException("当前选择的产品与用户类型不符");
         }
-        if (product.getPromotionMode() != 3
-            && product.getPromotionMode().intValue() != request.getIssueType().intValue()) {
+        if (product.getPromotionMode().intValue() != request.getIssueType().intValue()) {
             throw newBusinessException("当前选择的产品与订单发行模式不符");
         }
-        if (!product.getExtensionTool().contains(request.getSourceType())) {
-            throw newBusinessException("当前选择的产品不支持"+ SourceType.valueOf(request.getSourceType()).name()+"办理");
+        if (!product.getExtensionTool().contains(request.getSourceType().name())) {
+            throw newBusinessException("当前选择的产品不支持"+ request.getSourceType().getName()+"办理");
         }
         dataStream.put(PRODUCT, product);
     }
@@ -297,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(SourceType.valueOf(request.getSourceType()));
+        order.setOrderSource(request.getSourceType());
         order.setVehicleId(request.getVehiclePlate() + "_" + request.getVehiclePlateColor());
         order.setVehiclePlate(request.getVehiclePlate());
         order.setVehiclePlateColor(request.getVehiclePlateColor());