From 8f1b8cb52770e736e3aa0d138757a403c83cbf9d Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 12 Mar 2025 16:21:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=95=86=E9=85=8D=E7=BD=AE=E7=9A=84=E6=8F=90=E7=8E=B0=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PileMerchantInfoServiceImpl.java     |  2 +-
 .../mapper/pile/PileMerchantInfoMapper.xml    | 58 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
index 2fe11aa91..fd3d27801 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
@@ -647,7 +647,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
 		if (pileMerchantInfo != null) {
 			MerchantWithdrawalTypeVO merchantWithdrawalTypeVO = new MerchantWithdrawalTypeVO();
 			merchantWithdrawalTypeVO.setMerchantId(pileMerchantInfo.getId() + "");
-			merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getDelayMode());
+			merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getWithdrawalType());
 			merchantWithdrawalTypeVO.setReservedAmount(pileMerchantInfo.getReservedAmount());
 			return merchantWithdrawalTypeVO;
 		}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
index f1477202e..aa4985322 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
@@ -29,14 +29,14 @@
   </resultMap>
   <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, 
-    alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by, 
+    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,
+    alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by,
     update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
-    select 
+    select
     <include refid="Base_Column_List" />
     from pile_merchant_info
     where id = #{id,jdbcType=INTEGER}
@@ -525,19 +525,19 @@
   <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
     <!--@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, 
-      alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by, 
+    (merchant_name, merchant_level, parent_id, address, dept_id, `status`, delay_mode,
+      organization_code, manager_name, manager_phone, service_phone, logo_url, app_id,
+      alipay_app_id, withdrawal_type, reserved_amount, create_by, create_time, update_by,
       update_time, del_flag)
     values
     <foreach collection="list" item="item" separator=",">
-      (#{item.merchantName,jdbcType=VARCHAR}, #{item.merchantLevel,jdbcType=VARCHAR}, #{item.parentId,jdbcType=VARCHAR}, 
-        #{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.withdrawalType,jdbcType=VARCHAR}, #{item.reservedAmount,jdbcType=DECIMAL}, 
-        #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, 
+      (#{item.merchantName,jdbcType=VARCHAR}, #{item.merchantLevel,jdbcType=VARCHAR}, #{item.parentId,jdbcType=VARCHAR},
+        #{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.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})
     </foreach>
   </insert>
@@ -597,7 +597,7 @@
       #{updateTime,jdbcType=TIMESTAMP},
       #{delFlag,jdbcType=CHAR},
     </trim>
-    on duplicate key update 
+    on duplicate key update
     <trim suffixOverrides=",">
       <if test="id != null">
         id = #{id,jdbcType=INTEGER},
@@ -765,7 +765,7 @@
         #{delFlag,jdbcType=CHAR},
       </if>
     </trim>
-    on duplicate key update 
+    on duplicate key update
     <trim suffixOverrides=",">
       <if test="id != null">
         id = #{id,jdbcType=INTEGER},
@@ -835,7 +835,7 @@
       </if>
     </trim>
   </insert>
-    <resultMap id="PileMerchantInfoResult" type="com.jsowell.pile.domain.PileMerchantInfo">
+    <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.PileMerchantInfo">
         <result column="id" property="id" />
         <result column="merchant_name" property="merchantName" />
         <result column="merchant_level" property="merchantLevel" />
@@ -864,7 +864,7 @@
         from pile_merchant_info
     </sql>
 
-    <select id="selectPileMerchantInfoList" parameterType="com.jsowell.pile.domain.PileMerchantInfo" resultMap="PileMerchantInfoResult">
+    <select id="selectPileMerchantInfoList" parameterType="com.jsowell.pile.domain.PileMerchantInfo" resultMap="BaseResultMap">
         <include refid="selectPileMerchantInfoVo" />
         <where>
             del_flag = '0'
@@ -905,17 +905,17 @@
         </where>
     </select>
 
-    <select id="selectPileMerchantInfoById" parameterType="Long" resultMap="PileMerchantInfoResult">
+    <select id="selectPileMerchantInfoById" parameterType="Long" resultMap="BaseResultMap">
         <include refid="selectPileMerchantInfoVo" />
         where id = #{id}
     </select>
 
 
-    <select id="selectPileMerchantInfoListByIdList" resultMap="PileMerchantInfoResult">
+    <select id="selectPileMerchantInfoListByIdList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from pile_merchant_info
-        where id in 
+        where id in
         <foreach close=")" collection="merchantIdList" item="merchantId" open="(" separator=",">
             #{merchantId,jdbcType=VARCHAR}
         </foreach>
@@ -1125,7 +1125,7 @@
         </foreach>
     </delete>
 
-    <select id="selectPileMerchantInfoByWxAppId" resultMap="PileMerchantInfoResult">
+    <select id="selectPileMerchantInfoByWxAppId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from pile_merchant_info
@@ -1149,7 +1149,7 @@
         </if>
     </select>
 
-    <select id="queryInfoByDeptId" resultMap="PileMerchantInfoResult">
+    <select id="queryInfoByDeptId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from pile_merchant_info
@@ -1157,7 +1157,7 @@
         and dept_id = #{deptId,jdbcType=VARCHAR}
     </select>
 
-    <select id="queryInfoListByIds" resultMap="PileMerchantInfoResult">
+    <select id="queryInfoListByIds" resultMap="BaseResultMap">
         select
             <include refid="Base_Column_List" />
         from
@@ -1171,7 +1171,7 @@
         </if>
     </select>
 
-    <select id="queryFirstLevelMerchantList" resultMap="PileMerchantInfoResult">
+    <select id="queryFirstLevelMerchantList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from
@@ -1180,7 +1180,7 @@
         and merchant_level = '1'
     </select>
 
-    <select id="getFirstLevelMerchantByWxAppId" resultMap="PileMerchantInfoResult">
+    <select id="getFirstLevelMerchantByWxAppId" resultMap="BaseResultMap">
         select
             <include refid="Base_Column_List" />
         from
@@ -1190,7 +1190,7 @@
         and app_id = #{wxAppId,jdbcType=VARCHAR}
     </select>
 
-    <select id="getFirstLevelMerchantByAlipayAppId" resultMap="PileMerchantInfoResult">
+    <select id="getFirstLevelMerchantByAlipayAppId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from
@@ -1248,7 +1248,7 @@
         </if>
     </select>
 
-    <select id="selectListByFirstMerchant" resultMap="PileMerchantInfoResult">
+    <select id="selectListByFirstMerchant" resultMap="BaseResultMap">
         select <include refid="Base_Column_List" />
         from pile_merchant_info
         where del_flag = '0'
@@ -1269,4 +1269,4 @@
           AND t1.id = #{stationId,jdbcType=VARCHAR}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>