汇付会员表加备注字段

jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java

@@ -50,7 +50,7 @@ public class TempController extends BaseController {
     private IMemberPlateNumberRelationService memberPlateNumberRelationService;
 
     @Autowired
-    private IAdapayMemberAccountService adapayMemberAccountService;
+    private AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     private AdapayService adapayMemberService;

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -109,7 +109,7 @@ public class OrderService {
     private IAdapayRefundRecordService adapayRefundRecordService;
 
     @Autowired
-    private IAdapayMemberAccountService adapayMemberAccountService;
+    private AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     private ClearingWithdrawInfoService clearingWithdrawInfoService;

jsowell-admin/src/main/java/com/jsowell/service/TempService.java

@@ -71,7 +71,7 @@ public class TempService {
     private ISettleOrderReportService settleOrderReportService;
 
     @Autowired
-    private IAdapayMemberAccountService adapayMemberAccountService;
+    private AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     private AdapayService adapayService;

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -123,7 +123,7 @@ public class SpringBootTestController {
     private YKCPushCommandService ykcPushCommandService;
 
     @Autowired
-    private IAdapayMemberAccountService adapayMemberAccountService;
+    private AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     private IPileMsgRecordService pileMsgRecordService;

jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java

@@ -67,7 +67,7 @@ public class AdapayService {
     private String ADAPAY_CALLBACK_URL;
 
     @Autowired
-    private IAdapayMemberAccountService adapayMemberAccountService;
+    private AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     private ClearingWithdrawInfoService clearingWithdrawInfoService;

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

@@ -1,68 +1,74 @@
 package com.jsowell.pile.domain;
 
-import com.jsowell.common.annotation.Excel;
+import java.util.Date;
-import com.jsowell.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * 【请填写功能名称】对象 adapay_member_account
+ * 汇付会员账户
- *
- * @author jsowell
- * @date 2023-06-15
  */
 @Getter
 @Setter
-public class AdapayMemberAccount extends BaseEntity {
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdapayMemberAccount {
     private static final long serialVersionUID = 1L;
-
     /**
      * 主键id
      */
-    private Long id;
+    private Integer id;
 
     /**
-     * 状态 0-待审核；1-审核通过
+     * 状态（0-待审核；1-审核通过；2-创建失败）
      */
     private String status;
 
     /**
      * 运营商id
      */
-    @Excel(name = "运营商id")
     private String merchantId;
 
     /**
      * 汇付会员id
      */
-    @Excel(name = "汇付会员id")
     private String adapayMemberId;
 
     /**
      * 汇付结算账户id
      */
-    @Excel(name = "汇付结算账户id")
     private String settleAccountId;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
     /**
      * 删除标识（0-正常；1-删除）
      */
     private String delFlag;
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
-                .append("id", getId())
-                .append("merchantId", getMerchantId())
-                .append("adapayMemberId", getAdapayMemberId())
-                .append("settleAccountId", getSettleAccountId())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateTime", getUpdateTime())
-                .append("updateBy", getUpdateBy())
-                .append("delFlag", getDelFlag())
-                .toString();
-    }
 }

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

@@ -1,25 +1,76 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.AdapayMemberAccount;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author jsowell
- * @date 2023-06-15
- */
 @Repository
 public interface AdapayMemberAccountMapper {
+    /**
+     * delete by primary key
+     *
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * insert record to table
+     *
+     * @param record the record
+     * @return insert count
+     */
+    int insert(AdapayMemberAccount record);
+
+    int insertOrUpdate(AdapayMemberAccount record);
+
+    int insertOrUpdateSelective(AdapayMemberAccount record);
+
+    /**
+     * insert record to table selective
+     *
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(AdapayMemberAccount record);
+
+    /**
+     * select by primary key
+     *
+     * @param id primary key
+     * @return object by primary key
+     */
+    AdapayMemberAccount selectByPrimaryKey(Integer id);
+
+    /**
+     * update record selective
+     *
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(AdapayMemberAccount record);
+
+    /**
+     * update record
+     *
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(AdapayMemberAccount record);
+
+    int updateBatch(List<AdapayMemberAccount> list);
+
+    int batchInsert(@Param("list") List<AdapayMemberAccount> list);
+
     /**
      * 查询【请填写功能名称】
      *
      * @param id 【请填写功能名称】主键
      * @return 【请填写功能名称】
      */
-    public AdapayMemberAccount selectAdapayMemberAccountById(Long id);
+    AdapayMemberAccount selectAdapayMemberAccountById(Long id);
 
     /**
      * 查询【请填写功能名称】列表
@@ -27,7 +78,7 @@ public interface AdapayMemberAccountMapper {
      * @param adapayMemberAccount 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
+    List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
 
     /**
      * 新增【请填写功能名称】
@@ -35,7 +86,7 @@ public interface AdapayMemberAccountMapper {
      * @param adapayMemberAccount 【请填写功能名称】
      * @return 结果
      */
-    public int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
+    int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
 
     /**
      * 修改【请填写功能名称】
@@ -43,7 +94,7 @@ public interface AdapayMemberAccountMapper {
      * @param adapayMemberAccount 【请填写功能名称】
      * @return 结果
      */
-    public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
+    int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
 
     /**
      * 删除【请填写功能名称】
@@ -51,7 +102,7 @@ public interface AdapayMemberAccountMapper {
      * @param id 【请填写功能名称】主键
      * @return 结果
      */
-    public int deleteAdapayMemberAccountById(Long id);
+    int deleteAdapayMemberAccountById(Long id);
 
     /**
      * 批量删除【请填写功能名称】
@@ -59,7 +110,7 @@ public interface AdapayMemberAccountMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdapayMemberAccountByIds(Long[] ids);
+    int deleteAdapayMemberAccountByIds(Long[] ids);
 
     AdapayMemberAccount selectByMerchantId(String merchantId);
 

jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java

@@ -0,0 +1,71 @@
+package com.jsowell.pile.service;
+
+import com.jsowell.pile.domain.AdapayMemberAccount;
+
+import java.util.List;
+
+public interface AdapayMemberAccountService {
+
+    int insert(AdapayMemberAccount record);
+
+    int insertOrUpdate(AdapayMemberAccount record);
+
+    int insertOrUpdateSelective(AdapayMemberAccount record);
+
+    int insertSelective(AdapayMemberAccount record);
+
+    AdapayMemberAccount selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(AdapayMemberAccount record);
+
+    int updateByPrimaryKey(AdapayMemberAccount record);
+
+    int updateBatch(List<AdapayMemberAccount> list);
+
+    int batchInsert(List<AdapayMemberAccount> list);
+
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param adapayMemberAccount 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
+
+    List<AdapayMemberAccount> selectAdapayMemberAccountList(String merchantId);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param adapayMemberAccount 【请填写功能名称】
+     * @return 结果
+     */
+    int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param adapayMemberAccount 【请填写功能名称】
+     * @return 结果
+     */
+    int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    int deleteAdapayMemberAccountByIds(Long[] ids);
+
+    AdapayMemberAccount selectByMerchantId(String merchantId);
+
+    AdapayMemberAccount selectByMemberId(String memberId);
+
+
+    void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
+
+    AdapayMemberAccount getDefault();
+
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java

@@ -1,75 +0,0 @@
-package com.jsowell.pile.service;
-
-import com.jsowell.pile.domain.AdapayMemberAccount;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author jsowell
- * @date 2023-06-15
- */
-public interface IAdapayMemberAccountService {
-    /**
-     * 查询【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 【请填写功能名称】
-     */
-    public AdapayMemberAccount selectAdapayMemberAccountById(Long id);
-
-    /**
-     * 查询【请填写功能名称】列表
-     *
-     * @param adapayMemberAccount 【请填写功能名称】
-     * @return 【请填写功能名称】集合
-     */
-    public List<AdapayMemberAccount> selectAdapayMemberAccountList(AdapayMemberAccount adapayMemberAccount);
-
-    public List<AdapayMemberAccount> selectAdapayMemberAccountList(String merchantId);
-
-    /**
-     * 新增【请填写功能名称】
-     *
-     * @param adapayMemberAccount 【请填写功能名称】
-     * @return 结果
-     */
-    public int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
-
-    /**
-     * 修改【请填写功能名称】
-     *
-     * @param adapayMemberAccount 【请填写功能名称】
-     * @return 结果
-     */
-    public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount);
-
-    /**
-     * 批量删除【请填写功能名称】
-     *
-     * @param ids 需要删除的【请填写功能名称】主键集合
-     * @return 结果
-     */
-    public int deleteAdapayMemberAccountByIds(Long[] ids);
-
-    /**
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    public int deleteAdapayMemberAccountById(Long id);
-
-    AdapayMemberAccount selectByMerchantId(String merchantId);
-
-    AdapayMemberAccount selectByMemberId(String memberId);
-
-    String selectAdapayMemberIdByStationId(String stationId);
-
-    void deleteByMemberId(String memberId);
-
-    void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount);
-
-    AdapayMemberAccount getDefault();
-}

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java

@@ -7,9 +7,8 @@ import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.AdapayMemberAccount;
-import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.mapper.AdapayMemberAccountMapper;
-import com.jsowell.pile.service.IAdapayMemberAccountService;
+import com.jsowell.pile.service.AdapayMemberAccountService;
 import com.jsowell.pile.service.IPileStationInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +24,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountService {
+public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountService {
     @Autowired
     private AdapayMemberAccountMapper adapayMemberAccountMapper;
 
@@ -35,16 +34,7 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
     @Autowired
     private RedisCache redisCache;
 
-    /**
+
-     * 查询【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 【请填写功能名称】
-     */
-    @Override
-    public AdapayMemberAccount selectAdapayMemberAccountById(Long id) {
-        return adapayMemberAccountMapper.selectAdapayMemberAccountById(id);
-    }
 
     /**
      * 查询【请填写功能名称】列表
@@ -69,13 +59,14 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
 
     /**
      * 新增
+     *
      * @param adapayMemberAccount
      * @return 结果
      */
     @Override
     public int insertAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) {
         adapayMemberAccount.setCreateTime(DateUtils.getNowDate());
-        return adapayMemberAccountMapper.insertAdapayMemberAccount(adapayMemberAccount);
+        return adapayMemberAccountMapper.insertSelective(adapayMemberAccount);
     }
 
     /**
@@ -106,16 +97,7 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
         return adapayMemberAccountMapper.deleteAdapayMemberAccountByIds(ids);
     }
 
-    /**
+
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdapayMemberAccountById(Long id) {
-        return adapayMemberAccountMapper.deleteAdapayMemberAccountById(id);
-    }
 
     @Override
     public AdapayMemberAccount selectByMerchantId(String merchantId) {
@@ -139,24 +121,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
         return adapayMemberAccountMapper.selectByMemberId(memberId);
     }
 
-    @Override
-    public String selectAdapayMemberIdByStationId(String stationId) {
-        PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId));
-        if (pileStationInfo == null) {
-            return null;
-        }
-        AdapayMemberAccount adapayMemberAccount = selectByMerchantId(pileStationInfo.getMerchantId() + "");
-        if (adapayMemberAccount == null) {
-            log.error("通过merchantId:{}, 没有查询到结算账户配置", pileStationInfo.getMerchantId());
-            return null;
-        }
-        return adapayMemberAccount.getAdapayMemberId();
-    }
 
-    @Override
+
-    public void deleteByMemberId(String memberId) {
+
-        adapayMemberAccountMapper.deleteByMemberId(memberId);
-    }
 
     @Override
     public void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount) {
@@ -170,4 +137,51 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
         account.setRemark(Constants.DEFAULT);
         return account;
     }
+
+
+    @Override
+    public int insert(AdapayMemberAccount record) {
+        return adapayMemberAccountMapper.insert(record);
+    }
+
+    @Override
+    public int insertOrUpdate(AdapayMemberAccount record) {
+        return adapayMemberAccountMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(AdapayMemberAccount record) {
+        return adapayMemberAccountMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(AdapayMemberAccount record) {
+        return adapayMemberAccountMapper.insertSelective(record);
+    }
+
+    @Override
+    public AdapayMemberAccount selectByPrimaryKey(Integer id) {
+        return adapayMemberAccountMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(AdapayMemberAccount record) {
+        return adapayMemberAccountMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(AdapayMemberAccount record) {
+        return adapayMemberAccountMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<AdapayMemberAccount> list) {
+        return adapayMemberAccountMapper.updateBatch(list);
+    }
+
+    @Override
+    public int batchInsert(List<AdapayMemberAccount> list) {
+        return adapayMemberAccountMapper.batchInsert(list);
+    }
 }
+

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -153,7 +153,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
     private ISettleOrderReportService settleOrderReportService;
 
     @Autowired
-    private IAdapayMemberAccountService adapayMemberAccountService;
+    private AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     private PileRemoteService pileRemoteService;

jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/AbstractOrderLogic.java

@@ -76,7 +76,7 @@ public abstract class AbstractOrderLogic implements InitializingBean {
     protected AdapayService adapayService;
 
     @Autowired
-    protected IAdapayMemberAccountService adapayMemberAccountService;
+    protected AdapayMemberAccountService adapayMemberAccountService;
 
     @Autowired
     protected IPileMerchantInfoService pileMerchantInfoService;

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

@@ -1,20 +1,416 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsowell.pile.mapper.AdapayMemberAccountMapper">
+  <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.AdapayMemberAccount">
+    <!--@mbg.generated-->
+    <!--@Table adapay_member_account-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
+    <result column="adapay_member_id" jdbcType="VARCHAR" property="adapayMemberId" />
+    <result column="settle_account_id" jdbcType="VARCHAR" property="settleAccountId" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="del_flag" jdbcType="VARCHAR" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `status`, merchant_id, adapay_member_id, settle_account_id, remark, create_time, 
+    create_by, update_time, update_by, del_flag
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from adapay_member_account
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from adapay_member_account
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into adapay_member_account (`status`, merchant_id, adapay_member_id, 
+      settle_account_id, remark, create_time, 
+      create_by, update_time, update_by, 
+      del_flag)
+    values (#{status,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{adapayMemberId,jdbcType=VARCHAR}, 
+      #{settleAccountId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{delFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into adapay_member_account
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
+      <if test="adapayMemberId != null">
+        adapay_member_id,
+      </if>
+      <if test="settleAccountId != null">
+        settle_account_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="adapayMemberId != null">
+        #{adapayMemberId,jdbcType=VARCHAR},
+      </if>
+      <if test="settleAccountId != null">
+        #{settleAccountId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.AdapayMemberAccount">
+    <!--@mbg.generated-->
+    update adapay_member_account
+    <set>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="adapayMemberId != null">
+        adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR},
+      </if>
+      <if test="settleAccountId != null">
+        settle_account_id = #{settleAccountId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.jsowell.pile.domain.AdapayMemberAccount">
+    <!--@mbg.generated-->
+    update adapay_member_account
+    set `status` = #{status,jdbcType=VARCHAR},
+      merchant_id = #{merchantId,jdbcType=VARCHAR},
+      adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR},
+      settle_account_id = #{settleAccountId,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update adapay_member_account
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="`status` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.status,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="merchant_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="adapay_member_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.adapayMemberId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="settle_account_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.settleAccountId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="remark = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.remark,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="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="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="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="del_flag = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=VARCHAR}
+        </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 adapay_member_account
+    (`status`, merchant_id, adapay_member_id, settle_account_id, remark, create_time, 
+      create_by, update_time, update_by, del_flag)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.status,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.adapayMemberId,jdbcType=VARCHAR}, 
+        #{item.settleAccountId,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+        #{item.createBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, 
+        #{item.delFlag,jdbcType=VARCHAR})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into adapay_member_account
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      `status`,
+      merchant_id,
+      adapay_member_id,
+      settle_account_id,
+      remark,
+      create_time,
+      create_by,
+      update_time,
+      update_by,
+      del_flag,
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      #{status,jdbcType=VARCHAR},
+      #{merchantId,jdbcType=VARCHAR},
+      #{adapayMemberId,jdbcType=VARCHAR},
+      #{settleAccountId,jdbcType=VARCHAR},
+      #{remark,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP},
+      #{createBy,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP},
+      #{updateBy,jdbcType=VARCHAR},
+      #{delFlag,jdbcType=VARCHAR},
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=INTEGER},
+      </if>
+      `status` = #{status,jdbcType=VARCHAR},
+      merchant_id = #{merchantId,jdbcType=VARCHAR},
+      adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR},
+      settle_account_id = #{settleAccountId,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=VARCHAR},
+    </trim>
+  </insert>
+  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into adapay_member_account
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
+      <if test="adapayMemberId != null">
+        adapay_member_id,
+      </if>
+      <if test="settleAccountId != null">
+        settle_account_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="adapayMemberId != null">
+        #{adapayMemberId,jdbcType=VARCHAR},
+      </if>
+      <if test="settleAccountId != null">
+        #{settleAccountId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
+      <if test="adapayMemberId != null">
+        adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR},
+      </if>
+      <if test="settleAccountId != null">
+        settle_account_id = #{settleAccountId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
 
-    <resultMap type="com.jsowell.pile.domain.AdapayMemberAccount" id="AdapayMemberAccountResult">
+    <resultMap id="AdapayMemberAccountResult" type="com.jsowell.pile.domain.AdapayMemberAccount">
-        <result property="id"    column="id"    />
+        <result column="id" property="id" />
-        <result property="status"    column="status"    />
+        <result column="status" property="status" />
-        <result property="merchantId"    column="merchant_id"    />
+        <result column="merchant_id" property="merchantId" />
-        <result property="adapayMemberId"    column="adapay_member_id"    />
+        <result column="adapay_member_id" property="adapayMemberId" />
-        <result property="settleAccountId"    column="settle_account_id"    />
+        <result column="settle_account_id" property="settleAccountId" />
-        <result property="createTime"    column="create_time"    />
+        <result column="create_time" property="createTime" />
-        <result property="createBy"    column="create_by"    />
+        <result column="create_by" property="createBy" />
-        <result property="updateTime"    column="update_time"    />
+        <result column="update_time" property="updateTime" />
-        <result property="updateBy"    column="update_by"    />
+        <result column="update_by" property="updateBy" />
-        <result property="delFlag"    column="del_flag"    />
+        <result column="del_flag" property="delFlag" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -23,12 +419,12 @@
 
     <sql id="selectAdapayMemberAccountVo">
         select
-            <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List" />
         from adapay_member_account
     </sql>
 
     <select id="selectAdapayMemberAccountList" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" resultMap="AdapayMemberAccountResult">
-        <include refid="selectAdapayMemberAccountVo"/>
+        <include refid="selectAdapayMemberAccountVo" />
         <where>
             <if test="merchantId != null  and merchantId != ''"> and merchant_id = #{merchantId}</if>
             <if test="adapayMemberId != null  and adapayMemberId != ''"> and adapay_member_id = #{adapayMemberId}</if>
@@ -37,11 +433,11 @@
     </select>
 
     <select id="selectAdapayMemberAccountById" parameterType="Long" resultMap="AdapayMemberAccountResult">
-        <include refid="selectAdapayMemberAccountVo"/>
+        <include refid="selectAdapayMemberAccountVo" />
         where id = #{id}
     </select>
 
-    <insert id="insertAdapayMemberAccount" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertAdapayMemberAccount" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayMemberAccount" useGeneratedKeys="true">
         insert into adapay_member_account
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="status != null">status,</if>
@@ -103,25 +499,25 @@
         delete from adapay_member_account where id = #{id}
     </delete>
 
-    <!--<delete id="deleteAdapayMemberAccountByIds" parameterType="String">
+    <!--&lt;delete id="deleteAdapayMemberAccountByIds" parameterType="String"&gt;
         delete from adapay_member_account where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
+        &lt;foreach item="id" collection="array" open="(" separator="," close=")"&gt;
             #{id}
-        </foreach>
+        &lt;/foreach&gt;
-    </delete>-->
+    &lt;/delete&gt;-->
 
     <update id="deleteAdapayMemberAccountByIds" parameterType="com.jsowell.pile.domain.AdapayMemberAccount">
         update adapay_member_account
         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>
     </update>
 
     <select id="selectByMerchantId" resultMap="AdapayMemberAccountResult">
         select
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List" />
         from adapay_member_account
         where del_flag = '0'
         and merchant_id = #{merchantId,jdbcType=VARCHAR}
@@ -133,7 +529,7 @@
 
     <select id="selectByMemberId" resultMap="AdapayMemberAccountResult">
         select
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List" />
         from adapay_member_account
         where del_flag = '0'
         and adapay_member_id = #{memberId,jdbcType=VARCHAR}