悬赏招亲

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/withdrawaudit/user/response/UserPageWithdrawAuditVo.java

@@ -1,14 +1,18 @@
 package com.qniao.dam.api.query.withdrawaudit.user.response;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qniao.dam.domian.aggregate.withdrawaudit.constant.WithdrawAuditStatus;
+import com.qniao.dam.domian.aggregate.withdrawaudit.constant.WithdrawTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Map;
 
 @Data
 public class UserPageWithdrawAuditVo {
@@ -37,4 +41,11 @@ public class UserPageWithdrawAuditVo {
     @ApiModelProperty("申请时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime applyTime;
+
+    @ApiModelProperty("提现类型")
+    private WithdrawTypeEnum withdrawType;
+
+    @ApiModelProperty("第三方账号的信息")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Map<String, String> extDetailsInfo;
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/withdrawaudit/WithdrawAuditApplicationService.java

@@ -8,20 +8,19 @@ import com.qniao.dam.domain.service.withdrawaudit.ApplyWithdrawAuditDomainServic
 import com.qniao.dam.domian.aggregate.withdrawaudit.constant.WithdrawAuditStatus;
 import com.qniao.dam.domian.aggregate.withdrawaudit.constant.WithdrawTypeEnum;
 import com.qniao.dam.infrastructure.persistent.dao.domain.WithdrawAuditDao;
-import com.qniao.dam.query.thirdoauthconfig.ThirdOauthConfigQueryService;
 import com.qniao.dam.query.walletaccount.WalletAccountQueryService;
 import com.qniao.dau.application.UecServerApplicationService;
 import com.qniao.dau.application.request.GetWechatSessionDto;
 import com.qniao.dau.application.response.WeChatAppletUserSessionVo;
-import com.qniao.dau.domain.aggregate.thirdoauthconfig.valueobj.ThirdOauthConfig;
-import com.qniao.dau.domian.aggregate.authorization.constant.OAuthPlatformEnum;
 import com.qniao.domain.BaseApplicationService;
 import com.qniao.domain.BaseDomainEvent;
 import com.qniao.framework.exception.BizException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 @Service
@@ -35,8 +34,6 @@ public class WithdrawAuditApplicationService extends BaseApplicationService {
     @Resource
     private WithdrawAuditDao withdrawAuditDao;
     @Resource
-    private ThirdOauthConfigQueryService thirdOauthConfigQueryService;
-    @Resource
     private UecServerApplicationService uecServerApplicationService;
 
 
@@ -51,6 +48,9 @@ public class WithdrawAuditApplicationService extends BaseApplicationService {
                 String jsCode = ThirdPartyField.findFiledValueByKey(ThirdPartyField.JS_CODE, fieldList);
                 GetWechatSessionDto sessionDto = new GetWechatSessionDto(jsCode, appId);
                 WeChatAppletUserSessionVo sessionVo = uecServerApplicationService.getWechatSession(sessionDto);
+                Map<String, String> extDetails = new HashMap<>();
+                extDetails.put(ThirdPartyField.OPEN_ID, sessionVo.getOpenid());
+                withdrawAudit.setExtDetailsInfo(extDetails);
             }
             withdrawAudit.setWalletAccountId(walletAccount.getId());
             walletAccount.setAvailableBalance(walletAccount.getAvailableBalance().subtract(withdrawAudit.getWithdrawAmount()));

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

@@ -11,7 +11,9 @@
             dm.`name` as walletAccountUserName,
             dwa.withdraw_amount,
             dwa.`status`,
-            dwa.`create_time` as applyTime
+            dwa.`create_time` as applyTime,
+            dwa.withdraw_type,
+            dwa.ext_details_info
         from da_withdraw_audit as dwa
                  LEFT JOIN da_matchmaker as dm on dwa.wallet_account_user_id=dm.user_id and dm.is_delete=0
         where dwa.is_delete=0