Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
SongZhang 2024-08-30 10:42:28 +08:00
commit 32590bb35a
2 changed files with 16 additions and 1 deletions

View File

@ -59,4 +59,9 @@ public class ShopInfoController {
) {
return shopInfoService.queryDutyFlow(token, shopId, page,pageSize);
}
@GetMapping("queryPwdInfo")
public Result queryPwdInfo(@RequestParam("shopId") String shopId) {
return shopInfoService.queryShopPwdInfo(shopId);
}
}

View File

@ -27,7 +27,8 @@ import java.util.*;
@Service
public class ShopInfoService {
@Autowired
TbShopInfoMapper tbShopInfoMapper;
@Autowired
TbShopAreaMapper tbShopAreaMapper;
@ -127,4 +128,13 @@ public class ShopInfoService {
map.put("amount",amount);
return Result.success(CodeEnum.SUCCESS,map);
}
public Result queryShopPwdInfo(String shopId){
TbShopInfo tbShopInfo= tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(shopId));
Map<String, String> data = new HashMap<>();
data.put("isMemberIn", tbShopInfo.getIsMemberIn());
data.put("isMemberReturn", tbShopInfo.getIsMemberReturn());
data.put("isReturn", tbShopInfo.getIsReturn());
return Result.success(CodeEnum.SUCCESS,data);
}
}