From 7694fe894bfea8f249ce99cdb69366edddf116e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Mon, 29 Jul 2024 17:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/SysMenuMapper.xml | 47 ++++++++++++-------
 .../mch/MchTransactionBillController.java     | 34 ++++++++++++++
 2 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchTransactionBillController.java

diff --git a/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 6762007f..556ac3bd 100644
--- a/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -28,10 +28,10 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu
     </sql>
-    
+
     <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		<where>
@@ -47,13 +47,13 @@
 		</where>
 		order by parent_id, order_num
 	</select>
-	
+
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
@@ -72,9 +72,24 @@
 		</if>
 		order by m.parent_id, m.order_num
 	</select>
-    
+
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct
+		    m.menu_id,
+		    m.parent_id,
+		    m.menu_name,
+		    m.path,
+		    m.component,
+		    m.`query`,
+		    m.visible,
+		    m.status,
+		    ifnull(m.perms,'') as perms,
+		    m.is_frame,
+		    m.is_cache,
+		    m.menu_type,
+		    m.icon,
+		    m.order_num,
+		    m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -83,7 +98,7 @@
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuListByRoleId" resultType="Long">
 		select m.menu_id
 		from sys_menu m
@@ -94,7 +109,7 @@
             </if>
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuPerms" resultType="String">
 		select distinct m.perms
 		from sys_menu m
@@ -110,28 +125,28 @@
 			 left join sys_role r on r.role_id = ur.role_id
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
-	
+
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 		where m.status = '0' and rm.role_id = #{roleId}
 	</select>
-	
+
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_id = #{menuId}
 	</select>
-	
+
 	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id = #{menuId}  
+	    select count(1) from sys_menu where parent_id = #{menuId}
 	</select>
-	
+
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
 	</select>
-	
+
 	<update id="updateMenu" parameterType="SysMenu">
 		update sys_menu
 		<set>
@@ -194,9 +209,9 @@
 		sysdate()
 		)
 	</insert>
-	
+
 	<delete id="deleteMenuById" parameterType="Long">
 	    delete from sys_menu where menu_id = #{menuId}
 	</delete>
 
-</mapper> 
\ No newline at end of file
+</mapper>
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchTransactionBillController.java
new file mode 100644
index 00000000..8ded2a35
--- /dev/null
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchTransactionBillController.java
@@ -0,0 +1,34 @@
+package com.ruoyi.web.controller.mch;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.ss.transactionBill.domain.TransactionBillQuery;
+import com.ruoyi.ss.transactionBill.service.TransactionBillService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wjh
+ * 2024/7/29
+ */
+@RestController
+@RequestMapping("/mch/bill")
+public class MchTransactionBillController extends BaseController {
+
+    @Autowired
+    private TransactionBillService transactionBillService;
+
+    @ApiOperation("商户查询统计信息")
+    @GetMapping("/count")
+    public AjaxResult count(TransactionBillQuery query)
+    {
+        query.setMchId(getUserId());
+        return success(transactionBillService.selectCount(query));
+    }
+
+}
+