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:
liuyingfang
2024-03-07 09:00:14 +08:00
parent 45d9319811
commit 55ca50ad1b
8 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,13 @@ public class TbShopPayTypeController {
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")

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

@@ -56,14 +56,13 @@ public class TbShopInfoController {
@Log("查询/shop/list")
@ApiOperation("查询/shop/list")
@PreAuthorize("@el.check('tbShopInfo:list')")
public ResponseEntity<Object> queryTbShopInfo(TbShopInfoQueryCriteria criteria, Pageable pageable){
public ResponseEntity<Object> queryTbShopInfo(TbShopInfoQueryCriteria criteria){
return new ResponseEntity<>(tbShopInfoService.queryAll(criteria),HttpStatus.OK);
}
@GetMapping("/{shopId}")
@Log("查询/shop/list")
@ApiOperation("查询/shop/list")
@PreAuthorize("@el.check('tbShopInfo:info')")
public Object queryInfo(@PathVariable("shopId") Integer shopId){
return tbShopInfoService.findById(shopId);
}
@@ -79,7 +78,6 @@ public class TbShopInfoController {
@PutMapping
@Log("修改/shop/list")
@ApiOperation("修改/shop/list")
@PreAuthorize("@el.check('tbShopInfo:edit')")
public ResponseEntity<Object> updateTbShopInfo(@Validated @RequestBody TbShopInfo resources){
tbShopInfoService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);