From 55e6bb5e079a3eda145a544e53df6deddd91cbd0 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Fri, 2 Aug 2024 16:45:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=94=B6=E6=AC=BE=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/core/domain/entity/SysDept.java | 11 +++++++++++
 .../main/resources/mapper/system/SysDeptMapper.xml   | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index ca5b187..cf03f15 100644
--- a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -121,6 +121,17 @@ public class SysDept extends BaseEntity
     /** 提现手续费 */
     public String withdrawHandlingCharge;
 
+    /** 收款码 */
+    public String collectionCode;
+
+    public String getCollectionCode() {
+        return collectionCode;
+    }
+
+    public void setCollectionCode(String collectionCode) {
+        this.collectionCode = collectionCode;
+    }
+
     public String getWithdrawHandlingCharge() {
         return withdrawHandlingCharge;
     }
diff --git a/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml b/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 437e4e4..6205e91 100644
--- a/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="collectionCode" column="collection_code" />
 	</resultMap>
 
 	<sql id="selectDeptVo">
@@ -46,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.order_num, d.leader, d.phone, d.email, d.status,
                d.del_flag,d.platform_service_fee, d.handling_charge, d.is_profit_sharing, d.separate_account, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
                d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url, d.app_user_id, d.handling_charge_type,withdraw_handling_charge,
-               d.create_by, d.create_time
+               d.create_by, d.create_time,d.collection_code
         from sys_dept d
     </sql>
 
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path, d.merchant_serial_number, d.refund_notify_url, d.app_user_id,d.handling_charge_type,withdraw_handling_charge,
 		u.user_name AS userName,
 		GROUP_CONCAT(oa.area_name SEPARATOR ' | ') AS areaName,
-		d.create_by, d.create_time
+		d.create_by, d.create_time,d.collection_code
 		FROM sys_dept d
 		LEFT JOIN et_user u ON d.app_user_id = u.user_id
 		LEFT JOIN et_area_dept ad ON ad.dept_id = d.dept_id
@@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.handling_charge,
 		       d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,d.balance,d.separate_account,
-			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,withdraw_handling_charge,
+			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,withdraw_handling_charge,d.collection_code,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
@@ -110,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptByAppUserId" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.app_user_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.handling_charge,
 			   d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,d.balance,d.separate_account,
-			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,withdraw_handling_charge,
+			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,withdraw_handling_charge,d.collection_code,
 			   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.app_user_id = #{appUserId}
@@ -173,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    <if test="appUserId != null and appUserId != ''">app_user_id,</if>
 		    <if test="handlingChargeType != null and handlingChargeType != ''">handling_charge_type,</if>
 		    <if test="withdrawHandlingCharge != null and withdrawHandlingCharge != ''">withdraw_handling_charge,</if>
+		    <if test="collectionCode != null and collectionCode != ''">collection_code,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -203,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    <if test="appUserId != null and appUserId != ''">#{appUserId},</if>
 		    <if test="handlingChargeType != null and handlingChargeType != ''">#{handlingChargeType},</if>
 		    <if test="withdrawHandlingCharge != null and withdrawHandlingCharge != ''">#{withdrawHandlingCharge},</if>
+		    <if test="collectionCode != null and collectionCode != ''">#{collectionCode},</if>
  			sysdate()
  		)
 	</insert>
@@ -237,6 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="appUserId != null">app_user_id = #{appUserId},</if>
 			<if test="handlingChargeType != null">handling_charge_type = #{handlingChargeType},</if>
 			<if test="withdrawHandlingCharge != null">withdraw_handling_charge = #{withdrawHandlingCharge},</if>
+			<if test="collectionCode != null">collection_code = #{collectionCode},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}