iaw 售后签约查询和参数获取共用

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

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class AssSignParamRequest extends AbstractSignTypeRequest<AssSignParamResponse> {
-    protected AssSignParamRequest() {
+    public AssSignParamRequest() {
         super(AssServiceCmd.ORDERSIGNPARAM);
     }
     @NotBlank

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

@@ -6,6 +6,7 @@ import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.iaw.api.MyValidController;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.ass.*;
+import cn.com.taiji.iaw.dto.ass.sign.ResignResponseDTO;
 import cn.com.taiji.iaw.dto.issue.order.PayApplyReqDTO;
 import cn.com.taiji.iaw.dto.issue.order.PayApplyResDTO;
 import cn.com.taiji.iaw.manager.ass.AssOrderinfoManager;
@@ -39,6 +40,12 @@ public class AssOrderinfoController extends MyValidController {
         return ApiResponse.of(manager.page(dto));
     }
 
+    /**
+     * 售后订单审核 需要在ias中写自己的业务
+     * @param req
+     * @return
+     * @throws ManagerException
+     */
     @ApiOperation("售后订单审核")
     @PostMapping("/review")
     public ApiResponse<Void> review(@Valid @RequestBody AssReviewRequestDTO req) throws ManagerException {
@@ -47,6 +54,12 @@ public class AssOrderinfoController extends MyValidController {
     }
 
 
+    /**
+     * 售后订单取消 需要在ias中写自己的业务
+     * @param reqDto
+     * @return
+     * @throws ManagerException
+     */
     @ApiOperation(value = "售后订单取消")
     @PostMapping("/cancel")
     public ApiResponse<?> cancel(@Valid @RequestBody CustomerInfoCancelReqDTO reqDto) throws ManagerException {
@@ -60,16 +73,55 @@ public class AssOrderinfoController extends MyValidController {
         Pagination page = manager.selectAssPro(reqDto);
         return ApiResponse.of(page);
     }
-    @ApiOperation(value = "支付查询")
+
+    /**
+     * 售后支付查询 需要在ias中写自己的业务
+     * @param reqDto
+     * @return
+     * @throws ManagerException
+     */
+    @ApiOperation(value = "售后支付查询")
     @PostMapping(value = "/payQuery")
     public ApiResponse<AssPayQueryResDTO> payQuery(@Valid @RequestBody AssPayQueryReqDTO reqDto) throws ManagerException {
         AssPayQueryResDTO res = manager.payQuery(reqDto);
         return ApiResponse.of(res);
     }
+    /**
+     * 售后支付申请,需要在iaw根据自己业务拓展日志记录
+     * @param reqDto
+     * @return
+     * @throws ManagerException
+     */
     @ApiOperation(value = "售后支付申请")
     @PostMapping(value = "/payApply")
     public ApiResponse<PayApplyResDTO> payApply(@Valid @RequestBody PayApplyReqDTO reqDto) throws ManagerException {
         PayApplyResDTO res = manager.payApply(reqDto);
         return ApiResponse.of(res);
     }
+
+    /**
+     * 售后签约参数获取 需要在ias中写自己的业务
+     * @param reqDto
+     * @return
+     * @throws ManagerException
+     */
+    @ApiOperation(value = "售后签约参数获取")
+    @PostMapping(value = "/getSignParam")
+    public ApiResponse<ResignResponseDTO> getSignParam(@Valid @RequestBody AssSignQueryReqDTO reqDto) throws ManagerException {
+        ResignResponseDTO res = manager.getSignParam(reqDto);
+        return ApiResponse.of(res);
+    }
+
+    /**
+     * 售后签约查询 需要在ias中写自己的业务
+     * @param reqDto
+     * @return
+     * @throws ManagerException
+     */
+    @ApiOperation(value = "售后签约查询")
+    @PostMapping(value = "/signQuery")
+    public ApiResponse<AssSignQueryResDTO> signQuery(@Valid @RequestBody AssSignQueryReqDTO reqDto) throws ManagerException {
+        AssSignQueryResDTO res = manager.signQuery(reqDto);
+        return ApiResponse.of(res);
+    }
 }

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

@@ -43,31 +43,6 @@ public class SignChangeController extends MyValidController {
         return ApiResponse.success();
     }
 
-    //审核 todo
-
-//    @ApiOperation("支付查询")
-//    @PostMapping("/collect")
-//    public ApiResponse<?> collect(@Valid @RequestBody SignChangeApplyReqDTO dto) throws ManagerException {
-//        manager.collect(dto);
-//        return ApiResponse.success();
-//    }
-//    @ApiOperation("支付申请")
-//    @PostMapping("/collect")
-//    public ApiResponse<?> collect(@Valid @RequestBody SignChangeApplyReqDTO dto) throws ManagerException {
-//        manager.collect(dto);
-//        return ApiResponse.success();
-//    }
-//    @ApiOperation("签约参数获取")
-//    @PostMapping("/collect")
-//    public ApiResponse<?> collect(@Valid @RequestBody SignChangeApplyReqDTO dto) throws ManagerException {
-//        manager.collect(dto);
-//        return ApiResponse.success();
-//    }
-//    @ApiOperation("签约检测")
-//    @PostMapping("/collect")
-//    public ApiResponse<?> collect(@Valid @RequestBody SignChangeApplyReqDTO dto) throws ManagerException {
-//        manager.collect(dto);
-//        return ApiResponse.success();
-//    }
+    //售后统一接口 todo
 
 }

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

@@ -1,5 +1,6 @@
 package cn.com.taiji.iaw.dto.ass;
 
+import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.model.comm.protocol.ias.order.OrderPayQueryModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,4 +25,6 @@ public class AssPayQueryResDTO {
     private Long sumFee;
     @ApiModelProperty(value = "支付单列表")
     private List<OrderPayQueryModel> datas;
+    @ApiModelProperty(value = "订单阶段")
+    private AssOrderStep orderStep;//订单阶段;
 }

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

@@ -0,0 +1,31 @@
+package cn.com.taiji.iaw.dto.ass;
+
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
+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/9/20 9:34
+ * @Filename：AssSignQuery
+ * @description:
+ */
+@Data
+@ApiModel(description = "售后签约查询参数")
+public class AssSignQueryReqDTO extends AbstractBizRequestDTO {
+    @NotBlank
+    @ApiModelProperty(value = "售后表订单编号")
+    private String orderNo;//售后表订单编号
+    @NotNull
+    @IntegerConstant(values = "1,2")
+    @ApiModelProperty(value = "签约渠道类型 1:微信小程序 2：支付宝小程序")
+    private Integer signChannelType=1;// 1:微信小程序 2：支付宝小程序
+    @NotBlank
+    @ApiModelProperty(value = "黔通微信或支付宝小程序的openId")
+    private String subOpenId;// signChannelType=1或2时必填，填黔通微信或支付宝小程序的openId，
+}

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

@@ -0,0 +1,24 @@
+package cn.com.taiji.iaw.dto.ass;
+
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+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/20 9:34
+ * @Filename：AssSignQuery
+ * @description:
+ */
+@Data
+@ApiModel(description = "售后签约查询参数")
+public class AssSignQueryResDTO extends AbstractBizRequestDTO {
+
+    @ApiModelProperty(value = "签约状态 true已签约，false 未签约", required = true)
+    private Boolean sign;
+
+    @ApiModelProperty(value = "售后订单阶段", required = true)
+    private AssOrderStep orderStep;//订单阶段
+}

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

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.ass.*;
+import cn.com.taiji.iaw.dto.ass.sign.ResignResponseDTO;
 import cn.com.taiji.iaw.dto.issue.order.PayApplyReqDTO;
 import cn.com.taiji.iaw.dto.issue.order.PayApplyResDTO;
 
@@ -27,4 +28,8 @@ public interface AssOrderinfoManager {
     PayApplyResDTO payApply(PayApplyReqDTO reqDto) throws ManagerException;
 
     AssPayQueryResDTO payQuery(AssPayQueryReqDTO reqDto) throws ManagerException;
+
+    AssSignQueryResDTO signQuery(AssSignQueryReqDTO reqDto) throws ManagerException;
+
+    ResignResponseDTO getSignParam(AssSignQueryReqDTO reqDto) throws ManagerException;
 }

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

@@ -18,6 +18,7 @@ import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.ass.*;
+import cn.com.taiji.iaw.dto.ass.sign.ResignResponseDTO;
 import cn.com.taiji.iaw.dto.issue.order.PayApplyReqDTO;
 import cn.com.taiji.iaw.dto.issue.order.PayApplyResDTO;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
@@ -25,7 +26,6 @@ import cn.com.taiji.iaw.model.MyFinals;
 import cn.com.taiji.iaw.repo.jpa.request.issue.ProductPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -124,4 +124,25 @@ public class AssOrderinfoManagerImpl extends AbstractIawManager implements AssOr
         return copyProperties(response, new AssPayQueryResDTO());
     }
 
+    @Override
+    public AssSignQueryResDTO signQuery(AssSignQueryReqDTO reqDto) throws ManagerException {
+        AssSignQueryRequest request = copyProperties(reqDto, new AssSignQueryRequest());
+        request.setAccessToken(reqDto.getAccessToken());
+        AssSignQueryResponse response = jsonPostRepeat(request);
+        AssSignQueryResDTO resDTO = new AssSignQueryResDTO();
+        resDTO.setSign(response.getSign());
+        resDTO.setOrderStep(response.getOrderStep());
+        //记录日志
+        sysPersistOperateLog(response.getOperateType(), response.getId(), reqDto.getOrderSource(), findOpenIdByToken(reqDto.getAccessToken()), response.getOperateType().getValue());
+        return resDTO;
+    }
+
+    @Override
+    public ResignResponseDTO getSignParam(AssSignQueryReqDTO reqDto) throws ManagerException {
+        AssSignParamRequest request = copyProperties(reqDto, new AssSignParamRequest());
+        AssSignParamResponse response = jsonPostRepeat(request);
+        //记录日志
+        sysPersistOperateLog(response.getOperateType(), response.getId(), reqDto.getOrderSource(), findOpenIdByToken(reqDto.getAccessToken()), response.getOperateType().getValue());
+        return copyProperties(response,new ResignResponseDTO());
+    }
 }