登录

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabWelcome.java

@@ -34,6 +34,11 @@ public class TabWelcome implements Serializable {
     /**
      * 0删除 1正常
      */
+    private Integer openFlag;
+
+    /**
+     * 0删除 1正常
+     */
     private Integer statusFlag;
 
     /**
@@ -50,6 +55,15 @@ public class TabWelcome implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
+
+    public Integer getOpenFlag() {
+        return openFlag;
+    }
+
+    public void setOpenFlag(Integer openFlag) {
+        this.openFlag = openFlag;
+    }
+
     /**
      * This method returns the value of the database column tab_haoban_welcome.welcome_id
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MiniprogramSettingService.java

@@ -36,6 +36,15 @@ public interface MiniprogramSettingService {
     public TabMiniprogramSetting getMiniprogramSetting(String wxEnterpriseId, String enterpriseId);
 
     /**
+     * 获取单个配置信息 无需操作企业微信media
+     *
+     * @param wxEnterpriseId
+     * @param enterpriseId
+     * @return
+     */
+    public TabMiniprogramSetting getMiniprogramSettingNoMedia(String wxEnterpriseId, String enterpriseId);
+
+    /**
      * 删除
      *
      * @param id

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MiniprogramSettingServiceImpl.java

@@ -89,6 +89,15 @@ public class MiniprogramSettingServiceImpl implements MiniprogramSettingService
     }
 
     @Override
+    public TabMiniprogramSetting getMiniprogramSettingNoMedia(String wxEnterpriseId, String enterpriseId) {
+        TabMiniprogramSetting miniprogramSetting = tabMiniprogramSettingMapper.getMiniprogramSetting(wxEnterpriseId, enterpriseId);
+        if (miniprogramSetting == null) {
+            return null;
+        }
+        return miniprogramSetting;
+    }
+
+    @Override
     public boolean delMiniprogramSetting(String id) {
         tabMiniprogramSettingMapper.deleteByPrimaryKey(id);
         return true;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -247,8 +247,8 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         if (null == relationDTO) {
             return resp;
         }
-        TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(detailDTO.getWxEnterpriseId(), detailDTO.getEnterpriseId());
-        if (null == miniprogramSetting) {
+		TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSettingNoMedia(detailDTO.getWxEnterpriseId(), detailDTO.getEnterpriseId());
+		if (null == miniprogramSetting) {
             miniprogramSetting = new TabMiniprogramSetting();
         }
         miniprogramSetting.setWxEnterpriseId(detailDTO.getWxEnterpriseId());

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeMapper.xml

@@ -7,11 +7,12 @@
         <result column="title" jdbcType="VARCHAR" property="title"/>
         <result column="welcome_content" jdbcType="VARCHAR" property="welcomeContent"/>
         <result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
+        <result column="open_flag" jdbcType="INTEGER" property="openFlag"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
-    welcome_id, wx_enterprise_id, title, welcome_content, status_flag, create_time, update_time
+    welcome_id, wx_enterprise_id, title, welcome_content,open_flag, status_flag, create_time, update_time
   </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
@@ -25,10 +26,10 @@
   </delete>
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
     insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title, 
-      welcome_content, status_flag, create_time, 
+      welcome_content,open_flag, status_flag, create_time,
       update_time)
     values (#{welcomeId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
-      #{welcomeContent,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{welcomeContent,jdbcType=VARCHAR},#{openFlag}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
     <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
@@ -92,6 +93,9 @@
             <if test="welcomeContent != null">
                 welcome_content = #{welcomeContent,jdbcType=VARCHAR},
             </if>
+            <if test="openFlag != null">
+                open_flag = #{openFlag,jdbcType=INTEGER},
+            </if>
             <if test="statusFlag != null">
                 status_flag = #{statusFlag,jdbcType=INTEGER},
             </if>
@@ -109,6 +113,7 @@
     set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
       welcome_content = #{welcomeContent,jdbcType=VARCHAR},
+      open_flag = #{openFlag,jdbcType=INTEGER},
       status_flag = #{statusFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}