zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/分账重构'

Browse Source
This commit is contained in:
zengtao01
2024-10-06 11:32:51 +08:00
parent 25945fb552 0720cf442c
commit 0cd98c8faa
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/AppDiningPlatesController.java
View File

@ -63,14 +63,14 @@ public class AppDiningPlatesController {
@GetMapping("/checkBind") @GetMapping("/checkBind")
@Operation(summary = "验证餐盘绑定") @Operation(summary = "验证餐盘绑定")
public CommonResult<AppUserInfoCardVO> checkBind(String diningPlatesNum,Long storeId) { public CommonResult<AppUserInfoCardVO> checkBind(String diningPlatesNum,Long storeId) {
storeId = getCarteen(); storeId = getCarteen(storeId);
return success(diningPlatesService.appCheckBind(diningPlatesNum,storeId)); return success(diningPlatesService.appCheckBind(diningPlatesNum,storeId));
} }
@GetMapping("/unbind") @GetMapping("/unbind")
@Operation(summary = "餐盘解绑") @Operation(summary = "餐盘解绑")
public CommonResult<String> unbind(String diningPlatesNum,Long storeId) { public CommonResult<String> unbind(String diningPlatesNum,Long storeId) {
storeId = getCarteen(); storeId = getCarteen(storeId);
diningPlatesService.unbind(diningPlatesNum,storeId); diningPlatesService.unbind(diningPlatesNum,storeId);
return success(diningPlatesNum); return success(diningPlatesNum);
} }
@ -78,7 +78,7 @@ public class AppDiningPlatesController {
@GetMapping("/getUserAndDish") @GetMapping("/getUserAndDish")
@Operation(summary = "根据餐盘号获取当前余额") @Operation(summary = "根据餐盘号获取当前余额")
public CommonResult<AppUserInfo> getMoney(String cId, Long dishesId,Long storeId) { public CommonResult<AppUserInfo> getMoney(String cId, Long dishesId,Long storeId) {
storeId = getCarteen(); storeId = getCarteen(storeId);
return success(diningPlatesService.getMoney(cId,dishesId,storeId)); return success(diningPlatesService.getMoney(cId,dishesId,storeId));
} }
@ -91,7 +91,7 @@ public class AppDiningPlatesController {
@GetMapping("/checkBindAndUnBind") @GetMapping("/checkBindAndUnBind")
@Operation(summary = "餐盘解绑") @Operation(summary = "餐盘解绑")
public CommonResult<String> checkBindAndUnBind(String diningPlatesNum,Long storeId) { public CommonResult<String> checkBindAndUnBind(String diningPlatesNum,Long storeId) {
storeId = getCarteen(); storeId = getCarteen(storeId);
String b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId); String b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId);
CommonResult<String> result = new CommonResult<>(); CommonResult<String> result = new CommonResult<>();
result.setCode(200); result.setCode(200);
@ -109,7 +109,10 @@ public class AppDiningPlatesController {
} }
public Long getCarteen() { public Long getCarteen(Long storeId) {
if (storeId != null){
return storeId;
}
try { try {
String authorization = httpServletRequest.getHeader("Authorization"); String authorization = httpServletRequest.getHeader("Authorization");
Long carteen = deviceInfoApi.getCarteen(authorization); Long carteen = deviceInfoApi.getCarteen(authorization);