Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
32590bb35a
|
|
@ -59,4 +59,9 @@ public class ShopInfoController {
|
||||||
) {
|
) {
|
||||||
return shopInfoService.queryDutyFlow(token, shopId, page,pageSize);
|
return shopInfoService.queryDutyFlow(token, shopId, page,pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("queryPwdInfo")
|
||||||
|
public Result queryPwdInfo(@RequestParam("shopId") String shopId) {
|
||||||
|
return shopInfoService.queryShopPwdInfo(shopId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,8 @@ import java.util.*;
|
||||||
@Service
|
@Service
|
||||||
public class ShopInfoService {
|
public class ShopInfoService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
TbShopInfoMapper tbShopInfoMapper;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
TbShopAreaMapper tbShopAreaMapper;
|
TbShopAreaMapper tbShopAreaMapper;
|
||||||
|
|
@ -127,4 +128,13 @@ public class ShopInfoService {
|
||||||
map.put("amount",amount);
|
map.put("amount",amount);
|
||||||
return Result.success(CodeEnum.SUCCESS,map);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue