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

pad 布局获取

Browse Source
This commit is contained in:
wangw
2025-11-14 14:30:02 +08:00
parent bf349c9024
commit fd8957d658
3 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,7 @@
package com.czg.controller.admin; package com.czg.controller.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.czg.account.dto.pad.*; import com.czg.account.dto.pad.*;
import com.czg.account.entity.PadLayout; import com.czg.account.entity.PadLayout;
import com.czg.account.entity.PadProductCategoryDetail;
import com.czg.account.service.PadLayoutService; import com.czg.account.service.PadLayoutService;
import com.czg.account.service.PadProdService; import com.czg.account.service.PadProdService;
import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckPermission;
@@ -12,12 +10,9 @@ import com.czg.sa.StpKit;
import com.czg.utils.PageUtil; import com.czg.utils.PageUtil;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Map;
/** /**
* pad点餐相关 * pad点餐相关
* @author Administrator * @author Administrator

3
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
View File

@@ -107,7 +107,8 @@ public class PadProdServiceImpl implements PadProdService {
PadDetailDTO padDetailDTO = new PadDetailDTO(); PadDetailDTO padDetailDTO = new PadDetailDTO();
padDetailDTO.setId(padProductCategory); padDetailDTO.setId(padProductCategory);
padDetailDTO.setPadLayoutId(padCategory.getPadLayoutId()); padDetailDTO.setPadLayoutId(padCategory.getPadLayoutId());
List<Long> productIds = padProductCategoryDetailMapper.selectListByQuery(new QueryWrapper().eq(PadProductCategoryDetail::getPadProductCategoryId, padProductCategory)).stream().map(PadProductCategoryDetail::getProductId).toList(); List<Long> productIds = padProductCategoryDetailMapper.selectListByQuery(new QueryWrapper()
.eq(PadProductCategoryDetail::getPadProductCategoryId, padProductCategory)).stream().map(PadProductCategoryDetail::getProductId).toList();
padDetailDTO.setProductIdList(productIds); padDetailDTO.setProductIdList(productIds);
if (!productIds.isEmpty()) { if (!productIds.isEmpty()) {
List<ProductVO> products = productRpcService.listAndLowPrice(shopId, productIds); List<ProductVO> products = productRpcService.listAndLowPrice(shopId, productIds);

47
cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml
View File

@@ -6,22 +6,39 @@
<select id="selectPageByKeyAndShopId" resultType="com.czg.account.dto.pad.PadProductCategoryDTO"> <select id="selectPageByKeyAndShopId" resultType="com.czg.account.dto.pad.PadProductCategoryDTO">
SELECT tb_pad_product_category.id, SELECT tb_pad_product_category.id,
tb_shop_prod_category.`name` AS productCategoryName, tb_shop_prod_category.id AS productCategoryId,
GROUP_CONCAT(tb_product.NAME) AS productNames, tb_shop_prod_category.`name` AS productCategoryName,
tb_pad_layout.code AS padLayoutCode, tb_pad_layout.code AS padLayoutCode,
tb_pad_layout.NAME AS padLayoutName tb_pad_layout.NAME AS padLayoutName
FROM tb_pad_product_category FROM tb_pad_product_category
LEFT JOIN tb_pad_product_category_detail LEFT JOIN tb_shop_prod_category ON tb_pad_product_category.product_category_id = tb_shop_prod_category.id and tb_shop_prod_category.shop_id=#{shopId}
ON tb_pad_product_category.id = tb_pad_product_category_detail.pad_product_category_id
LEFT JOIN tb_shop_prod_category LEFT JOIN tb_pad_layout ON tb_pad_product_category.pad_layout_id = tb_pad_layout.id
ON tb_pad_product_category.product_category_id = tb_shop_prod_category.id where tb_pad_product_category.shop_id=#{shopId}
LEFT JOIN tb_product ON tb_pad_product_category_detail.product_id = tb_product.id <if test="categoryId != null">
LEFT JOIN tb_pad_layout ON tb_pad_product_category.pad_layout_id = tb_pad_layout.id and tb_pad_product_category.product_category_id=#{categoryId}
where tb_pad_product_category.shop_id=#{shopId} </if>
<if test="categoryId != null"> group by tb_pad_product_category.id,tb_pad_product_category.sort
and tb_pad_product_category.product_category_id=#{categoryId} order by tb_pad_product_category.sort desc
</if> </select>
group by tb_pad_product_category.id
<select id="selectPageByKeyAndShopId1" resultType="com.czg.account.dto.pad.PadProductCategoryDTO">
SELECT tb_pad_product_category.id,
tb_shop_prod_category.id AS productCategoryId,
tb_shop_prod_category.`name` AS productCategoryName,
# GROUP_CONCAT(tb_product.NAME) AS productNames,
tb_pad_layout.code AS padLayoutCode,
tb_pad_layout.NAME AS padLayoutName
FROM tb_pad_product_category
# LEFT JOIN tb_pad_product_category_detail ON tb_pad_product_category.id = tb_pad_product_category_detail.pad_product_category_id
LEFT JOIN tb_shop_prod_category ON tb_pad_product_category.product_category_id = tb_shop_prod_category.id and tb_shop_prod_category.shop_id=#{shopId}
# LEFT JOIN tb_product ON tb_pad_product_category_detail.product_id = tb_product.id
LEFT JOIN tb_pad_layout ON tb_pad_product_category.pad_layout_id = tb_pad_layout.id
where tb_pad_product_category.shop_id=#{shopId}
<if test="categoryId != null">
and tb_pad_product_category.product_category_id=#{categoryId}
</if>
group by tb_pad_product_category.id,tb_pad_product_category.sort
order by tb_pad_product_category.sort desc order by tb_pad_product_category.sort desc
</select> </select>