qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.支付渠道--调整

Browse Source
This commit is contained in:
邱贞招 2024-09-14 16:11:35 +08:00
parent db628d6797
commit 2143506db9
1 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -26,12 +26,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="appName" column="app_name" />
<result property="balance" column="balance" />
<result property="appSecret" column="app_secret" />
<result property="merchantId" column="merchant_id" />
<result property="apiV3Key" column="api_v3_key" />
<result property="notifyUrl" column="notify_url" />
<result property="privateKeyPath" column="private_key_path" />
<result property="merchantSerialNumber" column="merchant_serial_number" />
<result property="refundNotifyUrl" column="refund_notify_url" />
<result property="appUserId" column="app_user_id" />
<result property="handlingChargeType" column="handling_charge_type" />
<result property="withdrawHandlingCharge" column="withdraw_handling_charge" />
@ -47,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.dept_id, d.parent_id, d.ancestors, d.dept_name,
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.app_user_id, d.handling_charge_type,withdraw_handling_charge,
d.create_by, d.create_time,d.collection_code, d.pay_channel
from sys_dept d
</sql>
@ -56,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT d.dept_id, d.parent_id, d.ancestors, d.dept_name,
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.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.collection_code, d.pay_channel
@ -103,7 +97,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.collection_code,d.pay_channel,
d.app_user_id,d.handling_charge_type,withdraw_handling_charge,d.collection_code,d.pay_channel,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}
@ -112,7 +106,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.collection_code,,d.pay_channel,
d.app_user_id,d.handling_charge_type,withdraw_handling_charge,d.collection_code,,d.pay_channel,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.app_user_id = #{appUserId}
@ -177,12 +171,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="appid != null and appid != ''">appid,</if>
<if test="appName != null and appName != ''">app_name,</if>
<if test="appSecret != null and appSecret != ''">app_secret,</if>
<if test="merchantId != null and merchantId != ''">merchant_id,</if>
<if test="apiV3Key != null and apiV3Key != ''">api_v3_key,</if>
<if test="notifyUrl != null and notifyUrl != ''">notify_url,</if>
<if test="privateKeyPath != null and privateKeyPath != ''">private_key_path,</if>
<if test="merchantSerialNumber != null and merchantSerialNumber != ''">merchant_serial_number,</if>
<if test="refundNotifyUrl != null and refundNotifyUrl != ''">refund_notify_url,</if>
<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>
@ -202,19 +190,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="platformServiceFee != null and platformServiceFee != ''">#{platformServiceFee},</if>
<if test="handlingCharge != null and handlingCharge != ''">#{handlingCharge},</if>
<!-- <if test="isProfitSharing != null and isProfitSharing != ''">#{isProfitSharing},</if>-->
<if test="separateAccount != null and separateAccount != ''">#{separateAccount},</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">#{isUsePlatformApp},</if>
<if test="domain != null and domain != ''">#{domain},</if>
<if test="appid != null and appid != ''">#{appid},</if>
<if test="appName != null and appName != ''">#{appName},</if>
<if test="appSecret != null and appSecret != ''">#{appSecret},</if>
<if test="merchantId != null and merchantId != ''">#{merchantId},</if>
<if test="apiV3Key != null and apiV3Key != ''">#{apiV3Key},</if>
<if test="notifyUrl != null and notifyUrl != ''">#{notifyUrl},</if>
<if test="privateKeyPath != null and privateKeyPath != ''">#{privateKeyPath},</if>
<if test="merchantSerialNumber != null and merchantSerialNumber != ''">#{merchantSerialNumber},</if>
<if test="refundNotifyUrl != null and refundNotifyUrl != ''">#{refundNotifyUrl},</if>
<if test="appUserId != null and appUserId != ''">#{appUserId},</if>
<if test="handlingChargeType != null and handlingChargeType != ''">#{handlingChargeType},</if>
<if test="withdrawHandlingCharge != null and withdrawHandlingCharge != ''">#{withdrawHandlingCharge},</if>
@ -245,12 +226,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="appid != null and appid != ''">appid = #{appid},</if>
<if test="appName != null and appName != ''">app_name = #{appName},</if>
<if test="appSecret != null and appSecret != ''">app_secret = #{appSecret},</if>
<if test="merchantId != null and merchantId != ''">merchant_id = #{merchantId},</if>
<if test="apiV3Key != null and apiV3Key != ''">api_v3_key = #{apiV3Key},</if>
<if test="notifyUrl != null and notifyUrl != ''">notify_url = #{notifyUrl},</if>
<if test="privateKeyPath != null and privateKeyPath != ''">private_key_path = #{privateKeyPath},</if>
<if test="merchantSerialNumber != null and merchantSerialNumber != ''">merchant_serial_number = #{merchantSerialNumber},</if>
<if test="refundNotifyUrl != null and refundNotifyUrl != ''">refund_notify_url = #{refundNotifyUrl},</if>
<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>