修改

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

     @NotBlank(message = "业务类型不能为空")
     private String type;
 
-    @NotNull(message = "审核结果不能为空")
-    private AuditStatus auditStatus;
+//    @NotNull(message = "审核结果不能为空")
+//    private AuditStatus auditStatus;
 
     @NotBlank(message = "审核原因不能为空")
     private String auditReason;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/CustomerInfoChangeAuditDTO.java

 package cn.com.taiji.managew.dto.ass;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
-import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.basic.UserType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
     @ApiModelProperty(value = "用户类型", required = true)
     private UserType userType;
 
+//    @NotNull(message = "审核结果不能为空")
+//    @ApiModelProperty(value = "审核结果", required = true)
+//    private AuditStatus auditStatus;
+
     @NotNull(message = "审核结果不能为空")
     @ApiModelProperty(value = "审核结果", required = true)
-    private AuditStatus auditStatus;
+    private String auditStatus;
 
     @NotBlank(message = "审核原因不能为空")
     @ApiModelProperty(value = "审核原因", required = true)

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/base/CustomerInfoChangeApplyManager.java

 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.comm.OcrResult;
-import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.OcrType;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
-import cn.com.taiji.core.entity.dict.ass.UpgradeStatus;
 import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.log.IasInterfaceLog;
         // 保存售后、变更
         toSave(orderInfo, change);
         // 判断机审是否通过，通过修改本地以及同步营改增
-        if (AuditStatus.NO_AUDIT.equals(orderInfo.getAuditStatus())) {
+        if (AssOrderStep.WAITING_UPGRADE.equals(orderInfo.getOrderStep())) {
             // 更新本地
             updateLocal(request.getType(), change, customerInfo);
 
-            orderInfo.setOrderStatus(AssOrderStatus.FINISHED);
-            orderInfo.setRemark("机审自动完成");
+            orderInfo.setOrderStatus(AssOrderStatus.NORMAL);
+            orderInfo.setRemark("机审自动完成，设备待升级");
             orderInfo.setUpdateTime(customerInfo.getUpdateTime());
 
             change.setCloseOpenId("系统");
-            change.setCloseReason("机审自动完成");
+            change.setCloseReason("机审自动完成，设备待升级");
             change.setCloseTime(customerInfo.getUpdateTime());
             toSave(orderInfo, change);
             // 同步营改增
         order.setAgencyId(request.getOrgCode());
         order.setChannelId(customerInfo.getChannelId());
         order.setOrderStatus(AssOrderStatus.NORMAL);
+        order.setOrderStep(AssOrderStep.WAITING_AUDIT);
         order.setApplyTime(now);
-        if (request.getLoginSource() == SourceType.WEB && hasText(request.getStaffId())) {
+        if ((request.getLoginSource() == SourceType.WEB || request.getLoginSource() == SourceType.SERVICE_HALL) && hasText(request.getStaffId())) {
             Staff staff = findByStaffId(request.getStaffId());
+            if(staff == null){
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("员工不存在");
+            }
             order.setStaffOpenId(staff.getOpenId());
         }
         String idNum = customerInfo.getCustomerIdNum();
         order.setCustomerIdType(customerInfo.getCustomerIdType());
         order.setCustomerIdNum(customerInfo.getCustomerIdNum());
         order.setUserType(customerInfo.getUserType());
-        order.setAuditStatus(AuditStatus.AUDIT);
+        order.setArtificialStatus(0);
+//        order.setAuditStatus(AuditStatus.AUDIT);
         order.setInsertTime(now);
         order.setUpdateTime(now);
         order.setUrgent(0);
         order.setVehicleId("-1");
+        order.setVehiclePlate("-1");
+        order.setVehiclePlateColor(-1);
         order.setCardId("-1");
         order.setObuId("-1");
 
         change.setOldCustomerNegUrl(customerInfo.getCustomerNegImgUrl());
         change.setOldAgentPosUrl(customerInfo.getAgentPosImgUrl());
         change.setOldAgentNegUrl(customerInfo.getAgentNegImgUrl());
-        change.setUpgradeStatus(UpgradeStatus.WAIT_UPGRADE);
+//        change.setUpgradeStatus(UpgradeStatus.WAIT_UPGRADE);
         change.setInsertTime(order.getInsertTime());
         return change;
     }
                 orderInfo.setAuditReason(builder.toString());
             } else {
                 orderInfo.setAuditOpenId("-1");
-                orderInfo.setAuditStatus(AuditStatus.NO_AUDIT);
+//                orderInfo.setAuditStatus(AuditStatus.NO_AUDIT);
+                orderInfo.setOrderStep(AssOrderStep.WAITING_UPGRADE);
+                orderInfo.setArtificialStatus(2);
                 orderInfo.setAuditReason("机审成功！");
                 orderInfo.setAuditTime(LocalDateTime.now());
                 orderInfo.setUpdateTime(LocalDateTime.now());
                 orderInfo.setAuditReason(builder.toString());
             } else {
                 orderInfo.setAuditOpenId("-1");
-                orderInfo.setAuditStatus(AuditStatus.NO_AUDIT);
+//                orderInfo.setAuditStatus(AuditStatus.NO_AUDIT);
+                orderInfo.setOrderStep(AssOrderStep.WAITING_UPGRADE);
+                orderInfo.setArtificialStatus(2);
                 orderInfo.setAuditReason("机审成功！");
                 orderInfo.setAuditTime(LocalDateTime.now());
                 orderInfo.setUpdateTime(LocalDateTime.now());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/base/CustomerInfoChangeAuditManager.java

 import cn.com.taiji.core.entity.ass.AssCustomerInfoChange;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
-import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.entity.log.IasInterfaceLog;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.manager.comm.LogManager;
         // 保存售后订单信息
         toSave(orderInfo, null);
         // 更新本地
-        if (AuditStatus.COMPLETE.equals(orderInfo.getAuditStatus())) {
+//        if ("COMPLETE".equals(orderInfo.getAuditStatus())) {
             QtkCustomerInfo customerInfo = findByCustomerId(orderInfo.getCustomerId());
             AssCustomerInfoChange change = findChangeByOrderNo(request.getOrderNo());
             updateLocal(request.getType(), change, customerInfo);
 
             // 同步营改增
 //            syncYgz(customerInfo);
-        }
+//        }
 
         response.setOrderNo(orderInfo.getOrderNo());
     }
     public void updateOrderInfo(CustomerInfoChangeAuditRequest request, AssOrderinfo orderInfo, Staff staff) {
         orderInfo.setAuditOpenId(staff.getOpenId());
         orderInfo.setAuditTime(request.getAuditTime());
-        orderInfo.setAuditStatus(request.getAuditStatus());
-        orderInfo.setAuditFailureCase(request.getAuditReason());
+//        orderInfo.setAuditStatus(request.getAuditStatus());
+        orderInfo.setArtificialStatus(1);
+        orderInfo.setOrderStep(AssOrderStep.COMPLETED);
         orderInfo.setOrderStatus(AssOrderStatus.FINISHED);
+        orderInfo.setAuditFailureCase(request.getAuditReason());
         orderInfo.setUpdateTime(request.getAuditTime());
     }
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/device/DeviceLossManager.java

 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
 import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
-import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssDeviceLossType;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import cn.com.taiji.core.entity.dict.basic.*;
 import cn.com.taiji.core.entity.log.IasInterfaceLog;
         }
 
         //生成售后订单
-        AssOrderinfo order = initOrderInfo(request, AssOrderType.LOSS);
+        AssOrderinfo order = initOrderInfo(request, AssOrderType.LOSS, cardInfo);
         AssDeviceLoss loss = initLoss(request, order, lossType);
 
         //更新卡信息
     }
 
     // 生成售后订单
-    public AssOrderinfo initOrderInfo(DeviceLossRequest request, AssOrderType orderType) throws ServiceHandleException {
+    public AssOrderinfo initOrderInfo(DeviceLossRequest request, AssOrderType orderType, QtkCardInfo cardInfo) throws ServiceHandleException {
         LocalDateTime now = LocalDateTime.now();
         AssOrderinfo order = new AssOrderinfo();
         order.setOrderType(orderType);
             order.setAuditOpenId("-1");
             order.setAutoAuditTime(now);
             order.setAuditTime(now);
-            order.setAuditStatus(AuditStatus.NO_AUDIT);
+            order.setArtificialStatus(2);
+            order.setOrderStep(AssOrderStep.COMPLETED);
+//            order.setAuditStatus(AuditStatus.NO_AUDIT);
             order.setInsertTime(now);
             order.setUpdateTime(now);
             order.setUrgent(0);
             order.setVehicleId(request.getVehicleId());
+            order.setVehiclePlate(vehicleInfo.getVehiclePlate());
+            order.setVehiclePlateColor(vehicleInfo.getVehiclePlateColor());
             order.setCardId(request.getCardId());
+            order.setCardType(cardInfo.getCardTypeNew());
             order.setObuId(request.getObuId());
         }else {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("客户不存在！");
         AssDeviceLoss loss = new AssDeviceLoss();
         loss.setOrderNo(order.getOrderNo());
         loss.setLossType(lossType);
-        loss.setCustomerId(order.getCustomerId());
-        loss.setVehicleId(request.getVehicleId());
-        loss.setCardId(request.getCardId());
-        loss.setObuId(request.getObuId());
+//        loss.setCustomerId(order.getCustomerId());
+//        loss.setVehicleId(request.getVehicleId());
+//        loss.setCardId(request.getCardId());
+//        loss.setObuId(request.getObuId());
         loss.setInsertTime(order.getInsertTime());
 
         if (hasText(request.getVehPosImgUrl())) {