managew

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/AssOrderinfoController.java

@@ -5,6 +5,7 @@ import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.managew.api.MyValidController;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
+import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
 import cn.com.taiji.managew.manager.ass.AssOrderinfoManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,5 +38,12 @@ public class AssOrderinfoController extends MyValidController {
         return ApiResponse.of(manager.page(dto)).setMessage("操作成功！");
     }
 
+    @ApiOperation("售后订单审核")
+    @PostMapping("/review")
+    public ApiResponse<Void> review(@Valid @RequestBody AssReviewRequestDTO req) throws ManagerException {
+        manager.review(req);
+        return ApiResponse.success();
+    }
+
 
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/ReleasePlateController.java

@@ -45,13 +45,6 @@ public class ReleasePlateController extends MyValidController {
         return ApiResponse.of(res);
     }
 
-    @ApiOperation("申请解除车牌审核")
-    @PostMapping("/review")
-    public ApiResponse<Void> review(@Valid @RequestBody ReleasePlateReviewRequestDTO req) throws ManagerException {
-        releasePlateManager.review(req);
-        return ApiResponse.success();
-    }
-
 //    //用户查询、列表
 //    @ApiOperation("解除车牌占用列表")
 //    @PostMapping("/list")

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

@@ -0,0 +1,40 @@
+package cn.com.taiji.managew.dto.ass;
+
+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;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/30 23:42
+ * @Filename：AssReviewRequestDTO
+ * @description:
+ */
+@Data
+@ApiModel(description = "售后订单-售后审核")
+public class AssReviewRequestDTO extends AbstractStaffBizRequestDTO {
+
+    @ApiModelProperty(value = "售后订单编号", required = true)
+    @NotBlank
+    private String orderNo;
+    @NotNull
+    @ApiModelProperty(value = "是否通过", required = true)
+    private Boolean auditStatus;
+
+    @ApiModelProperty(value = "审核不通过原因", required = true)
+    private String reason;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+        super.validate(validator);
+        if (!auditStatus) {
+            validator.validField("failReason", StringTools.isEmpty(reason), "审核不通过时，审核不通过原因不能为空");
+        }
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
+import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
 
 /**
  * @Auther: humh
@@ -14,4 +15,6 @@ import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
  */
 public interface AssOrderinfoManager {
     Pagination page(AssOrderinfoPageRequestDTO dto) throws ManagerException;
+
+    void review(AssReviewRequestDTO req) throws ManagerException;
 }

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

@@ -4,10 +4,13 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.user.Staff;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditResponse;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
+import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +45,15 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
         return repo.page(pageRequest).convertResult(this::toModel);
     }
 
+    @Override
+    public void review(AssReviewRequestDTO req) throws ManagerException {
+        AssOrderAuditRequest request = copyProperties(req, new AssOrderAuditRequest());
+        request.setSourceIn(req.getOrderSource());
+        request.setStaffId(req.getStaffId());
+        AssOrderAuditResponse response = jsonPostRepeat(request);
+        sysPersistOperateLog(response.getType(),response.getId(),req.getOrderSource(),findOpenIdByToken(req.getAccessToken()),response.getType().getValue());
+    }
+
     private AssOrderInfoModel toModel(AssOrderinfo orderInfo) {
         AssOrderInfoModel model = new AssOrderInfoModel();
         copyProperties(orderInfo, model);

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

@@ -13,7 +13,6 @@ import cn.com.taiji.managew.dto.ass.releasePlate.*;
  * @description:
  */
 public interface ReleasePlateManager {
-    void review(ReleasePlateReviewRequestDTO req) throws ManagerException;
 
     PlateOccupyQueryResponse occupyQuery(PlateOccupyQueryRequest req) throws ManagerException;
 

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

@@ -27,15 +27,6 @@ public class ReleasePlateManagerImpl extends AbstractManagewManager implements R
     @Autowired
     protected MinioUtil minioUtil;
 
-    @Override
-    public void review(ReleasePlateReviewRequestDTO req) throws ManagerException {
-
-        ReleasePlateReviewRequest request = copyProperties(req, new ReleasePlateReviewRequest());
-        request.setSourceIn(req.getOrderSource());
-        request.setOpenId(findOpenIdByToken(req.getAccessToken()));
-        ReleasePlateReviewResponse response = jsonPostRepeat(request);
-        sysPersistOperateLog(OperateType.RELEASE_PLATE_REVIEW,response.getId(),req.getOrderSource(),findOpenIdByToken(req.getAccessToken()),"解除车牌占用审核");
-    }
 
     @Override
     public PlateOccupyQueryResponse occupyQuery(PlateOccupyQueryRequest req) throws ManagerException {

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

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