managew

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

@@ -1,35 +0,0 @@
-package cn.com.taiji.managew.dto.ass.releasePlate;
-
-import cn.com.taiji.common.pub.StringTools;
-import cn.com.taiji.common.valid.ViolationValidator;
-import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-@Data
-@ApiModel(description = "售后订单-解除车牌占用审核")
-public class ReleasePlateReviewRequestDTO extends AbstractStaffBizRequestDTO {
-
-    @ApiModelProperty(value = "售后订单编号", required = true)
-    @NotBlank
-    private String orderNo;
-
-    @ApiModelProperty(value = "是否通过 0否1是", required = true)
-    @NotNull
-    private Integer pass;
-
-    @ApiModelProperty(value = "审核不通过原因", required = true)
-    private String failReason;
-
-    @Override
-    protected void validate(ViolationValidator validator) {
-        super.validate(validator);
-        if (pass == 0) {
-            validator.validField("failReason",StringTools.isEmpty(failReason), "审核不通过时，审核不通过原因不能为空");
-        }
-    }
-}

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

@@ -6,6 +6,7 @@ import cn.com.taiji.core.entity.basic.QtkBlackObu;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
 import cn.com.taiji.core.entity.dict.AuditStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.managew.model.ass.releasePlate.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,8 +24,9 @@ public class ReleasePlateViewResponseDTO  {
     private LocalDateTime applyTime;//下单申请时间
     @ApiModelProperty(value = "售后订单编号")
     private String orderNo;
-    @ApiModelProperty(value = "订单审核状态")
-    private AuditStatus auditStatus;// 订单审核状态
+    @ApiModelProperty(value = "订单阶段")
+//    private AuditStatus auditStatus;// 订单审核状态
+    private AssOrderStep orderStep;//订单阶段;
 
     @ApiModelProperty(value = "身份证信息")
     private ApplyInfo applyInfo;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/ReleasePlateManagerImpl.java

@@ -46,7 +46,7 @@ public class ReleasePlateManagerImpl extends AbstractManagewManager implements R
 
         responseDTO.setApplyTime(assOrderinfo.getApplyTime());
         responseDTO.setOrderNo(assOrderinfo.getOrderNo());
-        responseDTO.setAuditStatus(assOrderinfo.getAuditStatus());
+        responseDTO.setOrderStep(assOrderinfo.getOrderStep());
         //申请信息
         ApplyInfo applyInfo = new ApplyInfo();
         applyInfo.setCustomerIdNum(vehicleRelieve.getUserIdNum());

zhywpt-app-managew/src/main/resources/bootstrap.yml

@@ -14,8 +14,7 @@ spring:
       discovery:
         enabled: true
         server-addr: 100.64.2.105:8848
-#        namespace: zhywpt-new-test
-        namespace: zhywpt-prod-new
+        namespace: zhywpt-new-test
         username: nacos
         password: 'Pw=j8PKxV7s9'
         ip: 127.0.0.1
@@ -24,8 +23,7 @@ spring:
         enabled: true
         file-extension: yaml  # 必须修改成yaml
         server-addr: 100.64.2.105:8848
-#        namespace: zhywpt-new-test
-        namespace: zhywpt-prod-new
+        namespace: zhywpt-new-test
         username: nacos
         password: 'Pw=j8PKxV7s9'
         extension-configs: