Parcourir la source

增加Line设定情报

libin il y a 3 ans
Parent
commit
3ae044cc5a

+ 20 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/domain/BusCompany.java

@@ -101,6 +101,26 @@ public class BusCompany extends BaseEntity
     @Excel(name = "親権者同意書")
     private String agreement;
 
+    /**  Line LIff ID */
+    @Excel(name = "Line LIff ID")
+    private String liffId;
+
+    /**  LINE BOT チャンネルトークン */
+    @Excel(name = "LINE BOT チャンネルトークン")
+    private String botChannelToken;
+
+    /**  LINE BOT チャネルシークレット */
+    @Excel(name = "LINE BOT チャネルシークレット")
+    private String botChannelSecret;
+
+    /**  LINE PAY チャンネルトークン */
+    @Excel(name = "LINE PAY チャンネルトークン")
+    private String linePayChannelSecret;
+
+    /**  LINE PAY チャネルID */
+    @Excel(name = "LINE PAY チャネルID")
+    private String linePayChannelId;
+
     /** 删除标志(0代表存在 2代表删除) */
     private String delFlag;
 

+ 32 - 2
ruoyi-admin/src/main/resources/mapper/busCompany/BusCompanyMapper.xml

@@ -24,6 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="agreement"   column="agreement"    />
         <result property="pointDesc"   column="point_desc"    />
         <result property="couponDesc"   column="coupon_desc"    />
+        <result property="liffId"   column="liff_id"    />
+        <result property="botChannelToken"   column="bot_channel_token"    />
+        <result property="botChannelSecret"   column="bot_channel_secret"    />
+        <result property="linePayChannelSecret"   column="line_pay_channel_secret"    />
+        <result property="linePayChannelId"   column="line_pay_channel_id"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -54,6 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.agreement,
             a.point_desc,
             a.coupon_desc,
+            a.liff_id,
+            a.bot_channel_token,
+            a.bot_channel_secret,
+            a.line_pay_channel_secret,
+            a.line_pay_channel_id,
             a.STATUS,
             a.del_flag,
             a.create_by,
@@ -87,6 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreement != null and agreement != ''"> and agreement = #{agreement}</if>
             <if test="pointDesc != null and pointDesc != ''"> and point_desc = #{pointDesc}</if>
             <if test="couponDesc != null and couponDesc != ''"> and coupon_desc = #{couponDesc}</if>
+            <if test="liffId != null and liffId != ''"> and liff_id = #{liffId}</if>
+            <if test="botChannelToken != null and botChannelToken != ''"> and bot_channel_token = #{botChannelToken}</if>
+            <if test="botChannelSecret != null and botChannelSecret != ''"> and bot_channel_secret = #{botChannelSecret}</if>
+            <if test="linePayChannelSecret != null and linePayChannelSecret != ''"> and line_pay_channel_secret = #{linePayChannelSecret}</if>
+            <if test="linePayChannelId != null and linePayChannelId != ''"> and line_pay_channel_id = #{linePayChannelId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="params.beginDate != null and params.beginDate != ''"><!-- 开始时间检索 -->
                 and date_format(a.create_time,'%y%m%d') &gt;= date_format(#{params.beginDate},'%y%m%d')
@@ -123,6 +138,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreement != null">agreement,</if>
             <if test="pointDesc != null">point_desc,</if>
             <if test="couponDesc != null">coupon_desc,</if>
+            <if test="liffId != null">liff_id,</if>
+            <if test="botChannelToken != null">bot_channel_token,</if>
+            <if test="botChannelSecret != null">bot_channel_secret,</if>
+            <if test="linePayChannelSecret != null">line_pay_channel_secret,</if>
+            <if test="linePayChannelId != null">line_pay_channel_id,</if>
             <if test="status != null">status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -147,8 +167,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mark != null">#{mark},</if>
             <if test="privacy != null">#{privacy},</if>
             <if test="agreement != null">#{agreement},</if>
-            <if test="pointDesc != null">point_desc,</if>
-            <if test="couponDesc != null">coupon_desc,</if>
+            <if test="pointDesc != null">#{pointDesc},</if>
+            <if test="couponDesc != null">#{couponDesc},</if>
+            <if test="liffId != null">#{liffId},</if>
+            <if test="botChannelToken != null">#{botChannelToken},</if>
+            <if test="botChannelSecret != null">#{botChannelSecret},</if>
+            <if test="linePayChannelSecret != null">#{linePayChannelSecret},</if>
+            <if test="linePayChannelId != null">#{linePayChannelId},</if>
             <if test="status != null">#{status},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -179,6 +204,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreement != null">agreement = #{agreement},</if>
             <if test="pointDesc != null">point_desc = #{pointDesc},</if>
             <if test="couponDesc != null">coupon_desc = #{couponDesc},</if>
+            <if test="liffId != null">liff_id = #{liffId},</if>
+            <if test="botChannelToken != null">bot_channel_token = #{botChannelToken},</if>
+            <if test="botChannelSecret != null">bot_channel_secret = #{botChannelSecret},</if>
+            <if test="linePayChannelSecret != null">line_pay_channel_secret = #{linePayChannelSecret},</if>
+            <if test="linePayChannelId != null">line_pay_channel_id = #{linePayChannelId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>