diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java index 273a91a..56ef722 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java @@ -21,6 +21,9 @@ import java.util.Map; @TableName("da_withdraw_audit") public class WithdrawAudit extends Entity { + @ApiModelProperty("APPID") + private Long appId; + @ApiModelProperty("钱包账号标识") private Long walletAccountId; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java index e2ae9b9..da81f1f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/withdrawaudit/user/WithdrawAuditUserCommandController.java @@ -46,9 +46,10 @@ public class WithdrawAuditUserCommandController { @PostMapping("apply/wallet-account/withdraw") public void userApplyWalletAccountWithdraw(@RequestBody @Valid UserApplyWalletAccountWithdrawDto dto, @RequestParam("userId") Long userId, - @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { - Long appId = Long.valueOf(ServletUtils.getAppId()); + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId, + @RequestHeader(name = RequestHeaderFields.FIELD_APP_ID) Long appId) { WithdrawAudit withdrawAudit = dto.trans2Domain(); + withdrawAudit.setAppId(appId); if (Objects.nonNull(orgId)) { withdrawAudit.setIdentityType(IdentityTypeEnum.ORGANIZATION); withdrawAudit.setWalletAccountOrgId(orgId); 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 a6e46ed..cfb4400 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 @@ -34,8 +34,10 @@ public class WithdrawAuditUserQueryController { @ApiOperation("用户获取提现审核记录") public QnPage userPageWithdrawAudit(@RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId, + @RequestHeader(name = RequestHeaderFields.FIELD_APP_ID) Long appId, PageUtil pageUtil, UserPageWithdrawAuditQueryParams queryParams) { + queryParams.setQueryAppId(appId); if (Objects.isNull(queryParams.getQueryOrgId()) && Objects.isNull(queryParams.getQueryUserId())) { if (Objects.nonNull(orgId)) { queryParams.setQueryOrgId(orgId); 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 79f7f69..48a80ca 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 @@ -9,6 +9,8 @@ import java.time.LocalDateTime; @Data public class UserPageWithdrawAuditQueryParams { + private Long queryAppId; + private Long queryUserId; private Long queryOrgId; diff --git a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/PurchaseProductRecordQueryService.xml b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/PurchaseProductRecordQueryService.xml index e2e4954..967b9cd 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/PurchaseProductRecordQueryService.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/PurchaseProductRecordQueryService.xml @@ -12,6 +12,8 @@