查询套餐详情 增加 shopId 字段
This commit is contained in:
@@ -58,8 +58,8 @@ public class UPpPackageController {
|
||||
* 获取套餐详情
|
||||
*/
|
||||
@GetMapping("/detail/{id}")
|
||||
public CzgResult<PpPackageVO> getPackageDetail(@PathVariable Long id) {
|
||||
return CzgResult.success(ppPackageService.getPackageDetail(id));
|
||||
public CzgResult<PpPackageVO> getPackageDetail(@PathVariable Long id, Long shopId) {
|
||||
return CzgResult.success(ppPackageService.getPackageDetail(id, shopId));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -48,7 +48,7 @@ public interface PpPackageService extends IService<PpPackage> {
|
||||
|
||||
PpPackage getPackageById(Long id);
|
||||
|
||||
PpPackageVO getPackageDetail(Long id);
|
||||
PpPackageVO getPackageDetail(Long id, Long shopId);
|
||||
|
||||
PpPackageVO convertPackageToVo(PpPackage ppPackage);
|
||||
|
||||
|
||||
@@ -203,17 +203,18 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
|
||||
}
|
||||
|
||||
@Override
|
||||
public PpPackageVO getPackageDetail(Long id) {
|
||||
public PpPackageVO getPackageDetail(Long id, Long shopId) {
|
||||
PpPackage ppPackage = getPackageById(id);
|
||||
|
||||
PpPackageVO packageVO = convertPackageToVo(ppPackage);
|
||||
|
||||
ShopInfo shopInfo = shopInfoService.getById(ppPackage.getShopId());
|
||||
ShopInfo shopInfo = shopInfoService.getById(shopId);
|
||||
if (shopInfo != null) {
|
||||
packageVO.setShopName(shopInfo.getShopName());
|
||||
packageVO.setShopAddress(shopInfo.getAddress());
|
||||
packageVO.setShopLogo(shopInfo.getLogo());
|
||||
}
|
||||
packageVO.setShopId(shopId);
|
||||
return packageVO;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user