autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-zza' into dev

Browse Source
This commit is contained in:
Lemon
2025-06-10 15:18:32 +08:00
parent 7981813dbc cd281124b7
commit c1b67f105f
3 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
View File

@@ -17,6 +17,7 @@
<result column="manager_phone" jdbcType="VARCHAR" property="managerPhone" />
<result column="service_phone" jdbcType="VARCHAR" property="servicePhone" />
<result column="logo_url" jdbcType="VARCHAR" property="logoUrl" />
<result column="business_license_url" jdbcType="VARCHAR" property="businessLicenseUrl" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="alipay_app_id" jdbcType="VARCHAR" property="alipayAppId" />
<result column="withdrawal_type" jdbcType="VARCHAR" property="withdrawalType" />
@@ -30,7 +31,7 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode,
organization_code, manager_name, manager_phone, service_phone, logo_url, app_id,
organization_code, manager_name, manager_phone, service_phone, logo_url, business_license_url, app_id,
alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by,
update_time, del_flag
</sql>
@@ -86,6 +87,9 @@
<if test="logoUrl != null">
logo_url,
</if>
<if test="businessLicenseUrl != null">
business_license_url,
</if>
<if test="appId != null">
app_id,
</if>
@@ -151,6 +155,9 @@
<if test="logoUrl != null">
#{logoUrl,jdbcType=VARCHAR},
</if>
<if test="businessLicenseUrl != null">
#{businessLicenseUrl,jdbcType=VARCHAR},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
@@ -220,6 +227,9 @@
<if test="logoUrl != null">
logo_url = #{logoUrl,jdbcType=VARCHAR},
</if>
<if test="businessLicenseUrl != null">
business_license_url = #{businessLicenseUrl,jdbcType=VARCHAR},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
@@ -314,6 +324,11 @@
when id = #{item.id,jdbcType=INTEGER} then #{item.logoUrl,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="business_license_url = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.businessLicenseUrl,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="app_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.appId,jdbcType=VARCHAR}
@@ -453,6 +468,13 @@
</if>
</foreach>
</trim>
<trim prefix="business_license_url = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.businessLicenseUrl != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.businessLicenseUrl,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="app_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.appId != null">
@@ -526,7 +548,7 @@
<!--@mbg.generated-->
insert into pile_merchant_info
(merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode,
organization_code, manager_name, manager_phone, service_phone, logo_url, app_id,
organization_code, manager_name, manager_phone, service_phone, logo_url, business_license_url, app_id,
alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by,
update_time, del_flag)
values
@@ -535,7 +557,7 @@
#{item.address,jdbcType=VARCHAR}, #{item.deptId,jdbcType=VARCHAR}, #{item.status,jdbcType=CHAR},
#{item.delayMode,jdbcType=VARCHAR}, #{item.organizationCode,jdbcType=VARCHAR},
#{item.managerName,jdbcType=VARCHAR}, #{item.managerPhone,jdbcType=VARCHAR}, #{item.servicePhone,jdbcType=VARCHAR},
#{item.logoUrl,jdbcType=VARCHAR}, #{item.appId,jdbcType=VARCHAR}, #{item.alipayAppId,jdbcType=VARCHAR},
#{item.logoUrl,jdbcType=VARCHAR}, #{item.businessLicenseUrl,jdbcType=VARCHAR}, #{item.appId,jdbcType=VARCHAR}, #{item.alipayAppId,jdbcType=VARCHAR},
#{item.withdrawalType,jdbcType=VARCHAR}, #{item.reservedAmount,jdbcType=DECIMAL},
#{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
#{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR})
@@ -560,6 +582,7 @@
manager_phone,
service_phone,
logo_url,
business_license_url,
app_id,
alipay_app_id,
withdrawal_type,
@@ -587,6 +610,7 @@
#{managerPhone,jdbcType=VARCHAR},
#{servicePhone,jdbcType=VARCHAR},
#{logoUrl,jdbcType=VARCHAR},
#{businessLicenseUrl,jdbcType=VARCHAR},
#{appId,jdbcType=VARCHAR},
#{alipayAppId,jdbcType=VARCHAR},
#{withdrawalType,jdbcType=VARCHAR},
@@ -614,6 +638,7 @@
manager_phone = #{managerPhone,jdbcType=VARCHAR},
service_phone = #{servicePhone,jdbcType=VARCHAR},
logo_url = #{logoUrl,jdbcType=VARCHAR},
business_license_url = #{businessLicenseUrl,jdbcType=VARCHAR},
app_id = #{appId,jdbcType=VARCHAR},
alipay_app_id = #{alipayAppId,jdbcType=VARCHAR},
withdrawal_type = #{withdrawalType,jdbcType=VARCHAR},
@@ -668,6 +693,9 @@
<if test="logoUrl != null">
logo_url,
</if>
<if test="businessLicenseUrl != null">
business_license_url,
</if>
<if test="appId != null">
app_id,
</if>
@@ -737,6 +765,9 @@
<if test="logoUrl != null">
#{logoUrl,jdbcType=VARCHAR},
</if>
<if test="businessLicenseUrl != null">
#{businessLicenseUrl,jdbcType=VARCHAR},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
@@ -806,6 +837,9 @@
<if test="logoUrl != null">
logo_url = #{logoUrl,jdbcType=VARCHAR},
</if>
<if test="businessLicenseUrl != null">
business_license_url = #{businessLicenseUrl,jdbcType=VARCHAR},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
@@ -872,6 +906,9 @@
<if test="logoUrl != null and logoUrl != ''">
and logo_url = #{logoUrl}
</if>
<if test="businessLicenseUrl != null and businessLicenseUrl != ''">
and business_license_url = #{businessLicenseUrl}
</if>
<!-- 数据范围过滤 -->
<if test="merchantDeptIds != null and merchantDeptIds.size() != 0">
and dept_id in
@@ -937,6 +974,9 @@
<if test="logoUrl != null">
logo_url,
</if>
<if test="businessLicenseUrl != null">
business_license_url,
</if>
<if test="appId != null">
app_id,
</if>
@@ -999,6 +1039,9 @@
<if test="logoUrl != null">
#{logoUrl},
</if>
<if test="businessLicenseUrl != null">
#{businessLicenseUrl},
</if>
<if test="appId != null">
#{appId},
</if>
@@ -1062,6 +1105,9 @@
<if test="logoUrl != null">
logo_url = #{logoUrl},
</if>
<if test="businessLicenseUrl != null">
business_license_url = #{businessLicenseUrl},
</if>
<if test="appId != null">
app_id = #{appId},
</if>