mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-12 03:09:48 +08:00
update
This commit is contained in:
@@ -5,6 +5,7 @@ import com.jsowell.adapay.dto.AdapayMemberInfoDTO;
|
|||||||
import com.jsowell.adapay.service.AdapayMemberService;
|
import com.jsowell.adapay.service.AdapayMemberService;
|
||||||
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
|
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
|
||||||
import com.jsowell.adapay.vo.AdapayMemberInfoVO;
|
import com.jsowell.adapay.vo.AdapayMemberInfoVO;
|
||||||
|
import com.jsowell.adapay.vo.AdapaySettleAccountVO;
|
||||||
import com.jsowell.common.core.controller.BaseController;
|
import com.jsowell.common.core.controller.BaseController;
|
||||||
import com.jsowell.common.core.domain.AjaxResult;
|
import com.jsowell.common.core.domain.AjaxResult;
|
||||||
import com.jsowell.common.exception.BusinessException;
|
import com.jsowell.common.exception.BusinessException;
|
||||||
@@ -65,7 +66,15 @@ public class AdapayMemberController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@PostMapping("/selectSettleAccount")
|
@PostMapping("/selectSettleAccount")
|
||||||
public AjaxResult selectSettleAccount(@RequestBody AdapayMemberInfoDTO dto) {
|
public AjaxResult selectSettleAccount(@RequestBody AdapayMemberInfoDTO dto) {
|
||||||
return null;
|
AjaxResult result;
|
||||||
|
try {
|
||||||
|
AdapaySettleAccountVO vo = adapayMemberService.selectSettleAccount(dto.getMerchantId());
|
||||||
|
result = AjaxResult.success(vo);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("查询汇付账户余额error", e);
|
||||||
|
result = AjaxResult.error();
|
||||||
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import com.huifu.adapay.model.SettleAccount;
|
|||||||
import com.jsowell.adapay.dto.AdapayMemberInfoDTO;
|
import com.jsowell.adapay.dto.AdapayMemberInfoDTO;
|
||||||
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
|
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
|
||||||
import com.jsowell.adapay.vo.AdapayMemberInfoVO;
|
import com.jsowell.adapay.vo.AdapayMemberInfoVO;
|
||||||
|
import com.jsowell.adapay.vo.AdapaySettleAccountVO;
|
||||||
import com.jsowell.common.exception.BusinessException;
|
import com.jsowell.common.exception.BusinessException;
|
||||||
import com.jsowell.common.util.StringUtils;
|
import com.jsowell.common.util.StringUtils;
|
||||||
import com.jsowell.common.util.id.IdUtils;
|
import com.jsowell.common.util.id.IdUtils;
|
||||||
@@ -172,4 +173,15 @@ public class AdapayMemberService {
|
|||||||
vo.setLastAvlBalance(new BigDecimal((String) settleCount.get("last_avl_balance")));
|
vo.setLastAvlBalance(new BigDecimal((String) settleCount.get("last_avl_balance")));
|
||||||
return vo;
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public AdapaySettleAccountVO selectSettleAccount(String merchantId) {
|
||||||
|
AdapaySettleAccountVO vo = new AdapaySettleAccountVO();
|
||||||
|
// 通过merchantId 查询出汇付会员id 和 结算账户id,用来查询余额
|
||||||
|
AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId);
|
||||||
|
if (adapaySettleAccount == null) {
|
||||||
|
return vo;
|
||||||
|
}
|
||||||
|
BeanUtils.copyProperties(adapaySettleAccount, vo);
|
||||||
|
return vo;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package com.jsowell.adapay.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@Builder
|
||||||
|
public class AdapaySettleAccountVO {
|
||||||
|
/**
|
||||||
|
* 主键
|
||||||
|
*/
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 运营商id
|
||||||
|
*/
|
||||||
|
private String merchantId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 汇付会员id
|
||||||
|
*/
|
||||||
|
private String adapayMemberId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 结算账户对象 id
|
||||||
|
*/
|
||||||
|
private String settleAccountId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 银行卡号
|
||||||
|
*/
|
||||||
|
private String cardId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 银行卡对应的户名
|
||||||
|
*/
|
||||||
|
private String cardName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 证件号,银行账户类型为对私时,必填
|
||||||
|
*/
|
||||||
|
private String certId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 证件类型,仅支持:00-身份证,银行账户类型为对私时,必填
|
||||||
|
*/
|
||||||
|
private String certType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 手机号
|
||||||
|
*/
|
||||||
|
private String telNo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 银行编码,详见附录 银行代码,银行账户类型对公时,必填
|
||||||
|
*/
|
||||||
|
private String bankCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 开户银行名称
|
||||||
|
*/
|
||||||
|
private String bankName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 银行账户类型:1-对公;2-对私
|
||||||
|
*/
|
||||||
|
private String bankAcctType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 银行账户开户银行所在省份编码 (省市编码),银行账户类型为对公时,必填
|
||||||
|
*/
|
||||||
|
private String provCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 银行账户开户银行所在地区编码(省市编码),银行账户类型为对公时,必填
|
||||||
|
*/
|
||||||
|
private String areaCode;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user