diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java index 050577f2e..09bd12b7e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java @@ -128,8 +128,8 @@ public class MemberGroupController extends BaseController { /** * 查询会员组中会员列表 */ - @PostMapping("/queryMemberList") - public TableDataInfo queryMemberList(@RequestBody MemberGroupDTO dto) { + @GetMapping("/queryMemberList") + public TableDataInfo queryMemberList(MemberGroupDTO dto) { startPage(); return getDataTable(memberGroupService.queryMemberList(dto)); } @@ -137,8 +137,8 @@ public class MemberGroupController extends BaseController { /** * 查询会员组/集团 的站点列表 */ - @PostMapping("/queryStationList") - public TableDataInfo queryStationList(@RequestBody MemberGroupDTO dto) { + @GetMapping("/queryStationList") + public TableDataInfo queryStationList(MemberGroupDTO dto) { startPage(); return getDataTable(memberGroupService.queryStationList(dto)); } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index c43244ce4..d293f2a25 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -262,6 +262,17 @@ public class SpringBootTestController { @Autowired private NotificationService notificationService; + @Test + public void createBalancePaymentRequestTest() { + String outMemberId = "ACM29104861"; + String inMemberId = "0"; + String transAmt = "126.55"; + String title = "提取余额到自己账户"; + String desc = "2024年6月12日14点14分,售后需求:客户需要重新添加结算账户,原账户余额放弃提取"; + String wechatAppId = wechatAppId1; + adapayService.createBalancePaymentRequest(outMemberId, inMemberId, transAmt, title, desc, wechatAppId); + } + @Test public void decryptPhoneNum() throws Exception { diff --git a/jsowell-ui/src/api/member/memberGroup.js b/jsowell-ui/src/api/member/memberGroup.js index 74b4fb6c2..bd919e638 100644 --- a/jsowell-ui/src/api/member/memberGroup.js +++ b/jsowell-ui/src/api/member/memberGroup.js @@ -53,11 +53,11 @@ export function addMember(data) { } // 查询会员组中的会员列表 -export function queryMemberList(data) { +export function queryMemberList(query) { return request({ url: '/member/memberGroup/queryMemberList', - method: 'post', - data: data + method: 'get', + params: query }) } // 创建优惠计费模板 @@ -71,11 +71,11 @@ export function preferentialTemplates(data) { } // 查询会员组中的站点列表 -export function queryStationList(data) { +export function queryStationList(query) { return request({ url: '/member/memberGroup/queryStationList', - method: 'post', - data: data + method: 'get', + params: query }) } @@ -112,4 +112,4 @@ export function queryConsumptionDetailListByVinCode(data) { method: 'post', data: data }) -} \ No newline at end of file +}