From a066a0d4fed9429c7b307bd4e771d00287e37672 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 25 Aug 2023 13:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20delayMode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/domain/PileMerchantInfo.java  |  5 +++++
 .../mapper/pile/PileMerchantInfoMapper.xml         | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java
index 377b4eeed..df039163c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java
@@ -32,6 +32,11 @@ public class PileMerchantInfo extends BaseEntity {
 	 */
 	private String merchantLevel;
 
+	/**
+	 * 延时分账模式（0-不延时；1-延时分账）
+	 */
+	private String delayMode;
+
 	/**
 	 * 父级运营商id
 	 */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
index c3daf91f5..f944f90e1 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
@@ -10,6 +10,7 @@
         <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"/>
@@ -31,6 +32,7 @@
         parent_id,
         address,
         status,
+        delay_mode,
         organization_code,
         manager_name,
         manager_phone,
@@ -64,6 +66,9 @@
             <if test="status != null  and status != ''">
                 and status = #{status}
             </if>
+            <if test="delayMode != null and delayMode != ''">
+                and delay_mode = #{delayMode}
+            </if>
             <if test="organizationCode != null  and organizationCode != ''">
                 and organization_code = #{organizationCode}
             </if>
@@ -115,6 +120,9 @@
             <if test="status != null">
                 status,
             </if>
+            <if test="delayMode != null">
+                delay_mode,
+            </if>
             <if test="organizationCode != null">
                 organization_code,
             </if>
@@ -171,6 +179,9 @@
             <if test="status != null">
                 #{status},
             </if>
+            <if test="delayMode != null">
+                #{delayMode},
+            </if>
             <if test="organizationCode != null">
                 #{organizationCode},
             </if>
@@ -228,6 +239,9 @@
             <if test="status != null">
                 status = #{status},
             </if>
+            <if test="delayMode != null">
+                delay_mode = #{delayMode},
+            </if>
             <if test="organizationCode != null">
                 organization_code = #{organizationCode},
             </if>