发行接口

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

@@ -291,7 +291,7 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
     private IssueOrderinfo saveOrder(OrderInitRequest request, Map<String, Object> dataStream) {
         IssueOrderinfo order = new IssueOrderinfo();
         IssueProduct product = (IssueProduct) dataStream.get(PRODUCT);
-//        Staff staff = (Staff) dataStream.get("staff");
+        Staff staff = (Staff) dataStream.get("staff");
         LocalDateTime now = LocalDateTime.now();
         String orderNo = now.format(TimeTools.yyyyMMddHHmmss) + request.getAgentId() + (int)((Math.random() * 9 + 1) * Math.pow(10, 6));
         order.setInsertTime(now);
@@ -311,7 +311,7 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
         order.setShippingStatus(request.getWhetherToMail() ? ShippingStatus.WAIT_SHIPPING : ShippingStatus.NONE);
         order.setPromotionModes(request.getIssueType());
         if (request.getIssueType() == 2) {//线下
-            order.setStaffId(request.getStaffNum());
+            order.setStaffOpenId(staff.getOpenId());
         } else {//其他包括渠道线上
             order.setUserId(request.getOpenId());
         }

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

@@ -10,6 +10,7 @@ import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.basic.UseUserType;
 import cn.com.taiji.core.entity.dict.basic.VehicleType;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
+import cn.com.taiji.core.entity.dict.issue.OrderType;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
 import cn.com.taiji.core.entity.issue.IssueProduct;
@@ -25,6 +26,7 @@ import cn.com.taiji.ias.dict.DataType;
 import cn.com.taiji.ias.manager.audit.VerificationRuleManager;
 import cn.com.taiji.ias.model.ServiceLogEvent;
 import cn.com.taiji.ias.model.issue.OrderVerificationModel;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -313,26 +315,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
     }
 
     private Boolean audit(IssueOrderinfo order, IssueOrderinfoExt ext) throws ServiceHandleException {
-        OrderVerificationModel model = new OrderVerificationModel();
-        model.setType(1);
-        model.setOrderNo(order.getOrderNo());
-        model.setCustomerIdType(order.getCustomerIdType());
-        model.setCustomerName(order.getCustomerName());
-        model.setCustomerIdNum(order.getCustomerIdNum());
-        model.setCusPosImageUrl(ext.getCustomerPositiveImageUrl());
-        model.setVehiclePlate(order.getVehiclePlate());
-        model.setVehPosImgUrl(ext.getVehPosImgUrl());
-        model.setVehNegImgUrl(ext.getVehNegImgUrl());
-        model.setVehicleDimensions(ext.getVehicleDimensions());
-        model.setOwnerName(order.getOwnerName());
-        model.setOwnerIdType(order.getOwnerIdType());
-        model.setFeeVehicleType(order.getVehicleClass());
-        model.setVanType(order.getVanType());
-        model.setApprovedCount(ext.getVehicleApprovedCount());
-        model.setAxleCount(ext.getVehicleAxleCount());
-        model.setTotalMass(ext.getVehicleTotalMass());
-        model.setVin(ext.getVehicleVin());
-        model.setVehicleModel(ext.getVehicleModel());
+        OrderVerificationModel model = getOrderVerificationModel(order, ext);
         String failReason;
         try {
             failReason = verificationRuleManager.autoVerify(model);
@@ -362,4 +345,29 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         orderInfoExtRepo.save(ext);
         return hasText(ext.getAuditReason());
     }
+
+    @NotNull
+    private static OrderVerificationModel getOrderVerificationModel(IssueOrderinfo order, IssueOrderinfoExt ext) {
+        OrderVerificationModel model = new OrderVerificationModel();
+        model.setType(OrderType.ISSUE);
+        model.setOrderNo(order.getOrderNo());
+        model.setCustomerIdType(order.getCustomerIdType());
+        model.setCustomerName(order.getCustomerName());
+        model.setCustomerIdNum(order.getCustomerIdNum());
+        model.setCusPosImageUrl(ext.getCustomerPositiveImageUrl());
+        model.setVehiclePlate(order.getVehiclePlate());
+        model.setVehPosImgUrl(ext.getVehPosImgUrl());
+        model.setVehNegImgUrl(ext.getVehNegImgUrl());
+        model.setVehicleDimensions(ext.getVehicleDimensions());
+        model.setOwnerName(order.getOwnerName());
+        model.setOwnerIdType(order.getOwnerIdType());
+        model.setFeeVehicleType(order.getVehicleClass());
+        model.setVanType(order.getVanType());
+        model.setApprovedCount(ext.getVehicleApprovedCount());
+        model.setAxleCount(ext.getVehicleAxleCount());
+        model.setTotalMass(ext.getVehicleTotalMass());
+        model.setVin(ext.getVehicleVin());
+        model.setVehicleModel(ext.getVehicleModel());
+        return model;
+    }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/model/issue/OrderVerificationModel.java

@@ -2,6 +2,7 @@ package cn.com.taiji.ias.model.issue;
 
 import cn.com.taiji.common.entity.BaseEntity;
 import cn.com.taiji.core.entity.dict.basic.IdType;
+import cn.com.taiji.core.entity.dict.issue.OrderType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,7 +10,7 @@ import lombok.Setter;
 @Setter
 public class OrderVerificationModel extends BaseEntity {
 
-    private Integer type;// 类型 1-发行 2-售后
+    private OrderType type;// 类型 1-发行 2-售后
     private String orderNo;// 订单号
     private IdType customerIdType;// 用户证据类型
     private String customerName;// 用户姓名