From 04990cb1bd146c01db95d0b48cd2bdf747a2715a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 16 Jun 2026 17:17:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E5=93=81=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java     | 2 ++
 .../hard/controller/order/HardCanteenTotalController.java  | 7 +++++++
 .../src/main/resources/mapper/order/HardCarMapper.xml      | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
index e246c21de..3e6103736 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
@@ -21,4 +21,6 @@ public class HardCarDto extends HardCarEntity {
 
     private Long merchantId;
 
+    private List<Long> mchIds;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java
index d80725199..852f8defd 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardCanteenTotalController.java
@@ -133,6 +133,13 @@ public class HardCanteenTotalController {
     @Operation(summary = "菜品出售商户统计", description = "菜品出售商户统计")
     @PostMapping("/proudct-mch-query")
     public R<Page<HardCarVo>> proudctMchQuery(@ParameterObject Page page, @RequestBody HardCarDto dto) {
+        // 查询商户
+        MchManageDto mchManageDto = new MchManageDto();
+        mchManageDto.setTypesList(List.of(MerchantTypeEnum.CANTEEN.getType()));
+        List<MchManageVo> mchList = remoteMchService.scopeList(mchManageDto).getData();
+        if (ObjectUtil.isNotEmpty(mchList) && ObjectUtil.isEmpty(dto.getMchIds())) {
+            dto.setMchIds(mchList.stream().map(MchManageVo::getId).toList());
+        }
         return R.ok(canteenTotalService.proudctMchQuery(page, dto));
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 7347db5a1..0cc339c64 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -261,6 +261,12 @@
             <if test="dto.productName != null and dto.productName != '' ">
                 and a.product_name LIKE concat('%',#{dto.productName},'%')
             </if>
+            <if test="dto.mchIds != null and dto.mchIds.size() != 0">
+                and o.merchant_id in
+                <foreach collection="dto.mchIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
         </where>
         group by o.merchant_id, a.product_id
         order by o.merchant_id, SUM(a.product_count) desc