From 717dacc64c502d5f59b9a3c2b9dc7003153e09ce Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 22 Aug 2024 17:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RevenueRewardUserQueryController.java | 30 ++++++++++++------- ...seGetRevenueRewardAbstractQueryParams.java | 4 +++ ...UsePageRevenueRewardRecordQueryParams.java | 3 ++ .../WithdrawAuditUserQueryController.java | 15 ++++++---- .../UserPageWithdrawAuditQueryParams.java | 2 ++ .../revenuereward/RevenueRewardViewMapper.xml | 6 ++++ .../withdrawaudit/WithdrawAuditViewMapper.xml | 25 +++++++++------- 7 files changed, 58 insertions(+), 27 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java index eed16d3..d4a292e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java @@ -5,14 +5,12 @@ import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRe import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractVo; import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardRecordVo; import com.qniao.dam.query.revenuereward.RevenueRewardQueryService; +import com.qniao.dau.infrastructure.constant.RequestHeaderFields; import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Objects; @@ -28,9 +26,14 @@ public class RevenueRewardUserQueryController { @GetMapping("get/revenue-reward-abstract") @ApiOperation("获取用户收益摘要") public UseGetRevenueRewardAbstractVo useGetRevenueRewardAbstract(UseGetRevenueRewardAbstractQueryParams queryParams, - @RequestParam("userId") Long userId) { - if (Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); + @RequestParam("userId") Long userId, + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { + if (Objects.isNull(queryParams.getQueryOrgId())) { + queryParams.setQueryOrgId(orgId); + } else { + if (Objects.isNull(queryParams.getQueryUserId())) { + queryParams.setQueryUserId(userId); + } } return revenueRewardQueryService.getRevenueRewardAbstract(queryParams); } @@ -39,11 +42,16 @@ public class RevenueRewardUserQueryController { @ApiOperation("获取用户收益记录") public QnPage usePageRevenueRewardRecord(PageUtil pageUtil, UsePageRevenueRewardRecordQueryParams queryParams, - @RequestParam("userId") Long userId) { - if (Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); + @RequestParam("userId") Long userId, + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { + if (Objects.isNull(queryParams.getQueryOrgId())) { + queryParams.setQueryOrgId(orgId); + } else { + if (Objects.isNull(queryParams.getQueryUserId())) { + queryParams.setQueryUserId(userId); + } } - return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecord(pageUtil, queryParams),UseGetRevenueRewardRecordVo.class); + return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecord(pageUtil, queryParams), UseGetRevenueRewardRecordVo.class); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UseGetRevenueRewardAbstractQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UseGetRevenueRewardAbstractQueryParams.java index a9b38a0..741f00b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UseGetRevenueRewardAbstractQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UseGetRevenueRewardAbstractQueryParams.java @@ -12,6 +12,10 @@ public class UseGetRevenueRewardAbstractQueryParams { @ApiModelProperty("查询用户标识") private Long queryUserId; + @ApiModelProperty("查询组织标识") + private Long queryOrgId; + + @ApiModelProperty("收益开始时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime revenueTimeFrom; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordQueryParams.java index 7ef0599..6b14b65 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordQueryParams.java @@ -11,6 +11,9 @@ public class UsePageRevenueRewardRecordQueryParams { @ApiModelProperty("查询用户标识") private Long queryUserId; + @ApiModelProperty("查询组织标识") + private Long queryOrgId; + @ApiModelProperty("收益开始时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime revenueTimeFrom; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/WithdrawAuditUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/WithdrawAuditUserQueryController.java index d564be5..c0f403f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/WithdrawAuditUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/WithdrawAuditUserQueryController.java @@ -3,14 +3,12 @@ package com.qniao.dam.api.query.withdrawaudit.user; import com.qniao.dam.api.query.withdrawaudit.user.request.UserPageWithdrawAuditQueryParams; import com.qniao.dam.api.query.withdrawaudit.user.response.UserPageWithdrawAuditVo; import com.qniao.dam.query.withdrawaudit.WithdrawAuditQueryService; +import com.qniao.dau.infrastructure.constant.RequestHeaderFields; import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Objects; @@ -34,10 +32,15 @@ public class WithdrawAuditUserQueryController { @GetMapping("page/withdraw-audit") @ApiOperation("用户获取提现审核记录") public QnPage userPageWithdrawAudit(@RequestParam("userId") Long userId, + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId, PageUtil pageUtil, UserPageWithdrawAuditQueryParams queryParams) { - if (Objects.isNull(queryParams.getQueryUserId())) { - queryParams.setQueryUserId(userId); + if (Objects.isNull(queryParams.getQueryOrgId())) { + queryParams.setQueryOrgId(orgId); + } else { + if (Objects.isNull(queryParams.getQueryUserId())) { + queryParams.setQueryUserId(userId); + } } return PageUtil.convert(withdrawAuditQueryService.pageWithdrawAudit(queryParams, pageUtil), UserPageWithdrawAuditVo.class); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/request/UserPageWithdrawAuditQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/request/UserPageWithdrawAuditQueryParams.java index ee77be9..9bc3dca 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/request/UserPageWithdrawAuditQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/request/UserPageWithdrawAuditQueryParams.java @@ -11,6 +11,8 @@ public class UserPageWithdrawAuditQueryParams { private Long queryUserId; + private Long queryOrgId; + @ApiModelProperty("申请开始时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime applyTimeFrom; diff --git a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml index ef94110..b49f796 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml @@ -15,6 +15,9 @@ and drr.user_id = #{queryParams.queryUserId} + + and drr.org_id = #{queryParams.queryOrgId} + and drrr.trade_type = #{queryParams.tradeType} @@ -40,6 +43,9 @@ and drr.user_id = #{queryParams.queryUserId} + + and drr.org_id = #{queryParams.queryOrgId} + and drrr.trade_type = #{queryParams.tradeType} diff --git a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml index 617a34a..7348caf 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/WithdrawAuditViewMapper.xml @@ -5,21 +5,26 @@