diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java index a89e63a6e..5e53f0813 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java @@ -5,7 +5,6 @@ import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.dto.AdapayMemberInfoDTO; import com.jsowell.adapay.service.AdapayMemberService; import com.jsowell.adapay.vo.AdapayAccountBalanceVO; -import com.jsowell.adapay.vo.AdapaySettleAccountVO; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.exception.BusinessException; @@ -62,23 +61,6 @@ public class AdapayMemberController extends BaseController { return result; } - /** - * 查询汇付结算账户 - * http://localhost:8080/adapay/member/selectSettleAccount - */ - @PostMapping("/selectSettleAccount") - public AjaxResult selectSettleAccount(@RequestBody AdapayMemberInfoDTO dto) { - 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; - } - /** * 查询汇付账户余额 * http://localhost:8080/adapay/member/queryAdapayAccountBalance diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index ba778ff67..f98ded3ae 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -218,7 +218,7 @@ public class AdapayMemberService { if (adapayMemberAccount == null) { return vo; } - String settle_account_id = adapayMemberAccount.getAdapayMemberId(); + String settle_account_id = adapayMemberAccount.getSettleAccountId(); String member_id = adapayMemberAccount.getAdapayMemberId(); Map queryParams = Maps.newHashMap(); queryParams.put("settle_account_id", settle_account_id); @@ -235,9 +235,4 @@ public class AdapayMemberService { return vo; } - public AdapaySettleAccountVO selectSettleAccount(String merchantId) { - AdapaySettleAccountVO vo = new AdapaySettleAccountVO(); - - return vo; - } }