czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分店套餐 Id 不对问题

Browse Source
This commit is contained in:
gong
2025-12-19 17:58:21 +08:00
parent 6084bf847b
commit 7dc620a3d9
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
View File

@@ -34,14 +34,16 @@ public class UPpPackageController {
/**
* 创建套餐推广订单
* 参数: {"packageId": 123}
* 参数: {"packageId": 123, "shopId": 123}
*/
@PostMapping("/order")
public CzgResult<Long> createOrder(@RequestBody JSONObject params) {
AssertUtil.isNull(params, "参数不能为空");
Long packageId = params.getLong("packageId");
AssertUtil.isNull(packageId, "参数错误");
return CzgResult.success(ppPackageOrderService.createPackageOrder(packageId));
Long shopId = params.getLong("shopId");
AssertUtil.isNull(shopId, "参数错误");
return CzgResult.success(ppPackageOrderService.createPackageOrder(packageId, shopId));
}
/**

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java
View File

@@ -19,7 +19,7 @@ public interface PpPackageOrderService extends IService<PpPackageOrder> {
/**
* 创建推广订单
*/
Long createPackageOrder(Long packageId);
Long createPackageOrder(Long packageId, Long shopId);
/**
* 根据订单 Id 查询推广订单详情

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java
View File

@@ -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)

7
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
View File

@@ -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");