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:
seesaw
2024-09-29 11:21:09 +08:00
parent 6ea6d96529 a0509eadd4
commit f12f16bb3e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,14 +76,12 @@ public class AppDiningPlatesController {
@GetMapping("/checkBindAndUnBind")
@Operation(summary = "餐盘解绑")
public CommonResult<String> checkBindAndUnBind(String diningPlatesNum,Long storeId) {
Boolean b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId);
String b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId);
CommonResult<String> result = new CommonResult<>();
result.setCode(200);
if (b) {
result.setData(b);
if ("bind".equals(b)) {
result.setMsg("餐盘已解绑");
result.setData("bind");
}else {
result.setData("unbind");
}
return result;
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java
View File

@ -104,5 +104,5 @@ public interface DiningPlatesService {
*/
List<String> getBindDiningPlatesList();
Boolean checkBindAndUnBind(String diningPlatesNum,Long storeId);
String checkBindAndUnBind(String diningPlatesNum,Long storeId);
}

10
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
View File

@ -444,15 +444,17 @@ public class DiningPlatesServiceImpl implements DiningPlatesService {
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean checkBindAndUnBind(String diningPlatesNum,Long storeId) {
public String checkBindAndUnBind(String diningPlatesNum,Long storeId) {
DiningPlatesDO diningPlatesDO = diningPlatesMapper.selectOne(Wrappers.<DiningPlatesDO>lambdaQuery()
.eq(DiningPlatesDO::getDiningPlatesNum, diningPlatesNum)
.eq(DiningPlatesDO::getStoreId, storeId));
if(diningPlatesDO == null || diningPlatesDO.getUserId() == null){
return false;
if(diningPlatesDO == null ) {
return "absent";
}else if (diningPlatesDO.getUserId() == null){
return "unbind";
}else {
unbind(diningPlatesNum,storeId);
return true;
return "bind";
}
}
}