iaw 签约信息变更完善

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/ass/SignChangeController.java

@@ -39,9 +39,9 @@ public class SignChangeController extends MyValidController {
 
     @ApiOperation("收集信息")
     @PostMapping("/collect")
-    public ApiResponse<?> collect(@Valid @RequestBody SignChangeCollectReqDTO dto) throws ManagerException {
-        manager.collect(dto);
-        return ApiResponse.success();
+    public ApiResponse<SignChangeCollectResDTO> collect(@Valid @RequestBody SignChangeCollectReqDTO dto) throws ManagerException {
+        SignChangeCollectResDTO resDTO = manager.collect(dto);
+        return ApiResponse.of(resDTO);
     }
 
     //用户查询、列表
@@ -52,7 +52,6 @@ public class SignChangeController extends MyValidController {
         return ApiResponse.of(responDTO);
     }
 
-    //用户查询、列表
     @ApiOperation("订单详情-小程序")
     @PostMapping("/view")
     public ApiResponse<SignChangeDetailResDTO> view(@Validated @RequestBody SignChangeDetailReqDTO req) throws ManagerException {
@@ -60,13 +59,12 @@ public class SignChangeController extends MyValidController {
         return ApiResponse.of(responDTO);
     }
 
-//    //用户查询、列表
-//    @ApiOperation("订单详情-APP")
-//    @PostMapping("/beforeReview")
-//    public ApiResponse<ReleasePlateListResponDTO> beforeReview(@Validated @RequestBody CommRequestDTO req) throws ManagerException {
-//        ReleasePlateListResponDTO responDTO = manager.beforeReview(req);
-//        return ApiResponse.of(responDTO);
-//    }
+    @ApiOperation("订单详情-APP")
+    @PostMapping("/beforeReview")
+    public ApiResponse<SignChangeDetailAppResDTO> beforeReview(@Validated @RequestBody SignChangeDetailReqDTO req) throws ManagerException {
+        SignChangeDetailAppResDTO responDTO = manager.beforeReview(req);
+        return ApiResponse.of(responDTO);
+    }
 
     //售后统一接口 todo
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/signChange/SignChangeCollectResDTO.java

@@ -0,0 +1,22 @@
+package cn.com.taiji.iaw.dto.ass.signChange;
+
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/22 20:35
+ * @Filename：SignChangeCollectResDTO
+ * @description:
+ */
+@Data
+@ApiModel(description = "签约变更收集信息响应参数")
+public class SignChangeCollectResDTO {
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+    @ApiModelProperty(value = "订单步骤")
+    private AssOrderStep orderStep;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/signChange/SignChangeDetailAppResDTO.java

@@ -0,0 +1,20 @@
+package cn.com.taiji.iaw.dto.ass.signChange;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/9/22 11:52
+ * @Filename：SignChangeDetailResDTO
+ * @description:
+ */
+@Data
+@ApiModel(description = "签约信息变更App详情")
+public class SignChangeDetailAppResDTO extends SignChangeDetailResDTO{
+
+    @ApiModelProperty(value = "机审失败原因")
+    private String auditReason;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/signChange/SignChangeDetailResDTO.java

@@ -1,6 +1,9 @@
 package cn.com.taiji.iaw.dto.ass.signChange;
 
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
+import cn.com.taiji.core.entity.dict.basic.UseUserType;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,4 +15,35 @@ import lombok.Data;
 @Data
 @ApiModel(description = "签约信息变更详情")
 public class SignChangeDetailResDTO {
+
+    @ApiModelProperty(value = "售后订单编号")
+    private String orderNo;
+    @ApiModelProperty(value = "订单阶段")
+    private AssOrderStep orderStep;//订单阶段;
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlate;//车牌号;
+    @ApiModelProperty(value = "车辆行驶证正面图片")
+    private String vehPosImgUrl;//行驶证正面图片地址;
+    @ApiModelProperty(value = "车辆行驶证反面图片")
+    private String vehNegImgUrl;//行驶证反面图片地址;
+    @ApiModelProperty(value = "行驶证姓名")
+    private String vehicleName;//行驶证姓名
+    @ApiModelProperty(value = "车辆使用类型")
+    private UseUserType useUserType;//车辆使用类型;
+    @ApiModelProperty(value = "vin码")
+    private String vin;// vin码
+    @ApiModelProperty(value = "车辆使用类型")
+    private String vehicleType;// 行驶证车辆类型
+    @ApiModelProperty(value = "行驶证车辆品牌")
+    private String vehicleModel;// 行驶证车辆品牌
+    @ApiModelProperty(value = "车辆尺寸")
+    private String vehicleDimensions;// 车辆尺寸
+    @ApiModelProperty(value = "车身45°照片")
+    private String vehBodyUrl;// 车身45°照片
+    @ApiModelProperty(value = "发动机编号")
+    private String engineNum;// 发动机编号
+    @ApiModelProperty(value = "车辆发证日期")
+    private String issueDate;// 发证日期
+
+
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/SignChangeManager.java

@@ -15,9 +15,11 @@ import cn.com.taiji.iaw.dto.ass.signChange.*;
 public interface SignChangeManager {
     SignChangeApplyResDTO apply(SignChangeApplyReqDTO dto) throws ManagerException;
 
-    void collect(SignChangeCollectReqDTO dto) throws ManagerException;
+    SignChangeCollectResDTO collect(SignChangeCollectReqDTO dto) throws ManagerException;
 
     ReleasePlateListResponDTO list(CommRequestDTO req) throws ServiceHandleException;
 
     SignChangeDetailResDTO view(SignChangeDetailReqDTO req) throws ManagerException;
+
+    SignChangeDetailAppResDTO beforeReview(SignChangeDetailReqDTO req) throws ManagerException;
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/SignChangeManagerImpl.java

@@ -19,7 +19,6 @@ import cn.com.taiji.iaw.dto.ass.signChange.*;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -55,11 +54,15 @@ public class SignChangeManagerImpl extends AbstractIawManager implements SignCha
     }
 
     @Override
-    public void collect(SignChangeCollectReqDTO dto) throws ManagerException {
+    public SignChangeCollectResDTO collect(SignChangeCollectReqDTO dto) throws ManagerException {
         SignChangeCollectRequest request = copyProperties(dto, new SignChangeCollectRequest());
         SignChangeCollectResponse response = jsonPostRepeat(request);
         sysPersistOperateLog(OperateType.SIGN_CHANGE_COLLECT, response.getId(), dto.getOrderSource(),
                 findOpenIdByToken(dto.getAccessToken()), "签约信息变更收集");
+        SignChangeCollectResDTO resDTO = new SignChangeCollectResDTO();
+        resDTO.setOrderNo(response.getOrderNo());
+        resDTO.setOrderStep(response.getOrderStep());
+        return resDTO;
 
     }
 
@@ -79,6 +82,18 @@ public class SignChangeManagerImpl extends AbstractIawManager implements SignCha
         AssOrderinfo orderInfo = orderInfoRepo.findByOrderNo(req.getOrderNo());
         if (orderInfo == null) throw new ManagerException("未找到该订单");
         AssSignChange assSignChange = assSignChangeRepo.findByOrderNo(req.getOrderNo());
-        return null;
+        SignChangeDetailResDTO resDTO = copyProperties(assSignChange, new SignChangeDetailResDTO());
+        resDTO.setOrderStep(orderInfo.getOrderStep());
+        return resDTO;
+    }
+    @Override
+    public SignChangeDetailAppResDTO beforeReview(SignChangeDetailReqDTO req) throws ManagerException {
+        AssOrderinfo orderInfo = orderInfoRepo.findByOrderNo(req.getOrderNo());
+        if (orderInfo == null) throw new ManagerException("未找到该订单");
+        AssSignChange assSignChange = assSignChangeRepo.findByOrderNo(req.getOrderNo());
+        SignChangeDetailAppResDTO resDTO = copyProperties(assSignChange, new SignChangeDetailAppResDTO());
+        resDTO.setOrderStep(orderInfo.getOrderStep());
+        resDTO.setAuditReason(orderInfo.getAuditReason());
+        return resDTO;
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/SignChangeApplyManager.java → zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/signChange/SignChangeApplyManager.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.ass;
+package cn.com.taiji.ias.manager.ass.signChange;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
@@ -24,6 +24,7 @@ import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductPayRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductRepo;
 import cn.com.taiji.ias.dict.DataType;
+import cn.com.taiji.ias.manager.ass.AbstractAssManager;
 import cn.com.taiji.ias.model.MyFinals;
 import cn.com.taiji.ias.model.ServiceLogEvent;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +42,7 @@ import java.util.Map;
  * @description:
  */
 @Service
-public class SignChangeApplyManager extends AbstractAssManager<SignChangeApplyRequest>{
+public class SignChangeApplyManager extends AbstractAssManager<SignChangeApplyRequest> {
     public SignChangeApplyManager() {
         super(DataType.SIGNCHANGE_APPLY);
     }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/SignChangeCollectManager.java → zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/signChange/SignChangeCollectManager.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.ass;
+package cn.com.taiji.ias.manager.ass.signChange;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
@@ -11,6 +11,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.ass.SignChangeCollectResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import cn.com.taiji.core.repo.jpa.ass.AssSignChangeRepo;
 import cn.com.taiji.ias.dict.DataType;
+import cn.com.taiji.ias.manager.ass.AbstractAssManager;
 import cn.com.taiji.ias.manager.audit.VerificationRuleManager;
 import cn.com.taiji.ias.model.ServiceLogEvent;
 import cn.com.taiji.ias.model.issue.CarOcrCheck;
@@ -27,7 +28,7 @@ import java.util.Map;
  * @description:
  */
 @Service
-public class SignChangeCollectManager extends AbstractAssManager<SignChangeCollectRequest>{
+public class SignChangeCollectManager extends AbstractAssManager<SignChangeCollectRequest> {
     @Autowired
     private AssSignChangeRepo assSignChangeRepo;
 
@@ -65,6 +66,7 @@ public class SignChangeCollectManager extends AbstractAssManager<SignChangeColle
             sBuilder.append(",此次车辆VIN码{"+req.getVin()+"}与之前VIN码{"+vehicleInfo.getVin()+"}不一致");
         }
         if (hasText(sBuilder.toString())) {
+            assOrderinfo.setAuditReason(sBuilder.toString());
             //人工审核
             assOrderinfo.setOrderStep(AssOrderStep.WAITING_AUDIT);
         }else {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -20,6 +20,8 @@ import cn.com.taiji.ias.manager.ass.releasePlate.PlateOccupyQueryManager;
 import cn.com.taiji.ias.manager.ass.releasePlate.ReleasePlateApplyManager;
 import cn.com.taiji.ias.manager.ass.releasePlate.ReleasePlateViewManager;
 import cn.com.taiji.ias.manager.ass.resign.ResignManager;
+import cn.com.taiji.ias.manager.ass.signChange.SignChangeApplyManager;
+import cn.com.taiji.ias.manager.ass.signChange.SignChangeCollectManager;
 import cn.com.taiji.ias.manager.ass.vehicleChange.VehicleChangeApplyManager;
 import cn.com.taiji.ias.manager.vehicleInfoChange.VehicleChangeCancelManager;
 import com.zgglyun.common.model.AbstractHttpRequestInfo;