czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

会员订单

Browse Source
This commit is contained in:
张松
2025-11-25 09:42:50 +08:00
parent efed3ada4a
commit 5012035cc8
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
View File

@@ -1,11 +1,9 @@
package com.czg.controller.admin;
import com.czg.account.dto.PageDTO;
import com.czg.exception.CzgException;
import com.czg.market.dto.MemberConfigDTO;
import com.czg.market.dto.MemberLevelDTO;
import com.czg.market.entity.MemberLevelConfig;
import com.czg.market.entity.MemberOrder;
import com.czg.market.service.MemberLevelConfigService;
import com.czg.market.service.MemberOrderService;
import com.czg.market.service.TbMemberConfigService;
@@ -14,9 +12,7 @@ import com.czg.market.vo.MemberLevelVO;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.utils.AssertUtil;
import com.czg.utils.PageUtil;
import com.czg.validator.group.UpdateGroup;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import jakarta.annotation.Resource;
import jakarta.validation.groups.Default;
@@ -24,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Map;
/**
* 会员配置管理
@@ -48,8 +45,8 @@ public class MemberController {
* @return 订单信息
*/
@GetMapping("/order")
public CzgResult<Page<MemberOrder>> memberOrderPage(@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime, @RequestParam(required = false) String key) {
public CzgResult<Map<String, Object>> memberOrderPage(@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime, @RequestParam(required = false) String key) {
return CzgResult.success(memberOrderService.pageInfo(startTime, endTime, key));
}
/**