Merge branch 'dev-g' into dev

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.math.BigDecimal;
+
 /**
  * 充电桩运营商信息对象 pile_merchant_info
  *
@@ -100,6 +102,16 @@ public class PileMerchantInfo extends BaseEntity {
 	 */
 	private String deptId;
 
+    /**
+     * 提现类型(1-手动提现, 2-自动提现)
+     */
+    private String withdrawalType;
+
+    /**
+     * 预留金额
+     */
+    private BigDecimal reservedAmount;
+
 	/**
 	 * 删除标识（0-正常；1-删除）
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java

@@ -1,32 +1,44 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.PileMerchantInfo;
+
+import java.util.List;
+
 import com.jsowell.pile.dto.QueryMerchantInfoDTO;
 import com.jsowell.pile.vo.web.MerchantSettleInfoVO;
 import com.jsowell.pile.vo.web.PileMerchantInfoVO;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
-/**
- * 充电桩运营商信息Mapper接口
- *
- * @author jsowell
- * @date 2022-08-27
- */
-@Repository
 public interface PileMerchantInfoMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(PileMerchantInfo record);
+
+    PileMerchantInfo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(PileMerchantInfo record);
+
+    int updateBatch(List<PileMerchantInfo> list);
+
+    int updateBatchSelective(List<PileMerchantInfo> list);
+
+    int batchInsert(@Param("list") List<PileMerchantInfo> list);
+
+    int insertOrUpdate(PileMerchantInfo record);
+
+    int insertOrUpdateSelective(PileMerchantInfo record);
+
     /**
      * 查询充电桩运营商信息
      *
      * @param id 充电桩运营商信息主键
      * @return 充电桩运营商信息
      */
-	public PileMerchantInfo selectPileMerchantInfoById(Long id);
+    PileMerchantInfo selectPileMerchantInfoById(Long id);
 
     /**
      * 查询运营商列表
+     *
      * @param merchantIdList
      * @return
      */
@@ -34,6 +46,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 通过appid查询充电桩运营商信息
+     *
      * @param appId
      * @return
      */
@@ -45,7 +58,7 @@ public interface PileMerchantInfoMapper {
      * @param pileMerchantInfo 充电桩运营商信息
      * @return 充电桩运营商信息集合
      */
-	public List<PileMerchantInfo> selectPileMerchantInfoList(PileMerchantInfo pileMerchantInfo);
+    List<PileMerchantInfo> selectPileMerchantInfoList(PileMerchantInfo pileMerchantInfo);
 
     /**
      * 新增充电桩运营商信息
@@ -53,7 +66,7 @@ public interface PileMerchantInfoMapper {
      * @param pileMerchantInfo 充电桩运营商信息
      * @return 结果
      */
-	public int insertPileMerchantInfo(PileMerchantInfo pileMerchantInfo);
+    int insertPileMerchantInfo(PileMerchantInfo pileMerchantInfo);
 
     /**
      * 修改充电桩运营商信息
@@ -61,7 +74,7 @@ public interface PileMerchantInfoMapper {
      * @param pileMerchantInfo 充电桩运营商信息
      * @return 结果
      */
-	public int updatePileMerchantInfo(PileMerchantInfo pileMerchantInfo);
+    int updatePileMerchantInfo(PileMerchantInfo pileMerchantInfo);
 
     /**
      * 删除充电桩运营商信息
@@ -69,7 +82,7 @@ public interface PileMerchantInfoMapper {
      * @param id 充电桩运营商信息主键
      * @return 结果
      */
-	public int deletePileMerchantInfoById(Long id);
+    int deletePileMerchantInfoById(Long id);
 
     /**
      * 批量删除充电桩运营商信息
@@ -77,12 +90,13 @@ public interface PileMerchantInfoMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-	public int deletePileMerchantInfoByIds(Long[] ids);
+    int deletePileMerchantInfoByIds(Long[] ids);
 
     List<String> queryByMerchantDeptIds(@Param("merchantDeptIds") List<String> merchantDeptIds);
 
     /**
      * 根据部门id查询基本信息
+     *
      * @param deptId
      * @return
      */
@@ -90,6 +104,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 通过ids查询信息列表
+     *
      * @param deptIds
      * @return
      */
@@ -102,6 +117,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 根据appid查询对应一级运营商id
+     *
      * @param wxAppId
      * @return
      */
@@ -109,6 +125,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 根据支付宝appid查询对应一级运营商id
+     *
      * @param alipayAppId
      * @return
      */
@@ -116,6 +133,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 通过appid查询运营商部门id
+     *
      * @param appId
      * @return
      */
@@ -123,6 +141,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 后管财务中心页面运营商列表
+     *
      * @param dto
      * @return
      */
@@ -130,6 +149,7 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 根据一级运营商id查询自身信息以及下属二级运营商信息
+     *
      * @param firstMerchantId 一级运营商id
      * @return
      */
@@ -137,9 +157,9 @@ public interface PileMerchantInfoMapper {
 
     /**
      * 根据站点id查询运营商基本信息
+     *
      * @param stationId
      * @return
      */
     PileMerchantInfoVO queryMerchantInfoByStationId(String stationId);
-
 }

jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml

@@ -1,38 +1,559 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsowell.pile.mapper.PileMerchantInfoMapper">
-    <resultMap type="com.jsowell.pile.domain.PileMerchantInfo" id="PileMerchantInfoResult">
-        <result property="id" column="id"/>
-        <result property="merchantName" column="merchant_name"/>
-        <result property="merchantLevel" column="merchant_level"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="address" column="address"/>
-        <result property="status" column="status"/>
-        <result property="delayMode" column="delay_mode"/>
-        <result property="organizationCode" column="organization_code"/>
-        <result property="managerName" column="manager_name"/>
-        <result property="managerPhone" column="manager_phone"/>
-        <result property="servicePhone" column="service_phone"/>
-        <result property="logoUrl" column="logo_url"/>
-        <result property="appId" column="app_id"/>
-        <result property="alipayAppId" column="alipay_app_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
+  <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.PileMerchantInfo">
+    <!--@mbg.generated-->
+    <!--@Table pile_merchant_info-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
+    <result column="merchant_level" jdbcType="VARCHAR" property="merchantLevel" />
+    <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="dept_id" jdbcType="VARCHAR" property="deptId" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="delay_mode" jdbcType="VARCHAR" property="delayMode" />
+    <result column="organization_code" jdbcType="VARCHAR" property="organizationCode" />
+    <result column="manager_name" jdbcType="VARCHAR" property="managerName" />
+    <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="app_id" jdbcType="VARCHAR" property="appId" />
+    <result column="alipay_app_id" jdbcType="VARCHAR" property="alipayAppId" />
+    <result column="withdrawal_type" jdbcType="VARCHAR" property="withdrawalType" />
+    <result column="reserved_amount" jdbcType="DECIMAL" property="reservedAmount" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="del_flag" jdbcType="CHAR" property="delFlag" />
   </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, 
+    update_time, del_flag
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from pile_merchant_info
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from pile_merchant_info
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.PileMerchantInfo" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into pile_merchant_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="merchantName != null">
+        merchant_name,
+      </if>
+      <if test="merchantLevel != null">
+        merchant_level,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="deptId != null">
+        dept_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="delayMode != null">
+        delay_mode,
+      </if>
+      <if test="organizationCode != null">
+        organization_code,
+      </if>
+      <if test="managerName != null">
+        manager_name,
+      </if>
+      <if test="managerPhone != null">
+        manager_phone,
+      </if>
+      <if test="servicePhone != null">
+        service_phone,
+      </if>
+      <if test="logoUrl != null">
+        logo_url,
+      </if>
+      <if test="appId != null">
+        app_id,
+      </if>
+      <if test="alipayAppId != null">
+        alipay_app_id,
+      </if>
+      <if test="withdrawalType != null">
+        withdrawal_type,
+      </if>
+      <if test="reservedAmount != null">
+        reserved_amount,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="merchantName != null">
+        #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantLevel != null">
+        #{merchantLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="deptId != null">
+        #{deptId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="delayMode != null">
+        #{delayMode,jdbcType=VARCHAR},
+      </if>
+      <if test="organizationCode != null">
+        #{organizationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        #{managerName,jdbcType=VARCHAR},
+      </if>
+      <if test="managerPhone != null">
+        #{managerPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="servicePhone != null">
+        #{servicePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="logoUrl != null">
+        #{logoUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="appId != null">
+        #{appId,jdbcType=VARCHAR},
+      </if>
+      <if test="alipayAppId != null">
+        #{alipayAppId,jdbcType=VARCHAR},
+      </if>
+      <if test="withdrawalType != null">
+        #{withdrawalType,jdbcType=VARCHAR},
+      </if>
+      <if test="reservedAmount != null">
+        #{reservedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=CHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.PileMerchantInfo">
+    <!--@mbg.generated-->
+    update pile_merchant_info
+    <set>
+      <if test="merchantName != null">
+        merchant_name = #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantLevel != null">
+        merchant_level = #{merchantLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="deptId != null">
+        dept_id = #{deptId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=CHAR},
+      </if>
+      <if test="delayMode != null">
+        delay_mode = #{delayMode,jdbcType=VARCHAR},
+      </if>
+      <if test="organizationCode != null">
+        organization_code = #{organizationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        manager_name = #{managerName,jdbcType=VARCHAR},
+      </if>
+      <if test="managerPhone != null">
+        manager_phone = #{managerPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="servicePhone != null">
+        service_phone = #{servicePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="logoUrl != null">
+        logo_url = #{logoUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="appId != null">
+        app_id = #{appId,jdbcType=VARCHAR},
+      </if>
+      <if test="alipayAppId != null">
+        alipay_app_id = #{alipayAppId,jdbcType=VARCHAR},
+      </if>
+      <if test="withdrawalType != null">
+        withdrawal_type = #{withdrawalType,jdbcType=VARCHAR},
+      </if>
+      <if test="reservedAmount != null">
+        reserved_amount = #{reservedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=CHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update pile_merchant_info
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="merchant_name = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.merchantName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="merchant_level = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.merchantLevel,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="parent_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.parentId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="address = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.address,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="dept_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.deptId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="`status` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.status,jdbcType=CHAR}
+        </foreach>
+      </trim>
+      <trim prefix="delay_mode = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.delayMode,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="organization_code = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.organizationCode,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="manager_name = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.managerName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="manager_phone = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.managerPhone,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="service_phone = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.servicePhone,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="logo_url = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.logoUrl,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}
+        </foreach>
+      </trim>
+      <trim prefix="alipay_app_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.alipayAppId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="withdrawal_type = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.withdrawalType,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="reserved_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.reservedAmount,jdbcType=DECIMAL}
+        </foreach>
+      </trim>
+      <trim prefix="create_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="create_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="update_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="update_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="del_flag = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR}
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=INTEGER}
+    </foreach>
+  </update>
+  <update id="updateBatchSelective" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update pile_merchant_info
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="merchant_name = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.merchantName != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.merchantName,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="merchant_level = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.merchantLevel != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.merchantLevel,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="parent_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.parentId != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.parentId,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="address = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.address != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.address,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="dept_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.deptId != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.deptId,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="`status` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.status != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.status,jdbcType=CHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="delay_mode = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.delayMode != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.delayMode,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="organization_code = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.organizationCode != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.organizationCode,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="manager_name = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.managerName != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.managerName,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="manager_phone = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.managerPhone != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.managerPhone,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="service_phone = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.servicePhone != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.servicePhone,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="logo_url = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.logoUrl != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.logoUrl,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="app_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.appId != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.appId,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="alipay_app_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.alipayAppId != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.alipayAppId,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="withdrawal_type = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.withdrawalType != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.withdrawalType,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="reserved_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.reservedAmount != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.reservedAmount,jdbcType=DECIMAL}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="create_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.createBy != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="create_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.createTime != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="update_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.updateBy != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="update_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.updateTime != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="del_flag = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.delFlag != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR}
+          </if>
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=INTEGER}
+    </foreach>
+  </update>
+  <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, 
+      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.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.PileMerchantInfo" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into pile_merchant_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         id,
+      </if>
       merchant_name,
       merchant_level,
       parent_id,
       address,
-        status,
+      dept_id,
+      `status`,
       delay_mode,
       organization_code,
       manager_name,
@@ -41,13 +562,301 @@
       logo_url,
       app_id,
       alipay_app_id,
-        dept_id,
+      withdrawal_type,
+      reserved_amount,
       create_by,
       create_time,
       update_by,
       update_time,
-        del_flag
-    </sql>
+      del_flag,
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      #{merchantName,jdbcType=VARCHAR},
+      #{merchantLevel,jdbcType=VARCHAR},
+      #{parentId,jdbcType=VARCHAR},
+      #{address,jdbcType=VARCHAR},
+      #{deptId,jdbcType=VARCHAR},
+      #{status,jdbcType=CHAR},
+      #{delayMode,jdbcType=VARCHAR},
+      #{organizationCode,jdbcType=VARCHAR},
+      #{managerName,jdbcType=VARCHAR},
+      #{managerPhone,jdbcType=VARCHAR},
+      #{servicePhone,jdbcType=VARCHAR},
+      #{logoUrl,jdbcType=VARCHAR},
+      #{appId,jdbcType=VARCHAR},
+      #{alipayAppId,jdbcType=VARCHAR},
+      #{withdrawalType,jdbcType=VARCHAR},
+      #{reservedAmount,jdbcType=DECIMAL},
+      #{createBy,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP},
+      #{updateBy,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP},
+      #{delFlag,jdbcType=CHAR},
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=INTEGER},
+      </if>
+      merchant_name = #{merchantName,jdbcType=VARCHAR},
+      merchant_level = #{merchantLevel,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      dept_id = #{deptId,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=CHAR},
+      delay_mode = #{delayMode,jdbcType=VARCHAR},
+      organization_code = #{organizationCode,jdbcType=VARCHAR},
+      manager_name = #{managerName,jdbcType=VARCHAR},
+      manager_phone = #{managerPhone,jdbcType=VARCHAR},
+      service_phone = #{servicePhone,jdbcType=VARCHAR},
+      logo_url = #{logoUrl,jdbcType=VARCHAR},
+      app_id = #{appId,jdbcType=VARCHAR},
+      alipay_app_id = #{alipayAppId,jdbcType=VARCHAR},
+      withdrawal_type = #{withdrawalType,jdbcType=VARCHAR},
+      reserved_amount = #{reservedAmount,jdbcType=DECIMAL},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      del_flag = #{delFlag,jdbcType=CHAR},
+    </trim>
+  </insert>
+  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.PileMerchantInfo" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into pile_merchant_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="merchantName != null">
+        merchant_name,
+      </if>
+      <if test="merchantLevel != null">
+        merchant_level,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="deptId != null">
+        dept_id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="delayMode != null">
+        delay_mode,
+      </if>
+      <if test="organizationCode != null">
+        organization_code,
+      </if>
+      <if test="managerName != null">
+        manager_name,
+      </if>
+      <if test="managerPhone != null">
+        manager_phone,
+      </if>
+      <if test="servicePhone != null">
+        service_phone,
+      </if>
+      <if test="logoUrl != null">
+        logo_url,
+      </if>
+      <if test="appId != null">
+        app_id,
+      </if>
+      <if test="alipayAppId != null">
+        alipay_app_id,
+      </if>
+      <if test="withdrawalType != null">
+        withdrawal_type,
+      </if>
+      <if test="reservedAmount != null">
+        reserved_amount,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="merchantName != null">
+        #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantLevel != null">
+        #{merchantLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="deptId != null">
+        #{deptId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="delayMode != null">
+        #{delayMode,jdbcType=VARCHAR},
+      </if>
+      <if test="organizationCode != null">
+        #{organizationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        #{managerName,jdbcType=VARCHAR},
+      </if>
+      <if test="managerPhone != null">
+        #{managerPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="servicePhone != null">
+        #{servicePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="logoUrl != null">
+        #{logoUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="appId != null">
+        #{appId,jdbcType=VARCHAR},
+      </if>
+      <if test="alipayAppId != null">
+        #{alipayAppId,jdbcType=VARCHAR},
+      </if>
+      <if test="withdrawalType != null">
+        #{withdrawalType,jdbcType=VARCHAR},
+      </if>
+      <if test="reservedAmount != null">
+        #{reservedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=CHAR},
+      </if>
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=INTEGER},
+      </if>
+      <if test="merchantName != null">
+        merchant_name = #{merchantName,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantLevel != null">
+        merchant_level = #{merchantLevel,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="deptId != null">
+        dept_id = #{deptId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=CHAR},
+      </if>
+      <if test="delayMode != null">
+        delay_mode = #{delayMode,jdbcType=VARCHAR},
+      </if>
+      <if test="organizationCode != null">
+        organization_code = #{organizationCode,jdbcType=VARCHAR},
+      </if>
+      <if test="managerName != null">
+        manager_name = #{managerName,jdbcType=VARCHAR},
+      </if>
+      <if test="managerPhone != null">
+        manager_phone = #{managerPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="servicePhone != null">
+        service_phone = #{servicePhone,jdbcType=VARCHAR},
+      </if>
+      <if test="logoUrl != null">
+        logo_url = #{logoUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="appId != null">
+        app_id = #{appId,jdbcType=VARCHAR},
+      </if>
+      <if test="alipayAppId != null">
+        alipay_app_id = #{alipayAppId,jdbcType=VARCHAR},
+      </if>
+      <if test="withdrawalType != null">
+        withdrawal_type = #{withdrawalType,jdbcType=VARCHAR},
+      </if>
+      <if test="reservedAmount != null">
+        reserved_amount = #{reservedAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=CHAR},
+      </if>
+    </trim>
+  </insert>
+    <resultMap id="PileMerchantInfoResult" type="com.jsowell.pile.domain.PileMerchantInfo">
+        <result column="id" property="id" />
+        <result column="merchant_name" property="merchantName" />
+        <result column="merchant_level" property="merchantLevel" />
+        <result column="parent_id" property="parentId" />
+        <result column="address" property="address" />
+        <result column="status" property="status" />
+        <result column="delay_mode" property="delayMode" />
+        <result column="organization_code" property="organizationCode" />
+        <result column="manager_name" property="managerName" />
+        <result column="manager_phone" property="managerPhone" />
+        <result column="service_phone" property="servicePhone" />
+        <result column="logo_url" property="logoUrl" />
+        <result column="app_id" property="appId" />
+        <result column="alipay_app_id" property="alipayAppId" />
+        <result column="dept_id" property="deptId" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+    </resultMap>
 
     <sql id="selectPileMerchantInfoVo">
         select
@@ -55,8 +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="PileMerchantInfoResult">
         <include refid="selectPileMerchantInfoVo" />
         <where>
             del_flag = '0'
@@ -90,7 +898,7 @@
             <!-- 数据范围过滤 -->
             <if test="merchantDeptIds != null and merchantDeptIds.size() != 0">
                 and dept_id in
-                <foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")">
+                <foreach close=")" collection="merchantDeptIds" item="merchantDeptId" open="(" separator=",">
                     #{merchantDeptId}
                 </foreach>
             </if>
@@ -108,7 +916,7 @@
         <include refid="Base_Column_List" />
         from pile_merchant_info
         where id in 
-        <foreach collection="merchantIdList" item="merchantId" open="(" separator="," close=")">
+        <foreach close=")" collection="merchantIdList" item="merchantId" open="(" separator=",">
             #{merchantId,jdbcType=VARCHAR}
         </foreach>
     </select>
@@ -312,7 +1120,7 @@
         update pile_merchant_info
         set del_flag = '1'
         where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
+        <foreach close=")" collection="array" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -335,7 +1143,7 @@
             t1.del_flag = '0'
         <if test="merchantDeptIds != null and merchantDeptIds.size() != 0">
           AND t1.dept_id IN
-        <foreach collection="merchantDeptIds" item="item" open="(" separator="," close=")">
+        <foreach close=")" collection="merchantDeptIds" item="item" open="(" separator=",">
             #{item,jdbcType=VARCHAR}
         </foreach>
         </if>
@@ -357,7 +1165,7 @@
         where del_flag = '0'
         <if test="deptIds != null and deptIds.size() != 0">
             and dept_id in
-            <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
+            <foreach close=")" collection="deptIds" item="deptId" open="(" separator=",">
                 #{deptId,jdbcType=VARCHAR}
             </foreach>
         </if>
@@ -422,7 +1230,7 @@
         where t1.del_flag = '0'
         <if test="dto.deptIds != null and dto.deptIds.size() != 0">
             and t1.dept_id in
-            <foreach collection="dto.deptIds" item="deptId" open="(" separator="," close=")">
+            <foreach close=")" collection="dto.deptIds" item="deptId" open="(" separator=",">
                 #{deptId,jdbcType=VARCHAR}
             </foreach>
         </if>