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 55073ae76..837793ca7 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 @@ -26,7 +26,7 @@ import java.util.Map; public class AdapayMemberController extends BaseController { @Autowired - private AdapayService adapayMemberService; + private AdapayService adapayService; /** * 创建结算账户 @@ -42,7 +42,7 @@ public class AdapayMemberController extends BaseController { if (StringUtils.isBlank(dto.getMerchantId())) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - adapayMemberService.createSettleAccount(dto); + adapayService.createSettleAccount(dto); result = AjaxResult.success(); } catch (BusinessException e) { logger.warn("创建结算账户接口warn", e); @@ -65,7 +65,7 @@ public class AdapayMemberController extends BaseController { if (StringUtils.isBlank(dto.getMerchantId())) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - Map map = adapayMemberService.selectAdapayMember(dto.getMerchantId()); + Map map = adapayService.selectAdapayMember(dto.getMerchantId()); result = AjaxResult.success(map); } catch (BusinessException e) { logger.warn("查询汇付会员接口异常warn", e); @@ -88,7 +88,7 @@ public class AdapayMemberController extends BaseController { if (StringUtils.isBlank(dto.getMerchantId())) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - Map map = adapayMemberService.updateAdapayMember(dto); + Map map = adapayService.updateAdapayMember(dto); result = AjaxResult.success(map); } catch (BusinessException e) { logger.warn("更新结算账户接口warn", e); @@ -108,7 +108,7 @@ public class AdapayMemberController extends BaseController { public AjaxResult queryAdapayAccountBalance(@RequestBody AdapayMemberInfoDTO dto) { AjaxResult result; try { - AdapayAccountBalanceVO vo = adapayMemberService.queryAdapayAccountBalance(dto.getMerchantId()); + AdapayAccountBalanceVO vo = adapayService.queryAdapayAccountBalance(dto.getMerchantId()); result = AjaxResult.success(vo); } catch (BusinessException e) { logger.error("查询汇付账户余额error", e); @@ -129,7 +129,7 @@ public class AdapayMemberController extends BaseController { public AjaxResult updateSettleAccountConfig(@RequestBody UpdateAccountConfigDTO dto) { AjaxResult result; try { - adapayMemberService.updateSettleAccountConfig(dto); + adapayService.updateSettleAccountConfig(dto); result = AjaxResult.success(); } catch (BaseAdaPayException e) { logger.error("查询汇付账户余额error", e); @@ -147,7 +147,7 @@ public class AdapayMemberController extends BaseController { public AjaxResult changeBankCard(@RequestBody UpdateAccountConfigDTO dto) { AjaxResult result; try { - adapayMemberService.updateSettleAccountConfig(dto); + adapayService.updateSettleAccountConfig(dto); result = AjaxResult.success(); } catch (BaseAdaPayException e) { logger.error("查询汇付账户余额error", e); @@ -164,7 +164,7 @@ public class AdapayMemberController extends BaseController { public AjaxResult drawCash(@RequestBody WithdrawDTO dto) { AjaxResult result; try { - adapayMemberService.drawCash(dto); + adapayService.drawCash(dto); result = AjaxResult.success(); } catch (BusinessException e) { logger.error("申请取现接口error", e); diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 2c02708ac..b1df11ab8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -525,6 +525,9 @@ public class AdapayService { // 昨日收入 vo.setYesterdayRevenue(BigDecimal.ZERO); + + // 累计提现金额 + vo.setTotalWithdraw(BigDecimal.ZERO); return vo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java index ff1ad831b..6483b3b89 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java @@ -33,4 +33,7 @@ public class AdapayAccountBalanceVO { // 昨日收入 private BigDecimal yesterdayRevenue; + + // 累计提现金额 + private BigDecimal totalWithdraw; }