mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-22 03:55:17 +08:00
update
This commit is contained in:
@@ -9,6 +9,7 @@ import com.huifu.adapay.core.exception.BaseAdaPayException;
|
||||
import com.huifu.adapay.model.Member;
|
||||
import com.huifu.adapay.model.SettleAccount;
|
||||
import com.jsowell.adapay.dto.AdapayMemberInfoDTO;
|
||||
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
|
||||
import com.jsowell.adapay.vo.AdapayMemberInfoVO;
|
||||
import com.jsowell.common.exception.BusinessException;
|
||||
import com.jsowell.common.util.StringUtils;
|
||||
@@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@@ -126,25 +128,48 @@ public class AdapayMemberService {
|
||||
Map<String, Object> settleCount = SettleAccount.create(settleCountParams);
|
||||
log.info("创建汇付结算账户result:{}", settleCount);
|
||||
|
||||
AdapaySettleAccount adapaySettleAccount = new AdapaySettleAccount();
|
||||
adapaySettleAccount.setMerchantId(dto.getMerchantId());
|
||||
adapaySettleAccount.setAdapayMemberId(dto.getAdapayMemberId());
|
||||
adapaySettleAccount.setCardId(dto.getCardId());
|
||||
adapaySettleAccount.setCardName(dto.getCardName());
|
||||
adapaySettleAccount.setCertId(dto.getCertId());
|
||||
adapaySettleAccount.setCertType("00");
|
||||
adapaySettleAccount.setTelNo(dto.getTelNo());
|
||||
adapaySettleAccount.setBankCode(dto.getBankCode());
|
||||
adapaySettleAccount.setBankAcctType(dto.getBankAcctType());
|
||||
adapaySettleAccount.setProvCode(dto.getProvCode());
|
||||
adapaySettleAccount.setAreaCode(dto.getAreaCode());
|
||||
adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount);
|
||||
if (settleCount != null && StringUtils.equals((String) settleCount.get("status"), "succeeded")) {
|
||||
AdapaySettleAccount adapaySettleAccount = new AdapaySettleAccount();
|
||||
adapaySettleAccount.setSettleAccountId((String) settleCount.get("id"));
|
||||
adapaySettleAccount.setMerchantId(dto.getMerchantId());
|
||||
adapaySettleAccount.setAdapayMemberId(dto.getAdapayMemberId());
|
||||
adapaySettleAccount.setCardId(dto.getCardId());
|
||||
adapaySettleAccount.setCardName(dto.getCardName());
|
||||
adapaySettleAccount.setCertId(dto.getCertId());
|
||||
adapaySettleAccount.setCertType("00");
|
||||
adapaySettleAccount.setTelNo(dto.getTelNo());
|
||||
adapaySettleAccount.setBankCode(dto.getBankCode());
|
||||
adapaySettleAccount.setBankAcctType(dto.getBankAcctType());
|
||||
adapaySettleAccount.setProvCode(dto.getProvCode());
|
||||
adapaySettleAccount.setAreaCode(dto.getAreaCode());
|
||||
adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询汇付会员账户余额
|
||||
*/
|
||||
public void queryAdapayAccountBalance() {
|
||||
|
||||
public AdapayAccountBalanceVO queryAdapayAccountBalance(String merchantId) throws BaseAdaPayException {
|
||||
AdapayAccountBalanceVO vo = AdapayAccountBalanceVO.builder().build();
|
||||
// 通过merchantId 查询出汇付会员id 和 结算账户id,用来查询余额
|
||||
AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId);
|
||||
if (adapaySettleAccount == null) {
|
||||
return vo;
|
||||
}
|
||||
String settle_account_id = adapaySettleAccount.getAdapayMemberId();
|
||||
String member_id = adapaySettleAccount.getAdapayMemberId();
|
||||
Map<String, Object> queryParams = Maps.newHashMap();
|
||||
queryParams.put("settle_account_id", settle_account_id);
|
||||
queryParams.put("member_id", member_id);
|
||||
queryParams.put("app_id", ADAPAY_APP_ID);
|
||||
Map<String, Object> settleCount = SettleAccount.balance(queryParams);
|
||||
if (settleCount == null || settleCount.isEmpty() || StringUtils.equals((String)settleCount.get("status"), "succeeded")) {
|
||||
return vo;
|
||||
}
|
||||
vo.setFrzBalance(new BigDecimal((String) settleCount.get("frz_balance")));
|
||||
vo.setAcctBalance(new BigDecimal((String) settleCount.get("acct_balance")));
|
||||
vo.setAvlBalance(new BigDecimal((String) settleCount.get("avl_balance")));
|
||||
vo.setLastAvlBalance(new BigDecimal((String) settleCount.get("last_avl_balance")));
|
||||
return vo;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user