Bläddra i källkod

上朵分销系统

wangxiaoming 6 år sedan
förälder
incheckning
991043cfb8

+ 10 - 0
tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/ChildChannel.java

@@ -30,6 +30,8 @@ public class ChildChannel  implements  Serializable{
     private String childChannelBankName;
     //开户支行
     private String childChannelBankBranch;
+    //二维码地址
+    private String childChannelQrcode;
     //状态1:使用中 2:未使用
     private Integer childChannelStatus;
     //备注
@@ -158,4 +160,12 @@ public class ChildChannel  implements  Serializable{
     public void setChildChannelUpdateTime(Date  childChannelUpdateTime){
         this.childChannelUpdateTime=childChannelUpdateTime;
     }
+
+    public String getChildChannelQrcode() {
+        return childChannelQrcode;
+    }
+
+    public void setChildChannelQrcode(String childChannelQrcode) {
+        this.childChannelQrcode = childChannelQrcode;
+    }
 }

+ 10 - 0
tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/MainChannel.java

@@ -28,6 +28,8 @@ public class MainChannel  implements  Serializable{
     private String mainChannelBankName;
     //开户支行
     private String mainChannelBankBranch;
+    //二维码地址
+    private String mainChannelQrcode;
     //状态1:使用中 2:未使用
     private Integer mainChannelStatus;
     //备注
@@ -148,4 +150,12 @@ public class MainChannel  implements  Serializable{
     public void setMainChannelUpdateTime(Date  mainChannelUpdateTime){
         this.mainChannelUpdateTime=mainChannelUpdateTime;
     }
+
+    public String getMainChannelQrcode() {
+        return mainChannelQrcode;
+    }
+
+    public void setMainChannelQrcode(String mainChannelQrcode) {
+        this.mainChannelQrcode = mainChannelQrcode;
+    }
 }

+ 13 - 0
tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/childChannelMapper.xml

@@ -13,6 +13,7 @@
         <result    column="child_channel_bank_account"    property="childChannelBankAccount" />
         <result    column="child_channel_bank_name"    property="childChannelBankName" />
         <result    column="child_channel_bank_branch"    property="childChannelBankBranch" />
+        <result    column="child_channel_qrcode"    property="childChannelQrcode" />
         <result    column="child_channel_status"    property="childChannelStatus" />
         <result    column="child_channel_desc"    property="childChannelDesc" />
         <result    column="child_channel_create_time"    property="childChannelCreateTime" />
@@ -30,6 +31,7 @@
         t.child_channel_bank_account,
         t.child_channel_bank_name,
         t.child_channel_bank_branch,
+        t.child_channel_qrcode,
         t.child_channel_status,
         t.child_channel_desc,
         t.child_channel_create_time,
@@ -73,6 +75,7 @@
         insert into
         tb_iamberry_child_channel
         (
+        child_channel_id,
         child_channel_open_id,
         main_channel_id,
         child_channel_name,
@@ -83,11 +86,13 @@
         child_channel_bank_account,
         child_channel_bank_name,
         child_channel_bank_branch,
+        child_channel_qrcode,
         child_channel_status,
         child_channel_desc
         )
         values
         (
+        #{childChannelId},
         #{childChannelOpenId},
         #{mainChannelId},
         #{childChannelName},
@@ -98,6 +103,7 @@
         #{childChannelBankAccount},
         #{childChannelBankName},
         #{childChannelBankBranch},
+        #{childChannelQrcode},
         #{childChannelStatus},
         #{childChannelDesc}
         )
@@ -106,6 +112,9 @@
         update
         tb_iamberry_child_channel
         <set >
+            <if test="childChannelId != null ">
+                child_channel_id = #{childChannelId},
+            </if >
             <if test="childChannelOpenId != null and childChannelOpenId != ''">
                 child_channel_open_id = #{childChannelOpenId},
             </if >
@@ -136,6 +145,9 @@
             <if test="childChannelBankBranch != null and childChannelBankBranch != ''">
                 child_channel_bank_branch = #{childChannelBankBranch},
             </if >
+            <if test="childChannelQrcode != null and childChannelQrcode != ''">
+                child_channel_qrcode = #{childChannelQrcode},
+            </if >
             <if test="childChannelStatus != null ">
                 child_channel_status = #{childChannelStatus},
             </if >
@@ -145,4 +157,5 @@
         </set >
         where child_channel_id= #{childChannelId}
     </update>
+
 </mapper>

+ 8 - 0
tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/mainChannelMapper.xml

@@ -12,6 +12,7 @@
         <result    column="main_channel_bank_account"    property="mainChannelBankAccount" />
         <result    column="main_channel_bank_name"    property="mainChannelBankName" />
         <result    column="main_channel_bank_branch"    property="mainChannelBankBranch" />
+        <result    column="main_channel_qrcode"    property="mainChannelQrcode" />
         <result    column="main_channel_status"    property="mainChannelStatus" />
         <result    column="main_channel_desc"    property="mainChannelDesc" />
         <result    column="main_channel_create_time"    property="mainChannelCreateTime" />
@@ -28,11 +29,13 @@
         t.main_channel_bank_account,
         t.main_channel_bank_name,
         t.main_channel_bank_branch,
+        t.main_channel_qrcode,
         t.main_channel_status,
         t.main_channel_desc,
         t.main_channel_create_time,
         t.main_channel_update_time
     </sql>
+
     <select id="getMainChannelList" resultMap="BaseResultMap" parameterType="MainChannel" >
         select
         <include refid="Base_List" />
@@ -77,6 +80,7 @@
         main_channel_bank_account,
         main_channel_bank_name,
         main_channel_bank_branch,
+        main_channel_qrcode,
         main_channel_status,
         main_channel_desc
         )
@@ -91,6 +95,7 @@
         #{mainChannelBankAccount},
         #{mainChannelBankName},
         #{mainChannelBankBranch},
+        #{mainChannelQrcode},
         #{mainChannelStatus},
         #{mainChannelDesc}
         )
@@ -126,6 +131,9 @@
             <if test="mainChannelBankBranch != null and mainChannelBankBranch != ''">
                 main_channel_bank_branch = #{mainChannelBankBranch},
             </if >
+            <if test="mainChannelQrcode != null and mainChannelQrcode != ''">
+                main_channel_qrcode = #{mainChannelQrcode},
+            </if >
             <if test="mainChannelStatus != null ">
                 main_channel_status = #{mainChannelStatus},
             </if >