userw

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/WxPayConfigController.java

 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
-import cn.com.taiji.core.entity.comm.CommonPayConfig;
 import cn.com.taiji.userw.dto.wx.*;
 import cn.com.taiji.userw.manager.wx.WxPayConfigManager;
 import io.swagger.annotations.Api;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @Author：ChenChao
  * @Date：2025/5/20 17:00
     private WxPayConfigManager manager;
     @ApiOperation(value = "分页查询")
     @PostMapping(value = "/page")
-    public ApiResponse<Pagination> page(@Validated @RequestBody WxPayPageRequestDTO reqDto)  {
+    public ApiResponse<Pagination> page(@Validated @RequestBody WxPayPageReqtDTO reqDto)  {
         Pagination page = manager.page(reqDto);
         return ApiResponse.of(page);
     }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/WxSignConfigController.java

 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.userw.dto.wx.WxCarAddReqDTO;
-import cn.com.taiji.userw.dto.wx.WxCarPageRequestDTO;
+import cn.com.taiji.userw.dto.wx.WxCarPageReqDTO;
 import cn.com.taiji.userw.dto.wx.WxCarUpdateReqDTO;
 import cn.com.taiji.userw.manager.wx.WxSignChannelConfigManager;
 import io.swagger.annotations.Api;
     private WxSignChannelConfigManager manager;
     @ApiOperation(value = "分页查询")
     @PostMapping(value = "/page")
-    public ApiResponse<Pagination> page(@Validated @RequestBody WxCarPageRequestDTO reqDto)  {
+    public ApiResponse<Pagination> page(@Validated @RequestBody WxCarPageReqDTO reqDto)  {
         Pagination page = manager.page(reqDto);
         return ApiResponse.of(page);
     }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxCarPageRequestDTO.java → zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxCarPageReqDTO.java

  * @description:
  */
 @Data
-public class WxCarPageRequestDTO extends AbstractStaffBizPageRequestDTO {
+public class WxCarPageReqDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "渠道编号")
     @FixedLength(length = 11)

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxCarPageResDTO.java

+package cn.com.taiji.userw.dto.wx;
+
+import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
+import cn.com.taiji.core.entity.comm.CommonWxSignConfig;
+import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/5/20 14:52
+ * @Filename：WxConfigPageRequestDTO
+ * @description:
+ */
+@ApiModel(description ="微信签约分页查询")
+@Data
+public class WxCarPageResDTO extends CommonWxSignConfig {
+
+    @ApiModelProperty(value = "渠道名称")
+    private String agencyName;
+
+}

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayPageRequestDTO.java → zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayPageReqtDTO.java

  */
 @Data
 @ApiModel(description ="支付配置分页查询")
-public class WxPayPageRequestDTO extends AbstractStaffBizPageRequestDTO {
+public class WxPayPageReqtDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "渠道编号")
     @FixedLength(length = 11)

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayPageResDTO.java

+package cn.com.taiji.userw.dto.wx;
+
+import cn.com.taiji.core.entity.comm.CommonPayConfig;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/6/9 17:36
+ * @Filename：WxPayPageResDTO
+ * @description:
+ */
+@ApiModel(description ="微信支付分页查询")
+@Data
+public class WxPayPageResDTO extends CommonPayConfig {
+
+    @ApiModelProperty(value = "渠道名称")
+    private String agencyName;
+
+}

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/wx/WxPayConfigManager.java

 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.userw.dto.wx.WxPayAddReqDTO;
-import cn.com.taiji.userw.dto.wx.WxPayPageRequestDTO;
+import cn.com.taiji.userw.dto.wx.WxPayPageReqtDTO;
 import cn.com.taiji.userw.dto.wx.WxPayUpdateReqDTO;
 
-import java.util.List;
-
 /**
  * @Author：ChenChao
  * @Date：2025/5/20 17:03
  * @description: 微信支付配置管理
  */
 public interface WxPayConfigManager {
-    Pagination page(WxPayPageRequestDTO reqDto);
+    Pagination page(WxPayPageReqtDTO reqDto);
 
     void add(WxPayAddReqDTO reqDto);
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/wx/WxPayConfigManagerImpl.java

 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.basic.QtkAgency;
 import cn.com.taiji.core.entity.comm.CommonPayConfig;
+import cn.com.taiji.core.repo.jpa.basic.QtkAgencyRepo;
 import cn.com.taiji.core.repo.jpa.comm.CommonPayConfigRepo;
 import cn.com.taiji.userw.dto.wx.WxPayAddReqDTO;
-import cn.com.taiji.userw.dto.wx.WxPayPageRequestDTO;
+import cn.com.taiji.userw.dto.wx.WxPayPageReqtDTO;
+import cn.com.taiji.userw.dto.wx.WxPayPageResDTO;
 import cn.com.taiji.userw.dto.wx.WxPayUpdateReqDTO;
 import cn.com.taiji.userw.repo.jpa.request.CommonPayConfigPageRequest;
-import cn.com.taiji.userw.repo.jpa.request.CommonWxSignConfigPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @Author：ChenChao
  * @Date：2025/5/20 17:03
 
     @Autowired
     private CommonPayConfigRepo commonPayConfigRepo;
+    @Autowired
+    private QtkAgencyRepo qtkAgencyRepo;
+
     @Override
-    public Pagination page(WxPayPageRequestDTO reqDto) {
+    public Pagination page(WxPayPageReqtDTO reqDto) {
         CommonPayConfigPageRequest request = copyProperties(reqDto, new CommonPayConfigPageRequest());
-        return commonPayConfigRepo.page(request);
+        return commonPayConfigRepo.page(request).convertResult(this::cover);
+    }
+
+    private WxPayPageResDTO cover(CommonPayConfig o) {
+        WxPayPageResDTO resDTO = copyProperties(o, new WxPayPageResDTO());
+        QtkAgency agency = qtkAgencyRepo.findByAgencyId(o.getAgencyId());
+        if (agency != null) {
+            resDTO.setAgencyName(agency.getName());
+        }
+        return resDTO;
     }
 
     @Override

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/wx/WxSignChannelConfigManager.java

 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.userw.dto.wx.WxCarAddReqDTO;
-import cn.com.taiji.userw.dto.wx.WxCarPageRequestDTO;
+import cn.com.taiji.userw.dto.wx.WxCarPageReqDTO;
 import cn.com.taiji.userw.dto.wx.WxCarUpdateReqDTO;
 
 /**
  * @description:
  */
 public interface WxSignChannelConfigManager {
-    Pagination page(WxCarPageRequestDTO reqDto);
+    Pagination page(WxCarPageReqDTO reqDto);
 
     void add(WxCarAddReqDTO reqDto) throws ManagerException;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/wx/WxSignChannelConfigManagerImpl.java

 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.basic.QtkAgency;
 import cn.com.taiji.core.entity.comm.CommonWxSignConfig;
+import cn.com.taiji.core.repo.jpa.basic.QtkAgencyRepo;
 import cn.com.taiji.core.repo.jpa.comm.CommonWxSignConfigRepo;
 import cn.com.taiji.userw.dto.wx.WxCarAddReqDTO;
-import cn.com.taiji.userw.dto.wx.WxCarPageRequestDTO;
+import cn.com.taiji.userw.dto.wx.WxCarPageReqDTO;
+import cn.com.taiji.userw.dto.wx.WxCarPageResDTO;
 import cn.com.taiji.userw.dto.wx.WxCarUpdateReqDTO;
 import cn.com.taiji.userw.repo.jpa.request.CommonWxSignConfigPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 
     @Autowired
     private CommonWxSignConfigRepo commonWxSignConfigRepo;
+    @Autowired
+    private QtkAgencyRepo qtkAgencyRepo;
+
     @Override
-    public Pagination page(WxCarPageRequestDTO reqDto) {
+    public Pagination page(WxCarPageReqDTO reqDto) {
         CommonWxSignConfigPageRequest request = copyProperties(reqDto, new CommonWxSignConfigPageRequest());
-        return commonWxSignConfigRepo.page(request);
+        return commonWxSignConfigRepo.page(request).convertResult(this::cover);
+    }
+
+    private WxCarPageResDTO cover(CommonWxSignConfig o) {
+        WxCarPageResDTO resDTO = copyProperties(o, new WxCarPageResDTO());
+        QtkAgency agency = qtkAgencyRepo.findByAgencyId(o.getAgencyId());
+        if (agency != null){
+            resDTO.setAgencyName(agency.getName());
+        }
+        return resDTO;
     }
+
     @Override
     public void add(WxCarAddReqDTO reqDto) throws ManagerException {
         CommonWxSignConfig byAgencyId = commonWxSignConfigRepo.findByAgencyId(reqDto.getAgencyId());