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

Merge remote-tracking branch 'origin/dev' into zs

Browse Source
This commit is contained in:
SongZhang
2024-08-03 09:50:44 +08:00
parent 49ec7ab65d 48488daad8
commit f0755c58a1
11 changed files with 56 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,8 +39,8 @@ public class TbProductController {
}
@GetMapping("/isHot")
public ResponseEntity<Object> updateIsHot(@RequestParam String shopId, @RequestParam Integer id){
tbProductService.updateIsHot(id,shopId);
public ResponseEntity<Object> updateIsHot(@RequestParam Integer isHot, @RequestParam Integer id){
tbProductService.updateIsHot(id,isHot);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}

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

@@ -1,25 +1,9 @@
/*
* 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 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;
@@ -91,4 +75,15 @@ public class TbPlussShopStaffController {
tbPlussShopStaffService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
// @ApiOperation("修改个人密码")
// @PostMapping(value = "/upPass")
// @AnonymousPostMapping
// public ResponseEntity<Object> upshopStaffPass(HttpServletRequest request, @RequestBody Map<String, String> map){
// tbShopInfoService.upShopPass(map.get("username"),map.get("password"));
// //根据token踢出用户
// onlineUserService.logout(tokenProvider.getToken(request));
// log.info("修改商户密码成功。");
// return new ResponseEntity<>(HttpStatus.OK);
// }
}

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

@@ -72,7 +72,7 @@ public class TbShopInfoController {
public ResponseEntity<Object> upShopPass(HttpServletRequest request, @RequestBody Map<String, String> map) throws Exception {
tbShopInfoService.upShopPass(map.get("username"),map.get("password"));
//根据token踢出用户
// onlineUserService.logout(tokenProvider.getToken(request));
onlineUserService.logout(tokenProvider.getToken(request));
log.info("修改商户密码成功。");
return new ResponseEntity<>(HttpStatus.OK);
}