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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai 2025-03-04 16:36:32 +08:00
parent d9933fbd3b 4a47c06d72
commit 2397cc633d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
View File

@ -49,7 +49,7 @@ public class ShopInfoController {
if (StpKit.USER.isAdmin() || StpKit.USER.getShopId().equals(id)) {
return CzgResult.success(shopInfoService.detail(id));
}
return CzgResult.failure("店铺信息不存在");
return CzgResult.success(shopInfoService.detail(StpKit.USER.getShopId()));
}
/**

2
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopStorageGoodServiceImpl.java
View File

@ -58,7 +58,7 @@ public class ShopStorageGoodServiceImpl extends ServiceImpl<ShopStorageGoodMappe
shopStorageGood.setName(product.getName());
shopStorageGood.setImgUrl(product.getCoverImg());
ShopProdUnit unit = shopProdUnitService.getOne(new QueryWrapper().eq(ShopProdUnit::getShopId, shopId).eq(ShopProdUnit::getId, product.getId()));
ShopProdUnit unit = shopProdUnitService.getOne(new QueryWrapper().eq(ShopProdUnit::getShopId, shopId).eq(ShopProdUnit::getId, product.getUnitId()));
shopStorageGood.setUnit(unit == null ? "" : unit.getName());
}
shopStorageGood.setShopId(shopId);