czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

菜单 子集

Browse Source 
存酒
购买须知
团购商品
用户列表
This commit is contained in:
wangw
2024-05-29 15:24:50 +08:00
parent 44509e1d32
commit b31148da52
33 changed files with 457 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopStorageGoodController.java
View File

@@ -1,6 +1,7 @@
package cn.ysk.cashier.controller.shop;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.dto.shop.ShopStorageGoodDto;
import cn.ysk.cashier.pojo.shop.TbShopStorageGood;
import cn.ysk.cashier.dto.shop.TbShopStorageGoodQueryCriteria;
import cn.ysk.cashier.service.shop.TbShopStorageGoodService;
@@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
/**
@@ -45,8 +47,9 @@ public class TbShopStorageGoodController {
@PostMapping
@Log("新增酒品")
@ApiOperation("新增酒品")
public ResponseEntity<Object> createTbShopStorageGood(@Validated @RequestBody TbShopStorageGood resources){
return new ResponseEntity<>(tbShopStorageGoodService.create(resources),HttpStatus.CREATED);
public ResponseEntity<Object> createTbShopStorageGood(@Validated @RequestBody ShopStorageGoodDto resources){
tbShopStorageGoodService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping

13
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
View File

@@ -18,6 +18,9 @@ package cn.ysk.cashier.controller.shop;
import cn.ysk.cashier.pojo.shop.TbShopUser;
import cn.ysk.cashier.service.shop.TbShopUserService;
import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
import cn.ysk.cashier.vo.ShopUserInfoVo;
import com.alipay.api.domain.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -57,14 +60,8 @@ public class TbShopUserController {
@GetMapping("queryAllShopUser")
@ApiOperation("查询商家用户")
public ResponseEntity<Object> queryAllShopUser(TbShopUserQueryCriteria criteria, Pageable pageable){
Map<String, Object> stringObjectMap=new HashMap<>();
if (criteria.getShopId().equals("1")) {
stringObjectMap = tbShopUserService.queryAllShopUser(criteria, pageable);
}else {
stringObjectMap = tbShopUserService.queryShopUser(criteria, pageable);
}
return new ResponseEntity<>(stringObjectMap,HttpStatus.OK);
public ResponseEntity<Object> queryAllShopUser(TbShopUserQueryCriteria criteria){
return new ResponseEntity<>(tbShopUserService.queryShopUser(criteria),HttpStatus.OK);
}