红娘直播任务

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<WithdrawAudit> {
 
+    @ApiModelProperty("APPID")
+    private Long appId;
+
     @ApiModelProperty("钱包账号标识")
     private Long walletAccountId;
 

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);

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<UserPageWithdrawAuditVo> 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);

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;

dating-agency-mall-server/src/main/resources/mapper/withdrawaudit/PurchaseProductRecordQueryService.xml

@@ -12,6 +12,8 @@
     <select id="pageWithdrawAudit" resultMap="UserPageWithdrawAuditVo">
         select
         dwa.id,
+        dwa.app_id,
+        daa.`name` as appName,
         dwa.wallet_account_id,
         dwa.wallet_account_user_id,
         dwa.identity_type,
@@ -29,9 +31,13 @@
         dwa.audit_remark,
         dwa.remit_remark
         from da_withdraw_audit as dwa
+        LEFT JOIN da_application as daa on dwa.app_id=daa.id
         LEFT JOIN da_matchmaker as dm on dwa.wallet_account_user_id=dm.user_id and dm.is_delete=0
         LEFT JOIN da_organization as dao on dao.id=dwa.wallet_account_org_id
         where dwa.is_delete=0
+        <if test="queryParams.queryAppId != null">
+            and dwa.app_id = #{queryParams.queryAppId}
+        </if>
         <if test="queryParams.queryUserId != null">
             and dm.user_id = #{queryParams.queryUserId}
         </if>