mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-21 07:39:55 +08:00
update
This commit is contained in:
@@ -32,7 +32,6 @@ import org.springframework.transaction.annotation.Propagation;
|
|||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -52,7 +51,7 @@ public class AdapayMemberService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IAdapayMemberAccountService adapayMemberAccountService;
|
private IAdapayMemberAccountService adapayMemberAccountService;
|
||||||
|
|
||||||
public void createSettleAccount(SettleAccountDTO dto) throws Exception {
|
public void createSettleAccount(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException {
|
||||||
String bankAcctType = dto.getBankAcctType();
|
String bankAcctType = dto.getBankAcctType();
|
||||||
if (StringUtils.equals(bankAcctType, Constants.ONE)) {
|
if (StringUtils.equals(bankAcctType, Constants.ONE)) {
|
||||||
createCorpMember(dto);
|
createCorpMember(dto);
|
||||||
@@ -68,7 +67,7 @@ public class AdapayMemberService {
|
|||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
@Transactional(readOnly = false, propagation = Propagation.REQUIRED)
|
@Transactional(readOnly = false, propagation = Propagation.REQUIRED)
|
||||||
public void createMember(SettleAccountDTO dto) throws Exception {
|
public void createMember(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException {
|
||||||
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(dto.getMerchantId());
|
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(dto.getMerchantId());
|
||||||
if (adapayMemberAccount != null) {
|
if (adapayMemberAccount != null) {
|
||||||
log.error("通过merchantId:{}, 没有查询到结算账户配置", dto.getMerchantId());
|
log.error("通过merchantId:{}, 没有查询到结算账户配置", dto.getMerchantId());
|
||||||
@@ -377,7 +376,7 @@ public class AdapayMemberService {
|
|||||||
/**
|
/**
|
||||||
* 创建企业用户
|
* 创建企业用户
|
||||||
*/
|
*/
|
||||||
public void createCorpMember(SettleAccountDTO dto) throws BaseAdaPayException, IOException {
|
public void createCorpMember(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException {
|
||||||
Map<String, Object> memberParams = Maps.newHashMap();
|
Map<String, Object> memberParams = Maps.newHashMap();
|
||||||
String adapayMemberId = Constants.ADAPAY_CORP_MEMBER_PREFIX + IdUtils.getMemberId();
|
String adapayMemberId = Constants.ADAPAY_CORP_MEMBER_PREFIX + IdUtils.getMemberId();
|
||||||
memberParams.put("member_id", adapayMemberId);
|
memberParams.put("member_id", adapayMemberId);
|
||||||
|
|||||||
Reference in New Issue
Block a user