|
@@ -3,6 +3,7 @@ package com.qs.mp.web.controller.api.admin;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.qs.mp.admin.domain.CouponPkg;
|
|
import com.qs.mp.admin.domain.CouponPkg;
|
|
import com.qs.mp.admin.domain.param.CouponPkgParam;
|
|
import com.qs.mp.admin.domain.param.CouponPkgParam;
|
|
|
|
+import com.qs.mp.admin.domain.param.CouponPkgQueryParam;
|
|
import com.qs.mp.admin.domain.vo.CouponPkgVO;
|
|
import com.qs.mp.admin.domain.vo.CouponPkgVO;
|
|
import com.qs.mp.admin.service.ICouponPkgItemService;
|
|
import com.qs.mp.admin.service.ICouponPkgItemService;
|
|
import com.qs.mp.admin.service.ICouponPkgService;
|
|
import com.qs.mp.admin.service.ICouponPkgService;
|
|
@@ -13,11 +14,13 @@ import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiResponse;
|
|
import io.swagger.annotations.ApiResponse;
|
|
import io.swagger.annotations.ApiResponses;
|
|
import io.swagger.annotations.ApiResponses;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 券包管理API
|
|
* 券包管理API
|
|
@@ -35,7 +38,6 @@ public class CouponPkgMgrController extends BaseApiController {
|
|
private ICouponPkgService couponPkgService;
|
|
private ICouponPkgService couponPkgService;
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@PostMapping("/create")
|
|
@PostMapping("/create")
|
|
@ApiOperation("创建券包")
|
|
@ApiOperation("创建券包")
|
|
public AjaxResult create(@RequestBody CouponPkgParam couponPkgParam) {
|
|
public AjaxResult create(@RequestBody CouponPkgParam couponPkgParam) {
|
|
@@ -60,9 +62,19 @@ public class CouponPkgMgrController extends BaseApiController {
|
|
@ApiResponses(
|
|
@ApiResponses(
|
|
@ApiResponse(code = 200, message = "券包列表", response = CouponPkg.class)
|
|
@ApiResponse(code = 200, message = "券包列表", response = CouponPkg.class)
|
|
)
|
|
)
|
|
- public TableDataInfo list() {
|
|
|
|
|
|
+ public TableDataInfo list(@RequestBody CouponPkgQueryParam couponPkgQueryParam) {
|
|
startPage();
|
|
startPage();
|
|
- List<CouponPkg> list = couponPkgService.list(new LambdaQueryWrapper<CouponPkg>().orderByDesc(CouponPkg::getId));
|
|
|
|
|
|
+ LambdaQueryWrapper<CouponPkg> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
+
|
|
|
|
+ if (StringUtils.isNotBlank(couponPkgQueryParam.getTitle())) {
|
|
|
|
+ queryWrapper.like(CouponPkg::getTitle, couponPkgQueryParam.getTitle());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (Objects.nonNull(couponPkgQueryParam.getStatus())) {
|
|
|
|
+ queryWrapper.eq(CouponPkg::getStatus, couponPkgQueryParam.getStatus());
|
|
|
|
+ }
|
|
|
|
+ queryWrapper.orderByDesc(CouponPkg::getId);
|
|
|
|
+ List<CouponPkg> list = couponPkgService.list(queryWrapper);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|