银行卡

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/paymentchannelorder/user/request/ThirdPartyField.java

@@ -2,6 +2,7 @@ package com.qniao.dam.api.command.paymentchannelorder.user.request;
 
 import cn.hutool.core.text.StrFormatter;
 import com.qniao.framework.exception.BizException;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -32,4 +33,9 @@ public class ThirdPartyField {
     public static final String H5_INFO_TYPE = "h5InfoType";
 
     public static final String BANK_CARD_ID = "bankCardId";
+    public static final String OWNER_NAME = "ownerName";
+    public static final String BANK_NAME = "bankName";
+    public static final String CARD_NUM = "cardNum";
+    public static final String OPENING_BANK = "openingBank";
+
 }

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

@@ -43,9 +43,18 @@ public class UserPageWithdrawAuditVo {
     @ApiModelProperty("提现金额")
     private BigDecimal withdrawAmount;
 
-    @ApiModelProperty("提现状态")
+    @ApiModelProperty("提现服务费")
+    private BigDecimal withdrawServiceFee;
+
+    @ApiModelProperty("到账金额")
+    private BigDecimal arrivalAmount;
+
+    @ApiModelProperty("审核状态")
     private WithdrawAuditStatus status;
 
+    @ApiModelProperty("汇款状态")
+    private Boolean remitStatus;
+
     @ApiModelProperty("申请时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime applyTime;

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

@@ -2,6 +2,7 @@ package com.qniao.dam.application.service.withdrawaudit;
 
 import com.qniao.dam.api.command.paymentchannelorder.user.request.ThirdPartyField;
 import com.qniao.dam.api.command.withdrawaudit.user.response.UserCalculateWithdrawServiceFeeVo;
+import com.qniao.dam.domain.aggregate.bankcard.entity.BankCard;
 import com.qniao.dam.domain.aggregate.rewardconfig.entity.RewardConfig;
 import com.qniao.dam.domain.aggregate.walletaccount.entity.WalletAccount;
 import com.qniao.dam.domain.aggregate.withdrawaudit.WithdrawAuditAggregate;
@@ -10,6 +11,7 @@ import com.qniao.dam.domain.service.withdrawaudit.ApplyWithdrawAuditDomainServic
 import com.qniao.dam.domian.aggregate.rewardconfig.constant.RewardTypeEnum;
 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.bankcard.BankCardDao;
 import com.qniao.dam.infrastructure.persistent.dao.domain.WithdrawAuditDao;
 import com.qniao.dam.query.rewardconfig.RewardConfigQueryService;
 import com.qniao.dam.query.walletaccount.WalletAccountQueryService;
@@ -42,6 +44,8 @@ public class WithdrawAuditApplicationService extends BaseApplicationService {
     private UecServerApplicationService uecServerApplicationService;
     @Resource
     private RewardConfigQueryService rewardConfigQueryService;
+    @Resource
+    private BankCardDao bankCardDao;
 
 
     public void applyWithdraw(WithdrawAudit withdrawAudit, List<ThirdPartyField> fieldList, Long appId) {
@@ -62,8 +66,13 @@ public class WithdrawAuditApplicationService extends BaseApplicationService {
             } else {
                 //银行卡
                 String bankCardId = ThirdPartyField.findFiledValueByKey(ThirdPartyField.BANK_CARD_ID, fieldList);
+                BankCard bankCard = bankCardDao.selectById(bankCardId);
                 Map<String, String> extDetails = new HashMap<>();
                 extDetails.put(ThirdPartyField.BANK_CARD_ID, bankCardId);
+                extDetails.put(ThirdPartyField.OWNER_NAME, bankCard.getOwnerName());
+                extDetails.put(ThirdPartyField.BANK_NAME, bankCard.getBankName());
+                extDetails.put(ThirdPartyField.CARD_NUM, bankCard.getCardNum());
+                extDetails.put(ThirdPartyField.OPENING_BANK, bankCard.getOpeningBank());
                 withdrawAudit.setExtDetailsInfo(extDetails);
                 //提现手续费
                 UserCalculateWithdrawServiceFeeVo serviceFeeVo = calculateServiceFee(withdrawAudit.getWithdrawAmount(), withdrawAudit.getWithdrawType());

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

@@ -17,7 +17,10 @@
         dwa.identity_type,
         IF(dwa.identity_type=2,dao.full_name,dm.`name`) as walletAccountUserName,
         dwa.withdraw_amount,
+        dwa.withdraw_service_fee,
+        dwa.arrival_amount,
         dwa.`status`,
+        dwa.`remit_status`,
         dwa.`create_time` as applyTime,
         dwa.withdraw_type,
         dwa.ext_details_info