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-04-29 09:59:48 +08:00
parent ecae487993
commit 5ac93618a6
120 changed files with 1180 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/BotButtonConfigController.java
View File

@@ -43,7 +43,6 @@ public class BotButtonConfigController {
private final BotButtonConfigService botButtonConfigService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('botButtonConfig:list')")
@@ -52,7 +51,6 @@ public class BotButtonConfigController {
}
@GetMapping
@Log("查询buttonConfig")
@ApiOperation("查询buttonConfig")
@PreAuthorize("@el.check('botButtonConfig:list')")
public ResponseEntity<Object> queryBotButtonConfig(BotButtonConfigQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class BotButtonConfigController {
}
@PostMapping
@Log("新增buttonConfig")
@ApiOperation("新增buttonConfig")
@PreAuthorize("@el.check('botButtonConfig:add')")
public ResponseEntity<Object> createBotButtonConfig(@Validated @RequestBody BotButtonConfig resources){
@@ -68,7 +65,6 @@ public class BotButtonConfigController {
}
@PutMapping
@Log("修改buttonConfig")
@ApiOperation("修改buttonConfig")
@PreAuthorize("@el.check('botButtonConfig:edit')")
public ResponseEntity<Object> updateBotButtonConfig(@Validated @RequestBody BotButtonConfig resources){
@@ -77,7 +73,6 @@ public class BotButtonConfigController {
}
@DeleteMapping
@Log("删除buttonConfig")
@ApiOperation("删除buttonConfig")
@PreAuthorize("@el.check('botButtonConfig:del')")
public ResponseEntity<Object> deleteBotButtonConfig(@RequestBody Integer[] ids) {

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/BotConfigController.java
View File

@@ -43,7 +43,6 @@ public class BotConfigController {
private final BotConfigService botConfigService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('botConfig:list')")
@@ -52,7 +51,6 @@ public class BotConfigController {
}
@GetMapping
@Log("查询botConfig")
@ApiOperation("查询botConfig")
@PreAuthorize("@el.check('botConfig:list')")
public ResponseEntity<Object> queryBotConfig(BotConfigQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class BotConfigController {
}
@PostMapping
@Log("新增botConfig")
@ApiOperation("新增botConfig")
@PreAuthorize("@el.check('botConfig:add')")
public ResponseEntity<Object> createBotConfig(@Validated @RequestBody BotConfig resources){
@@ -68,7 +65,6 @@ public class BotConfigController {
}
@PutMapping
@Log("修改botConfig")
@ApiOperation("修改botConfig")
@PreAuthorize("@el.check('botConfig:edit')")
public ResponseEntity<Object> updateBotConfig(@Validated @RequestBody BotConfig resources){
@@ -77,7 +73,6 @@ public class BotConfigController {
}
@DeleteMapping
@Log("删除botConfig")
@ApiOperation("删除botConfig")
@PreAuthorize("@el.check('botConfig:del')")
public ResponseEntity<Object> deleteBotConfig(@RequestBody Integer[] ids) {

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserController.java
View File

@@ -43,7 +43,6 @@ public class BotUserController {
private final BotUserService botUserService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('botUser:list')")
@@ -52,7 +51,6 @@ public class BotUserController {
}
@GetMapping
@Log("查询BotUserController")
@ApiOperation("查询BotUserController")
@PreAuthorize("@el.check('botUser:list')")
public ResponseEntity<Object> queryBotUser(BotUserQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class BotUserController {
}
@PostMapping
@Log("新增BotUserController")
@ApiOperation("新增BotUserController")
@PreAuthorize("@el.check('botUser:add')")
public ResponseEntity<Object> createBotUser(@Validated @RequestBody BotUser resources){
@@ -68,7 +65,6 @@ public class BotUserController {
}
@PutMapping
@Log("修改BotUserController")
@ApiOperation("修改BotUserController")
@PreAuthorize("@el.check('botUser:edit')")
public ResponseEntity<Object> updateBotUser(@Validated @RequestBody BotUser resources){
@@ -77,7 +73,6 @@ public class BotUserController {
}
@DeleteMapping
@Log("删除BotUserController")
@ApiOperation("删除BotUserController")
@PreAuthorize("@el.check('botUser:del')")
public ResponseEntity<Object> deleteBotUser(@RequestBody Integer[] ids) {

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/BotUserFlowController.java
View File

@@ -43,7 +43,6 @@ public class BotUserFlowController {
private final BotUserFlowService botUserFlowService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('botUserFlow:list')")
@@ -52,7 +51,6 @@ public class BotUserFlowController {
}
@GetMapping
@Log("查询accountFlow")
@ApiOperation("查询accountFlow")
@PreAuthorize("@el.check('botUserFlow:list')")
public ResponseEntity<Object> queryBotUserFlow(BotUserFlowQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class BotUserFlowController {
}
@PostMapping
@Log("新增accountFlow")
@ApiOperation("新增accountFlow")
@PreAuthorize("@el.check('botUserFlow:add')")
public ResponseEntity<Object> createBotUserFlow(@Validated @RequestBody BotUserFlow resources){
@@ -68,7 +65,6 @@ public class BotUserFlowController {
}
@PutMapping
@Log("修改accountFlow")
@ApiOperation("修改accountFlow")
@PreAuthorize("@el.check('botUserFlow:edit')")
public ResponseEntity<Object> updateBotUserFlow(@Validated @RequestBody BotUserFlow resources){
@@ -77,7 +73,6 @@ public class BotUserFlowController {
}
@DeleteMapping
@Log("删除accountFlow")
@ApiOperation("删除accountFlow")
@PreAuthorize("@el.check('botUserFlow:del')")
public ResponseEntity<Object> deleteBotUserFlow(@RequestBody Integer[] ids) {

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/TbPlatformDictController.java
View File

@@ -27,27 +27,23 @@ public class TbPlatformDictController {
private final TbPlatformDictService tbPlatformDictService;
@GetMapping
@Log("查询新字典")
@ApiOperation("查询新字典")
public ResponseEntity<Object> queryTbPlatformDict(TbPlatformDictQueryCriteria criteria){
return new ResponseEntity<>(tbPlatformDictService.queryAllPage(criteria),HttpStatus.OK);
}
@GetMapping("/{id}")
@Log("通过Id查询新字典")
@ApiOperation("通过Id查询新字典")
public TbPlatformDictDto queryTbOrderInfo(@PathVariable("id") Integer id){
return tbPlatformDictService.findById(id);
}
@PostMapping
@Log("新增新字典")
@ApiOperation("新增新字典")
public ResponseEntity<Object> createTbPlatformDict(@Validated @RequestBody TbPlatformDict resources){
return new ResponseEntity<>(tbPlatformDictService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改新字典")
@ApiOperation("修改新字典")
public ResponseEntity<Object> updateTbPlatformDict(@Validated @RequestBody TbPlatformDict resources){
tbPlatformDictService.update(resources);
@@ -55,7 +51,6 @@ public class TbPlatformDictController {
}
@DeleteMapping
@Log("删除新字典")
@ApiOperation("删除新字典")
public ResponseEntity<Object> deleteTbPlatformDict(@RequestBody Integer[] ids) {
tbPlatformDictService.deleteAll(ids);

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/TbRenewalsPayLogController.java
View File

@@ -43,7 +43,6 @@ public class TbRenewalsPayLogController {
private final TbRenewalsPayLogService tbRenewalsPayLogService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbRenewalsPayLog:list')")
@@ -52,7 +51,6 @@ public class TbRenewalsPayLogController {
}
@GetMapping
@Log("查询/shop/renewals")
@ApiOperation("查询/shop/renewals")
@PreAuthorize("@el.check('tbRenewalsPayLog:list')")
public ResponseEntity<Object> queryTbRenewalsPayLog(TbRenewalsPayLogQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class TbRenewalsPayLogController {
}
@PostMapping
@Log("新增/shop/renewals")
@ApiOperation("新增/shop/renewals")
@PreAuthorize("@el.check('tbRenewalsPayLog:add')")
public ResponseEntity<Object> createTbRenewalsPayLog(@Validated @RequestBody TbRenewalsPayLog resources){
@@ -68,7 +65,6 @@ public class TbRenewalsPayLogController {
}
@PutMapping
@Log("修改/shop/renewals")
@ApiOperation("修改/shop/renewals")
@PreAuthorize("@el.check('tbRenewalsPayLog:edit')")
public ResponseEntity<Object> updateTbRenewalsPayLog(@Validated @RequestBody TbRenewalsPayLog resources){
@@ -77,7 +73,6 @@ public class TbRenewalsPayLogController {
}
@DeleteMapping
@Log("删除/shop/renewals")
@ApiOperation("删除/shop/renewals")
@PreAuthorize("@el.check('tbRenewalsPayLog:del')")
public ResponseEntity<Object> deleteTbRenewalsPayLog(@RequestBody Integer[] ids) {

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

@@ -42,7 +42,6 @@ public class TbShopPayTypeController {
private final TbShopPayTypeService tbShopPayTypeService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void exportTbShopPayType(HttpServletResponse response, TbShopPayTypeQueryCriteria criteria) throws IOException {
@@ -50,28 +49,23 @@ public class TbShopPayTypeController {
}
@GetMapping
@Log("查询/merchant/system/paytype")
@ApiOperation("查询/merchant/system/paytype")
public ResponseEntity<Object> queryTbShopPayType(TbShopPayTypeQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopPayTypeService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增/merchant/system/paytype")
@ApiOperation("新增/merchant/system/paytype")
public ResponseEntity<Object> createTbShopPayType(@Validated @RequestBody TbShopPayType resources){
return new ResponseEntity<>(tbShopPayTypeService.create(resources),HttpStatus.CREATED);
}
@GetMapping("/{id}")
@Log("新增/merchant/system/paytype")
@ApiOperation("新增/merchant/system/paytype")
public ResponseEntity<Object> TbShopPayTypeInfo(@PathVariable Integer id){
return new ResponseEntity<>(tbShopPayTypeService.findById(id),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/merchant/system/paytype")
@ApiOperation("修改/merchant/system/paytype")
public ResponseEntity<Object> updateTbShopPayType(@Validated @RequestBody TbShopPayType resources){
tbShopPayTypeService.update(resources);
@@ -79,7 +73,6 @@ public class TbShopPayTypeController {
}
@DeleteMapping
@Log("删除/merchant/system/paytype")
@ApiOperation("删除/merchant/system/paytype")
public ResponseEntity<Object> deleteTbShopPayType(@RequestBody Integer[] ids) {
tbShopPayTypeService.deleteAll(ids);

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java
View File

@@ -43,7 +43,6 @@ public class TbUserInfoController {
private final TbUserInfoService tbUserInfoService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbUserInfo:list')")
@@ -52,21 +51,18 @@ public class TbUserInfoController {
}
@GetMapping
@Log("查询/userInfo/list")
@ApiOperation("查询/userInfo/list")
public ResponseEntity<Object> queryTbUserInfo(TbUserInfoQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbUserInfoService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增/userInfo/list")
@ApiOperation("新增/userInfo/list")
public ResponseEntity<Object> createTbUserInfo(@Validated @RequestBody TbUserInfo resources){
return new ResponseEntity<>(tbUserInfoService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/userInfo/list")
@ApiOperation("修改/userInfo/list")
public ResponseEntity<Object> updateTbUserInfo(@Validated @RequestBody TbUserInfo resources){
tbUserInfoService.update(resources);
@@ -74,7 +70,6 @@ public class TbUserInfoController {
}
@DeleteMapping
@Log("删除/userInfo/list")
@ApiOperation("删除/userInfo/list")
public ResponseEntity<Object> deleteTbUserInfo(@RequestBody Integer[] ids) {
tbUserInfoService.deleteAll(ids);

4
eladmin-system/src/main/java/cn/ysk/cashier/controller/TbVersionController.java
View File

@@ -22,21 +22,18 @@ public class TbVersionController {
private final TbVersionService tbVersionService;
@GetMapping
@Log("查询版本")
@ApiOperation("查询版本")
public ResponseEntity<Object> queryTbVersion(TbVersionQueryCriteria criteria){
return new ResponseEntity<>(tbVersionService.queryAllPage(criteria),HttpStatus.OK);
}
@PostMapping
@Log("新增版本")
@ApiOperation("新增版本")
public ResponseEntity<Object> createTbVersion(@Validated @RequestBody TbVersion resources){
return new ResponseEntity<>(tbVersionService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改版本")
@ApiOperation("修改版本")
public ResponseEntity<Object> updateTbVersion(@Validated @RequestBody TbVersion resources){
tbVersionService.update(resources);
@@ -44,7 +41,6 @@ public class TbVersionController {
}
@DeleteMapping
@Log("删除版本")
@ApiOperation("删除版本")
public ResponseEntity<Object> deleteTbVersion(@RequestBody Integer[] ids) {
tbVersionService.deleteAll(ids);

81
eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbCashierCartController.java
View File

@@ -1,81 +0,0 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.controller.order;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.pojo.order.TbCashierCart;
import cn.ysk.cashier.service.order.TbCashierCartService;
import cn.ysk.cashier.dto.order.TbCashierCartQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
/**
* @website https://eladmin.vip
* @author lyf
* @date 2024-03-02
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "购物车管理")
@RequestMapping("/api/tbCashierCart")
public class TbCashierCartController {
private final TbCashierCartService tbCashierCartService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void exportTbCashierCart(HttpServletResponse response, TbCashierCartQueryCriteria criteria) throws IOException {
tbCashierCartService.download(tbCashierCartService.queryAll(criteria), response);
}
@GetMapping
@Log("查询购物车")
@ApiOperation("查询购物车")
public ResponseEntity<Object> queryTbCashierCart(TbCashierCartQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbCashierCartService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增购物车")
@ApiOperation("新增购物车")
public ResponseEntity<Object> createTbCashierCart(@Validated @RequestBody TbCashierCart resources){
return new ResponseEntity<>(tbCashierCartService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改购物车")
@ApiOperation("修改购物车")
public ResponseEntity<Object> updateTbCashierCart(@Validated @RequestBody TbCashierCart resources){
tbCashierCartService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除购物车")
@ApiOperation("删除购物车")
public ResponseEntity<Object> deleteTbCashierCart(@RequestBody Integer[] ids) {
tbCashierCartService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

81
eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderDetailController.java
View File

@@ -1,81 +0,0 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.controller.order;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.pojo.order.TbOrderDetail;
import cn.ysk.cashier.service.order.TbOrderDetailService;
import cn.ysk.cashier.dto.order.TbOrderDetailQueryCriteria;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
/**
* @website https://eladmin.vip
* @author lyf
* @date 2024-03-02
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "订单详情")
@RequestMapping("/api/tbOrderDetail")
public class TbOrderDetailController {
private final TbOrderDetailService tbOrderDetailService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void exportTbOrderDetail(HttpServletResponse response, TbOrderDetailQueryCriteria criteria) throws IOException {
tbOrderDetailService.download(tbOrderDetailService.queryAll(criteria), response);
}
@GetMapping
@Log("查询订单详情")
@ApiOperation("查询订单详情")
public ResponseEntity<Object> queryTbOrderDetail(TbOrderDetailQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbOrderDetailService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增订单详情")
@ApiOperation("新增订单详情")
public ResponseEntity<Object> createTbOrderDetail(@Validated @RequestBody TbOrderDetail resources){
return new ResponseEntity<>(tbOrderDetailService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改订单详情")
@ApiOperation("修改订单详情")
public ResponseEntity<Object> updateTbOrderDetail(@Validated @RequestBody TbOrderDetail resources){
tbOrderDetailService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除订单详情")
@ApiOperation("删除订单详情")
public ResponseEntity<Object> deleteTbOrderDetail(@RequestBody Integer[] ids) {
tbOrderDetailService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

41
eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
View File

@@ -47,7 +47,6 @@ public class TbOrderInfoController {
private final TbOrderInfoService tbOrderInfoService;
@Log("导出数据")
@ApiOperation("导出数据")
@PostMapping(value = "/download")
public void exportTbOrderInfo(HttpServletResponse response, @RequestBody TbOrderInfoQueryCriteria criteria) throws IOException {
@@ -55,46 +54,40 @@ public class TbOrderInfoController {
}
@PostMapping("/date")
@Log("查询订单")
@ApiOperation("查询订单")
public ResponseEntity<Object> queryTbOrderInfo(@RequestBody TbOrderInfoQueryCriteria criteria){
return new ResponseEntity<>(tbOrderInfoService.queryAllPage(criteria),HttpStatus.OK);
}
@PostMapping("/payCount")
@Log("通过shopId查询支付统计")
@ApiOperation("通过shopId查询支付统计")
public List<TbOrderPayCountVo> queryTbOrderPayCount(@RequestBody TbPayCountQueryCriteria criteria){
return tbOrderInfoService.queryTbOrderPayCount(criteria);
}
@GetMapping("/{id}")
@Log("通过Id查询订单")
@ApiOperation("通过Id查询订单")
public TbOrderInfoDto queryTbOrderInfo(@PathVariable("id") Integer id){
return tbOrderInfoService.findById(id);
}
@PostMapping
@Log("新增订单")
@ApiOperation("新增订单")
public ResponseEntity<Object> createTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){
return new ResponseEntity<>(tbOrderInfoService.create(resources),HttpStatus.CREATED);
}
// @PostMapping
// @ApiOperation("新增订单")
// public ResponseEntity<Object> createTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){
// return new ResponseEntity<>(tbOrderInfoService.create(resources),HttpStatus.CREATED);
// }
@PutMapping
@Log("修改订单")
@ApiOperation("修改订单")
public ResponseEntity<Object> updateTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){
tbOrderInfoService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
// @PutMapping
// @ApiOperation("修改订单")
// public ResponseEntity<Object> updateTbOrderInfo(@Validated @RequestBody TbOrderInfo resources){
// tbOrderInfoService.update(resources);
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
@DeleteMapping
@Log("删除订单")
@ApiOperation("删除订单")
public ResponseEntity<Object> deleteTbOrderInfo(@RequestBody Integer[] ids) {
tbOrderInfoService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
// @DeleteMapping
// @ApiOperation("删除订单")
// public ResponseEntity<Object> deleteTbOrderInfo(@RequestBody Integer[] ids) {
// tbOrderInfoService.deleteAll(ids);
// return new ResponseEntity<>(HttpStatus.OK);
// }
}

9
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
View File

@@ -45,7 +45,6 @@ public class TbProductController {
private final TbProductService tbProductService;
@GetMapping
@Log("查询/product")
@ApiOperation("查询/product")
public ResponseEntity<Object> queryTbProduct(TbProductQueryCriteria criteria){
return new ResponseEntity<>(tbProductService.queryAll(criteria),HttpStatus.OK);
@@ -58,13 +57,11 @@ public class TbProductController {
}
@GetMapping("/{product}")
@Log("查询/product")
@ApiOperation("查询/product")
public Object queryTbProductInfo(@PathVariable("product") Integer product)throws Exception{
return tbProductService.findByProductId(product);
}
@GetMapping ("/productList")
@Log("查询/product")
@ApiOperation("查询/product")
public Object queryTbProductInfo(@RequestParam List<String> productList){
return tbProductService.findByProductList(productList);
@@ -72,14 +69,14 @@ public class TbProductController {
@PostMapping
@Log("新增/product")
@Log("新增商品:#resources.name")
@ApiOperation("新增/product")
public ResponseEntity<Object> createTbProduct(@Validated @RequestBody TbProductVo resources){
return new ResponseEntity<>(tbProductService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/product")
@Log("修改商品:#resources.name")
@ApiOperation("修改/product")
public ResponseEntity<Object> updateTbProduct(@Validated @RequestBody TbProductVo resources){
tbProductService.update(resources);
@@ -87,7 +84,7 @@ public class TbProductController {
}
@DeleteMapping
@Log("删除/product")
@Log("删除商品:#ids")
@ApiOperation("删除/product")
public ResponseEntity<Object> deleteTbProduct(@RequestBody Integer[] ids) {
tbProductService.deleteAll(ids);

16
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java
View File

@@ -50,7 +50,6 @@ public class TbProductGroupController {
@Resource
private TbProductService tbProductService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbProductGroup:list')")
@@ -59,14 +58,12 @@ public class TbProductGroupController {
}
@GetMapping
@Log("查询product/group")
@ApiOperation("查询product/group")
public ResponseEntity<Object> queryTbProductGroup(TbProductGroupQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbProductGroupService.queryAll(criteria,pageable),HttpStatus.OK);
}
@GetMapping("/{productGroup}")
@Log("查询product/group")
@ApiOperation("查询product/group")
public ResponseEntity<Object> queryTbProductGroup(@PathVariable("productGroup") Integer productGroup){
return new ResponseEntity<>(tbProductGroupService.findByIdProduct(productGroup),HttpStatus.OK);
@@ -74,23 +71,23 @@ public class TbProductGroupController {
@PostMapping
@Log("新增product/group")
@ApiOperation("新增product/group")
@Log("新增商品分组:#resources.name")
@ApiOperation("新增商品分组")
public ResponseEntity<Object> createTbProductGroup(@Validated @RequestBody TbProductGroup resources){
return new ResponseEntity<>(tbProductGroupService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改product/group")
@ApiOperation("修改product/group")
@Log("修改商品分组:#resources.name")
@ApiOperation("修改商品分组")
public ResponseEntity<Object> updateTbProductGroup(@Validated @RequestBody TbProductGroup resources){
tbProductGroupService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除product/group")
@ApiOperation("删除product/group")
@Log("删除商品分组:#ids")
@ApiOperation("删除商品分组")
public ResponseEntity<Object> deleteTbProductGroup(@RequestBody Integer[] ids) {
tbProductGroupService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
@@ -111,6 +108,7 @@ public class TbProductGroupController {
* @param userName
* @return
*/
@Log("商品分组增加商品")
@PostMapping("/addProductInfo")
public ResponseEntity<Object> addProductInfo(@RequestBody AddProduct addProduct,@RequestAttribute(value = "userName", required = false) String userName){
return new ResponseEntity<>(tbProductGroupService.updateProductIds(addProduct,userName),HttpStatus.OK);

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuController.java
View File

@@ -43,7 +43,6 @@ public class TbProductSkuController {
private final TbProductSkuService tbProductSkuService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbProductSku:list')")
@@ -52,7 +51,6 @@ public class TbProductSkuController {
}
@GetMapping
@Log("查询/product/sku")
@ApiOperation("查询/product/sku")
@PreAuthorize("@el.check('tbProductSku:list')")
public ResponseEntity<Object> queryTbProductSku(TbProductSkuQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class TbProductSkuController {
}
@PostMapping
@Log("新增/product/sku")
@ApiOperation("新增/product/sku")
@PreAuthorize("@el.check('tbProductSku:add')")
public ResponseEntity<Object> createTbProductSku(@Validated @RequestBody TbProductSku resources){
@@ -68,7 +65,6 @@ public class TbProductSkuController {
}
@PutMapping
@Log("修改/product/sku")
@ApiOperation("修改/product/sku")
@PreAuthorize("@el.check('tbProductSku:edit')")
public ResponseEntity<Object> updateTbProductSku(@Validated @RequestBody TbProductSku resources){
@@ -77,7 +73,6 @@ public class TbProductSkuController {
}
@DeleteMapping
@Log("删除/product/sku")
@ApiOperation("删除/product/sku")
@PreAuthorize("@el.check('tbProductSku:del')")
public ResponseEntity<Object> deleteTbProductSku(@RequestBody Integer[] ids) {

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSkuResultController.java
View File

@@ -43,7 +43,6 @@ public class TbProductSkuResultController {
private final TbProductSkuResultService tbProductSkuResultService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbProductSkuResult:list')")
@@ -52,7 +51,6 @@ public class TbProductSkuResultController {
}
@GetMapping
@Log("查询/skuResult")
@ApiOperation("查询/skuResult")
@PreAuthorize("@el.check('tbProductSkuResult:list')")
public ResponseEntity<Object> queryTbProductSkuResult(TbProductSkuResultQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class TbProductSkuResultController {
}
@PostMapping
@Log("新增/skuResult")
@ApiOperation("新增/skuResult")
@PreAuthorize("@el.check('tbProductSkuResult:add')")
public ResponseEntity<Object> createTbProductSkuResult(@Validated @RequestBody TbProductSkuResult resources){
@@ -68,7 +65,6 @@ public class TbProductSkuResultController {
}
@PutMapping
@Log("修改/skuResult")
@ApiOperation("修改/skuResult")
@PreAuthorize("@el.check('tbProductSkuResult:edit')")
public ResponseEntity<Object> updateTbProductSkuResult(@Validated @RequestBody TbProductSkuResult resources){
@@ -77,7 +73,6 @@ public class TbProductSkuResultController {
}
@DeleteMapping
@Log("删除/skuResult")
@ApiOperation("删除/skuResult")
@PreAuthorize("@el.check('tbProductSkuResult:del')")
public ResponseEntity<Object> deleteTbProductSkuResult(@RequestBody Integer[] ids) {

8
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductSpecController.java
View File

@@ -44,7 +44,6 @@ public class TbProductSpecController {
private final TbProductSpecService tbProductSpecService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbProductSpec:list')")
@@ -53,21 +52,20 @@ public class TbProductSpecController {
}
@GetMapping
@Log("查询product/spec")
@ApiOperation("查询product/spec")
public ResponseEntity<Object> queryTbProductSpec(TbProductSpecQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbProductSpecService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增product/spec")
@Log("新增商品规格:#resources.name")
@ApiOperation("新增product/spec")
public ResponseEntity<Object> createTbProductSpec(@Validated @RequestBody SpecDto resources){
return new ResponseEntity<>(tbProductSpecService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改product/spec")
@Log("修改商品规格:#resources.name")
@ApiOperation("修改product/spec")
public ResponseEntity<Object> updateTbProductSpec(@Validated @RequestBody TbProductSpec resources){
tbProductSpecService.update(resources);
@@ -75,7 +73,7 @@ public class TbProductSpecController {
}
@DeleteMapping
@Log("删除product/spec")
@Log("删除商品规格:#ids")
@ApiOperation("删除product/spec")
public ResponseEntity<Object> deleteTbProductSpec(@RequestBody Integer[] ids) {
tbProductSpecService.deleteAll(ids);

8
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java
View File

@@ -43,7 +43,6 @@ public class TbProductStockDetailController {
private final TbProductStockDetailService tbProductStockDetailService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void exportTbProductStockDetail(HttpServletResponse response, TbProductStockDetailQueryCriteria criteria) throws IOException {
@@ -51,20 +50,17 @@ public class TbProductStockDetailController {
}
@GetMapping
@Log("查询/product/Stock")
@ApiOperation("查询/product/Stock")
public ResponseEntity<Object> queryTbProductStockDetail(TbProductStockDetailQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbProductStockDetailService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping("/stock")
@Log("查询/product/Stock")
@ApiOperation("查询/product/Stock")
public ResponseEntity<Object> queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){
return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK);
}
@GetMapping("/sum")
@Log("查询/product/Stock")
public ResponseEntity<Object> sumType(TbProductStockDetailQueryCriteria criteria){
return new ResponseEntity<>(tbProductStockDetailService.sumStockNumber(criteria.getProductId()),HttpStatus.OK);
}
@@ -76,14 +72,13 @@ public class TbProductStockDetailController {
* @return
*/
@PostMapping
@Log("新增/product/Stock")
@Log("出入库:#resources.productName")
@ApiOperation("新增/product/Stock")
public ResponseEntity<Object> createTbProductStockDetail(@Validated @RequestBody TbProductStockDetail resources){
return new ResponseEntity<>(tbProductStockDetailService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/product/Stock")
@ApiOperation("修改/product/Stock")
public ResponseEntity<Object> updateTbProductStockDetail(@Validated @RequestBody TbProductStockDetail resources){
tbProductStockDetailService.update(resources);
@@ -91,7 +86,6 @@ public class TbProductStockDetailController {
}
@DeleteMapping
@Log("删除/product/Stock")
@ApiOperation("删除/product/Stock")
public ResponseEntity<Object> deleteTbProductStockDetail(@RequestBody Long[] ids) {
tbProductStockDetailService.deleteAll(ids);

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
View File

@@ -43,7 +43,6 @@ public class TbProductStockOperateController {
private final TbProductStockOperateService tbProductStockOperateService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbProductStockOperate:list')")
@@ -69,7 +68,6 @@ public class TbProductStockOperateController {
@PostMapping
@Log("新增/product/StockOperate")
@ApiOperation("新增/product/StockOperate")
@PreAuthorize("@el.check('tbProductStockOperate:add')")
public ResponseEntity<Object> createTbProductStockOperate(@Validated @RequestBody TbProductStockOperate resources){
@@ -77,7 +75,6 @@ public class TbProductStockOperateController {
}
@PostMapping("/outAndOn")
@Log("新增/product/StockOperate")
@ApiOperation("新增/product/StockOperate")
// @PreAuthorize("@el.check('tbProductStockOperate:add')")
public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){
@@ -85,7 +82,6 @@ public class TbProductStockOperateController {
}
@PutMapping
@Log("修改/product/StockOperate")
@ApiOperation("修改/product/StockOperate")
@PreAuthorize("@el.check('tbProductStockOperate:edit')")
public ResponseEntity<Object> updateTbProductStockOperate(@Validated @RequestBody TbProductStockOperate resources){
@@ -94,7 +90,6 @@ public class TbProductStockOperateController {
}
@DeleteMapping
@Log("删除/product/StockOperate")
@ApiOperation("删除/product/StockOperate")
@PreAuthorize("@el.check('tbProductStockOperate:del')")
public ResponseEntity<Object> deleteTbProductStockOperate(@RequestBody Integer[] ids) {

7
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbShopCategoryController.java
View File

@@ -52,21 +52,20 @@ public class TbShopCategoryController {
// }
@GetMapping
@Log("查询product/category")
@ApiOperation("查询product/category")
public ResponseEntity<Object> queryTbShopCategory(TbShopCategoryQueryCriteria criteria){
return new ResponseEntity<>(tbShopCategoryService.queryAll(criteria),HttpStatus.OK);
}
@PostMapping
@Log("新增product/category")
@Log("新增商品分类:#resources.name")
@ApiOperation("新增product/category")
public ResponseEntity<Object> createTbShopCategory(@Validated @RequestBody TbShopCategory resources){
return new ResponseEntity<>(tbShopCategoryService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改product/category")
@Log("修改商品分类:#resources.name")
@ApiOperation("修改product/category")
public ResponseEntity<Object> updateTbShopCategory(@Validated @RequestBody TbShopCategory resources){
tbShopCategoryService.update(resources);
@@ -74,7 +73,7 @@ public class TbShopCategoryController {
}
@DeleteMapping
@Log("删除product/category")
@Log("删除商品分类:#ids")
@ApiOperation("删除product/category")
public ResponseEntity<Object> deleteTbShopCategory(@RequestBody Integer[] ids) {

1
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java
View File

@@ -27,7 +27,6 @@ public class SummaryByDayController {
@Autowired
private SummaryService summaryService;
@Log("导出数据")
@ApiOperation("导出数据")
@PostMapping(value = "download")
public void exportTbOrderInfo(HttpServletResponse response, @RequestBody ShopSummaryDto exportRequest) throws IOException {

57
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java Normal file
View File

@@ -0,0 +1,57 @@
package cn.ysk.cashier.controller.shop;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.pojo.shop.TbCouponCategory;
import cn.ysk.cashier.dto.shop.TbCouponCategoryQueryCriteria;
import cn.ysk.cashier.service.shop.TbCouponCategoryService;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
/**
* @website https://eladmin.vip
* @author ww
* @date 2024-04-25
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "团购卷类别管理")
@RequestMapping("/api/tbCouponCategory")
public class TbCouponCategoryController {
private final TbCouponCategoryService tbCouponCategoryService;
@GetMapping
@Log("查询团购卷类别")
@ApiOperation("查询团购卷类别")
public ResponseEntity<Object> queryTbCouponCategory(TbCouponCategoryQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbCouponCategoryService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增团购卷类别")
@ApiOperation("新增团购卷类别")
public ResponseEntity<Object> createTbCouponCategory(@Validated @RequestBody TbCouponCategory resources){
return new ResponseEntity<>(tbCouponCategoryService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改团购卷类别")
@ApiOperation("修改团购卷类别")
public ResponseEntity<Object> updateTbCouponCategory(@Validated @RequestBody TbCouponCategory resources){
tbCouponCategoryService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除团购卷类别")
@ApiOperation("删除团购卷类别")
public ResponseEntity<Object> deleteTbCouponCategory(@RequestBody Integer[] ids) {
tbCouponCategoryService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

5
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantAccountController.java
View File

@@ -43,7 +43,6 @@ public class TbMerchantAccountController {
private final TbMerchantAccountService tbMerchantAccountService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbMerchantAccount:list')")
@@ -52,7 +51,6 @@ public class TbMerchantAccountController {
}
@GetMapping
@Log("查询/merchant/account")
@ApiOperation("查询/merchant/account")
@PreAuthorize("@el.check('tbMerchantAccount:list')")
public ResponseEntity<Object> queryTbMerchantAccount(TbMerchantAccountQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class TbMerchantAccountController {
}
@PostMapping
@Log("新增/merchant/account")
@ApiOperation("新增/merchant/account")
@PreAuthorize("@el.check('tbMerchantAccount:add')")
public ResponseEntity<Object> createTbMerchantAccount(@Validated @RequestBody TbMerchantAccount resources){
@@ -68,7 +65,6 @@ public class TbMerchantAccountController {
}
@PutMapping
@Log("修改/merchant/account")
@ApiOperation("修改/merchant/account")
@PreAuthorize("@el.check('tbMerchantAccount:edit')")
public ResponseEntity<Object> updateTbMerchantAccount(@Validated @RequestBody TbMerchantAccount resources){
@@ -77,7 +73,6 @@ public class TbMerchantAccountController {
}
@DeleteMapping
@Log("删除/merchant/account")
@ApiOperation("删除/merchant/account")
@PreAuthorize("@el.check('tbMerchantAccount:del')")
public ResponseEntity<Object> deleteTbMerchantAccount(@RequestBody Integer[] ids) {

26
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantCouponController.java
View File

@@ -16,9 +16,13 @@
package cn.ysk.cashier.controller.shop;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.dto.shop.TbMerchantCouponDto;
import cn.ysk.cashier.pojo.shop.TbMerchantCoupon;
import cn.ysk.cashier.pojo.shop.TbPurchaseNotice;
import cn.ysk.cashier.repository.shop.TbPurchaseNoticeRepository;
import cn.ysk.cashier.service.shop.TbMerchantCouponService;
import cn.ysk.cashier.dto.shop.TbMerchantCouponQueryCriteria;
import cn.ysk.cashier.service.shop.TbPurchaseNoticeService;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -27,6 +31,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
/**
@@ -41,34 +47,44 @@ import javax.servlet.http.HttpServletResponse;
public class TbMerchantCouponController {
private final TbMerchantCouponService tbMerchantCouponService;
private final TbPurchaseNoticeRepository noticeRepository;
@Log("导出数据")
@ApiOperation("导出数据")
public void exportTbMerchantCoupon(HttpServletResponse response, TbMerchantCouponQueryCriteria criteria) throws IOException {
tbMerchantCouponService.download(tbMerchantCouponService.queryAll(criteria), response);
}
@GetMapping
@Log("查询/shop/coupon")
public ResponseEntity<Object> queryTbMerchantCoupon(TbMerchantCouponQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbMerchantCouponService.queryAll(criteria,pageable),HttpStatus.OK);
}
@GetMapping("/{id}")
@ApiOperation("查询优惠卷")
public ResponseEntity<Object> queryTbMerchantCouponById(@PathVariable("id")Integer id){
Map result=new HashMap<>();
TbMerchantCouponDto coupon = tbMerchantCouponService.findById(id);
result.put("coupon",coupon);
TbPurchaseNotice notice = noticeRepository.findByCouponId(id);
result.put("notice",notice);
return new ResponseEntity<>(result,HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/coupon")
@Log("新增商家优惠卷:#resources.title")
public ResponseEntity<Object> createTbMerchantCoupon(@Validated @RequestBody TbMerchantCoupon resources){
return new ResponseEntity<>(tbMerchantCouponService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/coupon")
@Log("修改商家优惠卷:#resources.title")
public ResponseEntity<Object> updateTbMerchantCoupon(@Validated @RequestBody TbMerchantCoupon resources){
tbMerchantCouponService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除/shop/coupon")
@Log("删除商家优惠卷:#ids")
public ResponseEntity<Object> deleteTbMerchantCoupon(@RequestBody Integer[] ids) {
tbMerchantCouponService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);

4
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantRegisterController.java
View File

@@ -50,7 +50,6 @@ public class TbMerchantRegisterController {
// }
@PostMapping("/list")
@Log("查询/shop/register")
@ApiOperation("查询/shop/register")
@PreAuthorize("@el.check('tbMerchantRegister:list')")
public ResponseEntity<Object> queryTbMerchantRegister(@RequestBody TbMerchantRegisterQueryCriteria criteria){
@@ -58,7 +57,6 @@ public class TbMerchantRegisterController {
}
@PostMapping
@Log("新增/shop/register")
@ApiOperation("新增/shop/register")
@PreAuthorize("@el.check('tbMerchantRegister:add')")
public ResponseEntity<Object> createTbMerchantRegister(@Validated @RequestBody TbMerchantRegisterDto resources){
@@ -66,7 +64,6 @@ public class TbMerchantRegisterController {
}
@PutMapping
@Log("修改/shop/register")
@ApiOperation("修改/shop/register")
@PreAuthorize("@el.check('tbMerchantRegister:edit')")
public ResponseEntity<Object> updateTbMerchantRegister(@Validated @RequestBody TbMerchantRegister resources){
@@ -75,7 +72,6 @@ public class TbMerchantRegisterController {
}
@DeleteMapping
@Log("删除/shop/register")
@ApiOperation("删除/shop/register")
@PreAuthorize("@el.check('tbMerchantRegister:del')")
public ResponseEntity<Object> deleteTbMerchantRegister(@RequestBody Integer[] ids) {

6
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java
View File

@@ -44,7 +44,6 @@ public class TbMerchantThirdApplyController {
private final TbMerchantThirdApplyService tbMerchantThirdApplyService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbMerchantThirdApply:list')")
@@ -53,9 +52,7 @@ public class TbMerchantThirdApplyController {
}
@GetMapping
@Log("查询/shop/thirdApply")
@ApiOperation("查询/shop/thirdApply")
public ResponseEntity<Object> queryTbMerchantThirdApply(TbMerchantThirdApplyQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbMerchantThirdApplyService.queryAll(criteria,pageable),HttpStatus.OK);
}
@@ -70,7 +67,6 @@ public class TbMerchantThirdApplyController {
}
@PostMapping
@Log("新增/shop/thirdApply")
@ApiOperation("新增/shop/thirdApply")
@PreAuthorize("@el.check('tbMerchantThirdApply:add')")
public ResponseEntity<Object> createTbMerchantThirdApply(@Validated @RequestBody TbMerchantThirdApply resources){
@@ -78,7 +74,6 @@ public class TbMerchantThirdApplyController {
}
@PutMapping
@Log("修改/shop/thirdApply")
@ApiOperation("修改/shop/thirdApply")
@PreAuthorize("@el.check('tbMerchantThirdApply:edit')")
public ResponseEntity<Object> updateTbMerchantThirdApply(@Validated @RequestBody TbMerchantThirdApply resources){
@@ -87,7 +82,6 @@ public class TbMerchantThirdApplyController {
}
@DeleteMapping
@Log("删除/shop/thirdApply")
@ApiOperation("删除/shop/thirdApply")
@PreAuthorize("@el.check('tbMerchantThirdApply:del')")
public ResponseEntity<Object> deleteTbMerchantThirdApply(@RequestBody Integer[] ids) {

15
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPlussShopStaffController.java
View File

@@ -19,6 +19,7 @@ import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.pojo.shop.TbPlussShopStaff;
import cn.ysk.cashier.service.shop.TbPlussShopStaffService;
import cn.ysk.cashier.dto.shop.TbPlussShopStaffQueryCriteria;
import io.swagger.models.auth.In;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -42,7 +43,6 @@ public class TbPlussShopStaffController {
private final TbPlussShopStaffService tbPlussShopStaffService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void exportTbPlussShopStaff(HttpServletResponse response, TbPlussShopStaffQueryCriteria criteria) throws IOException {
@@ -50,21 +50,26 @@ public class TbPlussShopStaffController {
}
@GetMapping
@Log("查询/shop/shopStaff")
@ApiOperation("查询/shop/shopStaff")
public ResponseEntity<Object> queryTbPlussShopStaff(TbPlussShopStaffQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbPlussShopStaffService.queryAll(criteria,pageable),HttpStatus.OK);
}
@GetMapping("/{id}")
@ApiOperation("查询/shop/shopStaff")
public ResponseEntity<Object> queryShopStaffByid(@PathVariable("id") Integer id){
return new ResponseEntity<>(tbPlussShopStaffService.findById(id),HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/shopStaff")
@Log("新增员工:#resources.name")
@ApiOperation("新增/shop/shopStaff")
public ResponseEntity<Object> createTbPlussShopStaff(@Validated @RequestBody TbPlussShopStaff resources){
return new ResponseEntity<>(tbPlussShopStaffService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/shopStaff")
@Log("修改员工:#resources.name")
@ApiOperation("修改/shop/shopStaff")
public ResponseEntity<Object> updateTbPlussShopStaff(@Validated @RequestBody TbPlussShopStaff resources){
tbPlussShopStaffService.update(resources);
@@ -72,7 +77,7 @@ public class TbPlussShopStaffController {
}
@DeleteMapping
@Log("删除/shop/shopStaff")
@Log("删除员工:#ids")
@ApiOperation("删除/shop/shopStaff")
public ResponseEntity<Object> deleteTbPlussShopStaff(@RequestBody Integer[] ids) {
tbPlussShopStaffService.deleteAll(ids);

115
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPrintMachine.java
View File

@@ -1,115 +0,0 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.controller.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* @website https://eladmin.vip
* @description /
* @author lyf
* @date 2024-02-28
**/
@Entity
@Data
@Table(name="tb_print_machine")
public class TbPrintMachine implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "`id`")
@ApiModelProperty(value = "id")
private Integer id;
@Column(name = "`name`",nullable = false)
@NotBlank
@ApiModelProperty(value = "设备名称")
private String name;
@Column(name = "`type`")
@ApiModelProperty(value = "printer")
private String type;
@Column(name = "`connection_type`")
@ApiModelProperty(value = "现在打印机支持USB 和 网络、蓝牙")
private String connectionType;
@Column(name = "`address`")
@ApiModelProperty(value = "ip地址")
private String address;
@Column(name = "`port`")
@ApiModelProperty(value = "端口")
private String port;
@Column(name = "`sub_type`")
@ApiModelProperty(value = "打印类型（分类）")
private String subType;
@Column(name = "`status`")
@ApiModelProperty(value = "状态 online")
private Integer status;
@Column(name = "`shop_id`")
@ApiModelProperty(value = "店铺Id")
private String shopId;
@Column(name = "`category_ids`")
@ApiModelProperty(value = "分类Id")
private String categoryIds;
@Column(name = "`content_type`")
@ApiModelProperty(value = "现在打印机支持USB 和 网络两种")
private String contentType;
@Column(name = "`config`")
@ApiModelProperty(value = "主配置")
private String config;
@Column(name = "`created_at`")
@ApiModelProperty(value = "createdAt")
private Long createdAt;
@Column(name = "`updated_at`")
@ApiModelProperty(value = "updatedAt")
private Long updatedAt;
@Column(name = "`category_list`")
@ApiModelProperty(value = "分类")
private String categoryList;
@Column(name = "`sort`")
@ApiModelProperty(value = "排序")
private Integer sort;
@Column(name = "`vendor_id`")
@ApiModelProperty(value = "Android打印机需要标识设备ID ")
private String vendorId;
@Column(name = "`product_id`")
@ApiModelProperty(value = "Android打印机需要标识设备ID ")
private String productId;
public void copy(TbPrintMachine source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
}

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

@@ -48,14 +48,13 @@ public class TbPrintMachineController {
// }
@GetMapping
@Log("查询/shop/print")
@ApiOperation("查询/shop/print")
public ResponseEntity<Object> queryTbPrintMachine(TbPrintMachineQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbPrintMachineService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/print")
@Log("新增打印机:#resources.name")
@ApiOperation("新增/shop/print")
public ResponseEntity<Object> createTbPrintMachine(@Validated @RequestBody PrintMachineDto resources){
return new ResponseEntity<>(tbPrintMachineService.create(resources),HttpStatus.CREATED);
@@ -66,7 +65,7 @@ public class TbPrintMachineController {
}
@PutMapping
@Log("修改/shop/print")
@Log("修改打印机:#resources.name")
@ApiOperation("修改/shop/print")
public ResponseEntity<Object> updateTbPrintMachine(@Validated @RequestBody PrintMachineDto resources){
tbPrintMachineService.update(resources);
@@ -74,7 +73,7 @@ public class TbPrintMachineController {
}
@DeleteMapping
@Log("删除/shop/print")
@Log("删除打印机:#ids")
@ApiOperation("删除/shop/print")
public ResponseEntity<Object> deleteTbPrintMachine(@RequestBody Integer[] ids) {
tbPrintMachineService.deleteAll(ids);

43
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbPurchaseNoticeController.java Normal file
View File

@@ -0,0 +1,43 @@
package cn.ysk.cashier.controller.shop;
import cn.ysk.cashier.pojo.shop.TbPurchaseNotice;
import cn.ysk.cashier.service.shop.TbPurchaseNoticeService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
/**
* @author ww
* @date 2024-04-25
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "购买须知/价格说明管理")
@RequestMapping("/api/tbPurchaseNotice")
public class TbPurchaseNoticeController {
private final TbPurchaseNoticeService tbPurchaseNoticeService;
@PostMapping
@ApiOperation("新增购买须知/价格说明")
public ResponseEntity<Object> createTbPurchaseNotice(@Validated @RequestBody TbPurchaseNotice resources){
return new ResponseEntity<>(tbPurchaseNoticeService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@ApiOperation("修改购买须知/价格说明")
public ResponseEntity<Object> updateTbPurchaseNotice(@Validated @RequestBody TbPurchaseNotice resources){
tbPurchaseNoticeService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@ApiOperation("删除购买须知/价格说明")
public ResponseEntity<Object> deleteTbPurchaseNotice(@RequestBody Integer[] ids) {
tbPurchaseNoticeService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

6
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbReceiptSalesController.java
View File

@@ -43,7 +43,6 @@ public class TbReceiptSalesController {
private final TbReceiptSalesService tbReceiptSalesService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbReceiptSales:list')")
@@ -52,7 +51,6 @@ public class TbReceiptSalesController {
}
@GetMapping
@Log("查询/shop/receiptSales")
@ApiOperation("查询/shop/receiptSales")
@PreAuthorize("@el.check('tbReceiptSales:list')")
public ResponseEntity<Object> queryTbReceiptSales(TbReceiptSalesQueryCriteria criteria, Pageable pageable){
@@ -60,7 +58,6 @@ public class TbReceiptSalesController {
}
@GetMapping("/{shopId}")
@Log("查询/shop/receiptSales")
@ApiOperation("查询/shop/receiptSales")
@PreAuthorize("@el.check('tbReceiptSales:info')")
public Object queryTbReceiptSalesInfo(@PathVariable("shopId")Integer shopId){
@@ -70,7 +67,6 @@ public class TbReceiptSalesController {
@PostMapping
@Log("新增/shop/receiptSales")
@ApiOperation("新增/shop/receiptSales")
@PreAuthorize("@el.check('tbReceiptSales:add')")
public ResponseEntity<Object> createTbReceiptSales(@Validated @RequestBody TbReceiptSales resources){
@@ -78,7 +74,6 @@ public class TbReceiptSalesController {
}
@PutMapping
@Log("修改/shop/receiptSales")
@ApiOperation("修改/shop/receiptSales")
@PreAuthorize("@el.check('tbReceiptSales:edit')")
public ResponseEntity<Object> updateTbReceiptSales(@Validated @RequestBody TbReceiptSales resources){
@@ -87,7 +82,6 @@ public class TbReceiptSalesController {
}
@DeleteMapping
@Log("删除/shop/receiptSales")
@ApiOperation("删除/shop/receiptSales")
@PreAuthorize("@el.check('tbReceiptSales:del')")
public ResponseEntity<Object> deleteTbReceiptSales(@RequestBody Integer[] ids) {

8
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopAreaController.java
View File

@@ -43,7 +43,6 @@ public class TbShopAreaController {
private final TbShopAreaService tbShopAreaService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopArea:list')")
@@ -52,21 +51,20 @@ public class TbShopAreaController {
}
@GetMapping
@Log("查询/shop/area")
@ApiOperation("查询/shop/area")
public ResponseEntity<Object> queryTbShopArea(TbShopAreaQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopAreaService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/area")
@Log("新增区域:#resources.name")
@ApiOperation("新增/shop/area")
public ResponseEntity<Object> createTbShopArea(@Validated @RequestBody TbShopArea resources){
return new ResponseEntity<>(tbShopAreaService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/area")
@Log("修改区域:#resources.name")
@ApiOperation("修改/shop/area")
public ResponseEntity<Object> updateTbShopArea(@Validated @RequestBody TbShopArea resources){
tbShopAreaService.update(resources);
@@ -74,7 +72,7 @@ public class TbShopAreaController {
}
@DeleteMapping
@Log("删除/shop/area")
@Log("删除区域:#ids")
@ApiOperation("删除/shop/area")
public ResponseEntity<Object> deleteTbShopArea(@RequestBody Integer[] ids) {
tbShopAreaService.deleteAll(ids);

6
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopCashSpreadController.java
View File

@@ -44,7 +44,6 @@ public class TbShopCashSpreadController {
private final TbShopCashSpreadService tbShopCashSpreadService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopCashSpread:list')")
@@ -53,14 +52,12 @@ public class TbShopCashSpreadController {
}
@GetMapping
@Log("查询/shop/spread")
@ApiOperation("查询/shop/spread")
@PreAuthorize("@el.check('tbShopCashSpread:list')")
public ResponseEntity<Object> queryTbShopCashSpread(TbShopCashSpreadQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopCashSpreadService.queryAll(criteria,pageable),HttpStatus.OK);
}
@GetMapping("/{shopId}")
@Log("查询/shop/spread/info")
@ApiOperation("查询/shop/spread/info")
@PreAuthorize("@el.check('tbShopCashSpread:info')")
public Object queryTbShopCashSpreadInfo(@PathVariable("shopId") Integer shopId){
@@ -69,7 +66,6 @@ public class TbShopCashSpreadController {
return StringUtils.stringChangeMap(screenConfig);
}
@PostMapping
@Log("新增/shop/spread")
@ApiOperation("新增/shop/spread")
@PreAuthorize("@el.check('tbShopCashSpread:add')")
public ResponseEntity<Object> createTbShopCashSpread(@Validated @RequestBody TbShopCashSpread resources){
@@ -77,7 +73,6 @@ public class TbShopCashSpreadController {
}
@PutMapping
@Log("修改/shop/spread")
@ApiOperation("修改/shop/spread")
@PreAuthorize("@el.check('tbShopCashSpread:edit')")
public ResponseEntity<Object> updateTbShopCashSpread(@Validated @RequestBody TbShopCashSpread resources){
@@ -91,7 +86,6 @@ public class TbShopCashSpreadController {
}
@DeleteMapping
@Log("删除/shop/spread")
@ApiOperation("删除/shop/spread")
@PreAuthorize("@el.check('tbShopCashSpread:del')")
public ResponseEntity<Object> deleteTbShopCashSpread(@RequestBody String[] ids) {

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

@@ -15,7 +15,6 @@
*/
package cn.ysk.cashier.controller.shop;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.pojo.shop.TbShopCurrency;
import cn.ysk.cashier.service.shop.TbShopCurrencyService;
import cn.ysk.cashier.dto.shop.TbShopCurrencyQueryCriteria;
@@ -43,7 +42,6 @@ public class TbShopCurrencyController {
private final TbShopCurrencyService tbShopCurrencyService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopCurrency:list')")
@@ -52,28 +50,24 @@ public class TbShopCurrencyController {
}
@GetMapping
@Log("查询/shop/currency")
@ApiOperation("查询/shop/currency")
public ResponseEntity<Object> queryTbShopCurrency(TbShopCurrencyQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopCurrencyService.queryAll(criteria,pageable),HttpStatus.OK);
}
@GetMapping("/{shopId}")
@Log("查询/shop/currency/info")
@ApiOperation("查询/shop/currency/info")
public Object queryTbShopCurrencyInfo(@PathVariable("shopId") String shopId){
return tbShopCurrencyService.findByShopId(shopId);
}
@PostMapping
@Log("新增/shop/currency")
@ApiOperation("新增/shop/currency")
public ResponseEntity<Object> createTbShopCurrency(@Validated @RequestBody TbShopCurrency resources){
return new ResponseEntity<>(tbShopCurrencyService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/currency")
@ApiOperation("修改/shop/currency")
public ResponseEntity<Object> updateTbShopCurrency(@Validated @RequestBody TbShopCurrency resources){
tbShopCurrencyService.update(resources);
@@ -81,7 +75,6 @@ public class TbShopCurrencyController {
}
@DeleteMapping
@Log("删除/shop/currency")
@ApiOperation("删除/shop/currency")
public ResponseEntity<Object> deleteTbShopCurrency(@RequestBody Integer[] ids) {
tbShopCurrencyService.deleteAll(ids);

10
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java
View File

@@ -59,7 +59,6 @@ public class TbShopInfoController {
// }
@GetMapping
@Log("查询/shop/list")
@ApiOperation("查询/shop/list")
@PreAuthorize("@el.check('tbShopInfo:list')")
public ResponseEntity<Object> queryTbShopInfo(TbShopInfoQueryCriteria criteria){
@@ -67,14 +66,13 @@ public class TbShopInfoController {
}
@GetMapping("/{shopId}")
@Log("查询/shop/list")
@ApiOperation("查询/shop/list")
public Object queryInfo(@PathVariable("shopId") Integer shopId){
return tbShopInfoService.findById(shopId);
}
@PostMapping
@Log("新增/shop/list")
@Log("新增商户:#resources.shopName")
@ApiOperation("新增/shop/list")
@PreAuthorize("@el.check('tbShopInfo:add')")
public ResponseEntity<Object> createTbShopInfo(@Validated @RequestBody TbShopInfoDto resources){
@@ -92,7 +90,7 @@ public class TbShopInfoController {
}
@PutMapping
@Log("修改/shop/list")
@Log("修改商户:#resources.shopName")
@ApiOperation("修改/shop/list")
public ResponseEntity<Object> updateTbShopInfo(@Validated @RequestBody TbShopInfo resources){
tbShopInfoService.update(resources);
@@ -100,14 +98,14 @@ public class TbShopInfoController {
}
@PutMapping("/shop")
@Log("修改/shop/list")
@Log("修改商户:#resources.shopName")
public ResponseEntity<Object> updateShopInfoShopId(@Validated @RequestBody TbShopInfo resources){
tbShopInfoService.updateShopId(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除/shop/list")
@Log("删除商户:#ids")
@ApiOperation("删除/shop/list")
@PreAuthorize("@el.check('tbShopInfo:del')")
public ResponseEntity<Object> deleteTbShopInfo(@RequestBody Integer[] ids) {

8
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java
View File

@@ -43,7 +43,6 @@ public class TbShopPurveyorController {
private final TbShopPurveyorService tbShopPurveyorService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopPurveyor:list')")
@@ -52,21 +51,20 @@ public class TbShopPurveyorController {
}
@GetMapping
@Log("查询/shop/purveyor")
@ApiOperation("查询/shop/purveyor")
public ResponseEntity<Object> queryTbShopPurveyor(TbShopPurveyorQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopPurveyorService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/purveyor")
@Log("新增供应商:#resources.name")
@ApiOperation("新增/shop/purveyor")
public ResponseEntity<Object> createTbShopPurveyor(@Validated @RequestBody TbShopPurveyor resources){
return new ResponseEntity<>(tbShopPurveyorService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/purveyor")
@Log("修改供应商:#resources.name")
@ApiOperation("修改/shop/purveyor")
public ResponseEntity<Object> updateTbShopPurveyor(@Validated @RequestBody TbShopPurveyor resources){
tbShopPurveyorService.update(resources);
@@ -74,7 +72,7 @@ public class TbShopPurveyorController {
}
@DeleteMapping
@Log("删除/shop/purveyor")
@Log("删除供应商:#ids")
@ApiOperation("删除/shop/purveyor")
public ResponseEntity<Object> deleteTbShopPurveyor(@RequestBody Integer[] ids) {
tbShopPurveyorService.deleteAll(ids);

6
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java
View File

@@ -44,7 +44,6 @@ public class TbShopPurveyorTransactController {
private final TbShopPurveyorTransactService tbShopPurveyorTransactService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopPurveyorTransact:list')")
@@ -59,7 +58,6 @@ public class TbShopPurveyorTransactController {
* @return
*/
@GetMapping
@Log("查询/shop/purveyorTransact")
@ApiOperation("查询/shop/purveyorTransact")
public ResponseEntity<Object> queryTbShopPurveyorTransactSum(TbShopPurveyorTransactQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopPurveyorTransactService.queryTransactDate(criteria,pageable),HttpStatus.OK);
@@ -71,7 +69,6 @@ public class TbShopPurveyorTransactController {
* @return
*/
@PostMapping("/info")
@Log("查询/shop/purveyorTransact")
public ResponseEntity<Object> queryPurveyorTransact(@RequestBody TbShopPurveyorTransactQueryCriteria criteria){
return new ResponseEntity<>(tbShopPurveyorTransactService.queryPurveyorTransact(criteria),HttpStatus.OK);
}
@@ -87,14 +84,12 @@ public class TbShopPurveyorTransactController {
}
@PostMapping
@Log("新增/shop/purveyorTransact")
@ApiOperation("新增/shop/purveyorTransact")
public ResponseEntity<Object> createTbShopPurveyorTransact(@Validated @RequestBody TbShopPurveyorTransact resources){
return new ResponseEntity<>(tbShopPurveyorTransactService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/purveyorTransact")
@ApiOperation("修改/shop/purveyorTransact")
public ResponseEntity<Object> updateTbShopPurveyorTransact(@Validated @RequestBody TbShopPurveyorTransact resources){
tbShopPurveyorTransactService.update(resources);
@@ -102,7 +97,6 @@ public class TbShopPurveyorTransactController {
}
@DeleteMapping
@Log("删除/shop/purveyorTransact")
@ApiOperation("删除/shop/purveyorTransact")
public ResponseEntity<Object> deleteTbShopPurveyorTransact(@RequestBody Integer[] ids) {
tbShopPurveyorTransactService.deleteAll(ids);

8
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
View File

@@ -43,7 +43,6 @@ public class TbShopTableController {
private final TbShopTableService tbShopTableService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopTable:list')")
@@ -52,14 +51,13 @@ public class TbShopTableController {
}
@GetMapping
@Log("查询/shop/table")
@ApiOperation("查询/shop/table")
public ResponseEntity<Object> queryTbShopTable(TbShopTableQueryCriteria criteria){
return new ResponseEntity<>(tbShopTableService.queryAllNoPage(criteria),HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/table")
@Log("新增台桌:#resources.name")
@ApiOperation("新增/shop/table")
public ResponseEntity<Object> createTbShopTable(@Validated @RequestBody TbShopTable resources){
return new ResponseEntity<>(tbShopTableService.create(resources),HttpStatus.CREATED);
@@ -72,7 +70,7 @@ public class TbShopTableController {
}
@PutMapping
@Log("修改/shop/table")
@Log("修改台桌:#resources.name")
@ApiOperation("修改/shop/table")
public ResponseEntity<Object> updateTbShopTable(@Validated @RequestBody TbShopTable resources){
tbShopTableService.update(resources);
@@ -80,7 +78,7 @@ public class TbShopTableController {
}
@DeleteMapping
@Log("删除/shop/table")
@Log("删除台桌:#ids")
@ApiOperation("删除/shop/table")
public ResponseEntity<Object> deleteTbShopTable(@RequestBody Integer[] ids) {
tbShopTableService.deleteAll(ids);

8
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUnitController.java
View File

@@ -43,7 +43,6 @@ public class TbShopUnitController {
private final TbShopUnitService tbShopUnitService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('tbShopUnit:list')")
@@ -52,21 +51,20 @@ public class TbShopUnitController {
}
@GetMapping
@Log("查询/shop/unit")
@ApiOperation("查询/shop/unit")
public ResponseEntity<Object> queryTbShopUnit(TbShopUnitQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopUnitService.queryAll(criteria,pageable),HttpStatus.OK);
}
@PostMapping
@Log("新增/shop/unit")
@Log("新增单位:#resources.name")
@ApiOperation("新增/shop/unit")
public ResponseEntity<Object> createTbShopUnit(@Validated @RequestBody TbShopUnit resources)throws Exception{
return new ResponseEntity<>(tbShopUnitService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/unit")
@Log("修改单位:#resources.name")
@ApiOperation("修改/shop/unit")
public ResponseEntity<Object> updateTbShopUnit(@Validated @RequestBody TbShopUnit resources){
tbShopUnitService.update(resources);
@@ -74,7 +72,7 @@ public class TbShopUnitController {
}
@DeleteMapping
@Log("删除/shop/unit")
@Log("删除单位:#ids")
@ApiOperation("删除/shop/unit")
public ResponseEntity<Object> deleteTbShopUnit(@RequestBody Integer[] ids) {
tbShopUnitService.deleteAll(ids);

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

@@ -42,7 +42,6 @@ public class TbShopUserController {
private final TbShopUserService tbShopUserService;
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
public void exportTbShopUser(HttpServletResponse response, TbShopUserQueryCriteria criteria) throws IOException {
@@ -50,14 +49,12 @@ public class TbShopUserController {
}
@GetMapping
@Log("查询/shop/user")
@ApiOperation("查询/shop/user")
public ResponseEntity<Object> queryTbShopUser(TbShopUserQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopUserService.queryAll(criteria,pageable),HttpStatus.OK);
}
@GetMapping("queryAllShopUser")
@Log("查询商家用户")
@ApiOperation("查询商家用户")
public ResponseEntity<Object> queryAllShopUser(TbShopUserQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbShopUserService.queryAllShopUser(criteria,pageable),HttpStatus.OK);
@@ -65,14 +62,12 @@ public class TbShopUserController {
@PostMapping
@Log("新增/shop/user")
@ApiOperation("新增/shop/user")
public ResponseEntity<Object> createTbShopUser(@Validated @RequestBody TbShopUser resources){
return new ResponseEntity<>(tbShopUserService.create(resources),HttpStatus.CREATED);
}
@PutMapping
@Log("修改/shop/user")
@ApiOperation("修改/shop/user")
public ResponseEntity<Object> updateTbShopUser(@Validated @RequestBody TbShopUser resources){
tbShopUserService.update(resources);
@@ -80,7 +75,6 @@ public class TbShopUserController {
}
@DeleteMapping
@Log("删除/shop/user")
@ApiOperation("删除/shop/user")
public ResponseEntity<Object> deleteTbShopUser(@RequestBody Integer[] ids) {
tbShopUserService.deleteAll(ids);

30
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopVideoController.java
View File

@@ -24,31 +24,29 @@ public class TbShopVideoController {
private final TbShopVideoService tbShopVideoService;
@GetMapping
@Log("查询商户视频号")
@ApiOperation("查询商户视频号")
public ResponseEntity<Object> queryTbShopVideo(TbShopVideoQueryCriteria criteria){
criteria.setType(3);
return new ResponseEntity<>(tbShopVideoService.queryAllPage(criteria), HttpStatus.OK);
}
@GetMapping("/{id}")
@ApiOperation("查询商户视频号")
public Object queryInfo(@PathVariable("id") Integer id){
return tbShopVideoService.findById(id);
}
@GetMapping("media")
@Log("查询公众号")
@ApiOperation("查询公众号")
public ResponseEntity<Object> queryMediaPlatform(TbShopVideoQueryCriteria criteria){
criteria.setType(1);
return new ResponseEntity<>(tbShopVideoService.queryAllPage(criteria), HttpStatus.OK);
}
@GetMapping("/{id}")
@Log("查询商户视频号")
@ApiOperation("查询商户视频号")
public Object queryInfo(@PathVariable("id") Integer id){
return tbShopVideoService.findById(id);
}
@PostMapping("media")
@Log("新增公众号")
@Log("新增公众号:#resources.name")
@ApiOperation("新增公众号")
public ResponseEntity<Object> createMediaPlatform(@Validated @RequestBody TbShopVideo resources){
resources.setType(1);
@@ -56,7 +54,7 @@ public class TbShopVideoController {
}
@PostMapping
@Log("新增商户视频号")
@Log("新增商户视频号:#resources.name")
@ApiOperation("新增商户视频号")
public ResponseEntity<Object> createTbShopVideo(@Validated @RequestBody TbShopVideo resources){
resources.setType(3);
@@ -64,16 +62,16 @@ public class TbShopVideoController {
}
@PutMapping
@Log("修改商户视频号")
@ApiOperation("修改商户视频号")
@Log("修改商户视频号:#resources.name")
@ApiOperation("修改商户视频号/公众号管理")
public ResponseEntity<Object> updateTbShopVideo(@Validated @RequestBody TbShopVideo resources){
tbShopVideoService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@DeleteMapping
@Log("删除商户视频号")
@ApiOperation("删除商户视频号")
@Log("删除商户视频号/公众号管理:#ids")
@ApiOperation("删除资源")
public ResponseEntity<Object> deleteTbShopVideo(@RequestBody Integer[] ids) {
tbShopVideoService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);