diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java b/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java index 427a84b23..c157e8304 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/controller/BaseController.java @@ -6,6 +6,7 @@ import com.jsowell.common.constant.HttpStatus; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.domain.model.LoginUser; import com.jsowell.common.core.page.PageDomain; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.core.page.TableSupport; import com.jsowell.common.enums.ykc.ReturnCodeEnum; @@ -86,6 +87,15 @@ public class BaseController { return rspData; } + protected TableDataInfo getDataTable(PageResponse pageResponse) { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(pageResponse.getList()); + rspData.setTotal(pageResponse.getTotal()); + return rspData; + } + /** * 返回成功 */ 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 2b1e8d2d3..d12053d8b 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 @@ -694,6 +694,7 @@ public class AdapayService { settleCountParams.put("member_id", adapayAccountBalanceVO.getAdapayMemberId()); settleCountParams.put("app_id", config.getAdapayAppId()); settleCountParams.put("settle_account_id", adapayAccountBalanceVO.getSettleAccountId()); + settleCountParams.put("cash_type", "T1"); settleCountParams.put("notify_url", ADAPAY_CALLBACK_URL); Map settleCount = Drawcash.create(settleCountParams, config.getWechatAppId()); log.info("申请取现接口,请求参数:{}, 返回参数:{}", JSON.toJSONString(settleCountParams), JSON.toJSONString(settleCount));