分店套餐 Id 不对问题
This commit is contained in:
@@ -57,7 +57,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl<PpPackageOrderMapper,
|
||||
private ShopInfoService shopInfoService;
|
||||
|
||||
@Override
|
||||
public Long createPackageOrder(Long packageId) {
|
||||
public Long createPackageOrder(Long packageId, Long shopId) {
|
||||
PpPackage aPackage = ppPackageService.getPackageById(packageId);
|
||||
if (aPackage == null) {
|
||||
throw new CzgException("套餐不存在");
|
||||
@@ -68,7 +68,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl<PpPackageOrderMapper,
|
||||
}
|
||||
|
||||
PpPackageOrder order = new PpPackageOrder()
|
||||
.setShopId(aPackage.getShopId())
|
||||
.setShopId(shopId)
|
||||
.setPackageId(packageId)
|
||||
.setUserId(StpKit.USER.getLoginIdAsLong())
|
||||
.setShareNum(0)
|
||||
|
||||
@@ -179,7 +179,12 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
|
||||
Page<PpPackage> page = page(Page.of(reqVo.getPage(), reqVo.getSize()), queryWrapper);
|
||||
|
||||
List<PpPackageVO> voList = new ArrayList<>();
|
||||
page.getRecords().forEach(item -> voList.add(convertPackageToVo(item)));
|
||||
page.getRecords().forEach(item -> {
|
||||
if (!isAdmin) {
|
||||
item.setShopId(shopId);
|
||||
}
|
||||
voList.add(convertPackageToVo(item));
|
||||
});
|
||||
|
||||
Page<PpPackageVO> voPage = new Page<>();
|
||||
BeanUtil.copyProperties(page, voPage, "records");
|
||||
|
||||
Reference in New Issue
Block a user