From ed011fafd4803cadc23d7a33ac022d510a471bab Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 11:34:40 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/dto/PayOrderDto.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 13 ++++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/PayOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/PayOrderDto.java
index fd0ab92..2f06680 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/PayOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/PayOrderDto.java
@@ -35,6 +35,6 @@
// @ApiModelProperty(value = "签约短信验证码")
// private String smsCode;
- @ApiModelProperty(value = "银行卡号")
- private String bankNo;
+ @ApiModelProperty(value = "银行卡列表ID")
+ private Long bankId;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index cb29bb9..924d898 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -74,6 +74,7 @@
private final UnipayService unipayService;
private final MallMemberBankSignMapper mallMemberBankSignMapper;
+ private final MallMemberBankMapper mallMemberBankMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -372,7 +373,17 @@
}else{
agreementPayDto.setOrderDesc(itemsGoods.get(0).getGoodsName());
}
- agreementPayDto.setBankNo(payOrderDto.getBankNo());
+ Long bankId = payOrderDto.getBankId() == null ? 0L : payOrderDto.getBankId();
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(bankId);
+ if(ObjectUtil.isEmpty(mallMemberBank)){
+ throw new FebsException("银行卡未添加");
+ }
+ String bankNo = mallMemberBank.getBankNo();
+ MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(member.getId(), bankNo);
+ if(ObjectUtil.isEmpty(mallMemberBankSign)){
+ throw new FebsException("银行卡未签约");
+ }
+ agreementPayDto.setBankNo(bankNo);
String agreementPayStr = unipayService.agreementPay(agreementPayDto);
if("fail".equals(agreementPayStr)){
--
Gitblit v1.9.1