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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-11-14 15:09:45 +08:00
parent 1d3f9bdd46 fd8957d658
commit 069101a202
6 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 tb_pad_product_category.id,
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
tb_shop_prod_category.id AS productCategoryId,
tb_shop_prod_category.`name` AS productCategoryName,
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
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
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_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
</select>
<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
</select>