小程序

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MiniprogramSettingDTO.java

@@ -71,6 +71,16 @@ public class MiniprogramSettingDTO implements Serializable {
      */
     private Date updateTime;
 
+    private Integer miniprogramType;
+
+    public Integer getMiniprogramType() {
+        return miniprogramType;
+    }
+
+    public void setMiniprogramType(Integer miniprogramType) {
+        this.miniprogramType = miniprogramType;
+    }
+
     /**
      */
     private static final long serialVersionUID = 1L;

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

@@ -71,6 +71,16 @@ public class TabMiniprogramSetting implements Serializable {
      */
     private Date updateTime;
 
+    private Integer miniprogramType;
+
+    public Integer getMiniprogramType() {
+        return miniprogramType;
+    }
+
+    public void setMiniprogramType(Integer miniprogramType) {
+        this.miniprogramType = miniprogramType;
+    }
+
     /**
      */
     private static final long serialVersionUID = 1L;

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

@@ -12,12 +12,13 @@
         <result column="media_id" jdbcType="VARCHAR" property="mediaId"/>
         <result column="media_time" jdbcType="TIMESTAMP" property="mediaTime"/>
         <result column="status_flag" jdbcType="INTEGER" property="statusFlag"/>
+        <result column="miniprogram_type" jdbcType="INTEGER" property="miniprogramType"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
-    miniprogram_setting_id, wx_enterprise_id, enterprise_id, miniprogram_name, title, 
-    app_id, image_url, media_id, media_time, status_flag, create_time, update_time
+    miniprogram_setting_id, wx_enterprise_id, enterprise_id, miniprogram_name, title,
+        app_id, image_url, media_id, media_time,miniprogram_type, status_flag, create_time, update_time
   </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
@@ -72,6 +73,9 @@
             <if test="mediaTime != null">
                 media_time,
             </if>
+            <if test="miniprogramType != null">
+                miniprogram_type,
+            </if>
             <if test="statusFlag != null">
                 status_flag,
             </if>
@@ -110,6 +114,9 @@
             <if test="mediaTime != null">
                 #{mediaTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="miniprogramType != null">
+                #{miniprogramType,jdbcType=INTEGER},
+            </if>
             <if test="statusFlag != null">
                 #{statusFlag,jdbcType=INTEGER},
             </if>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -696,12 +696,14 @@ public class WxEnterpriseController extends WebBaseController{
 		LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		settingDTO.setWxEnterpriseId(wxEnterpriseId);
-        MiniprogramSettingDTO miniprogramSettingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, settingDTO.getEnterpriseId());
-        if (null != miniprogramSettingDTO
-                && (!miniprogramSettingDTO.getMiniprogramSettingId().equals(settingDTO.getMiniprogramSettingId()))) {
-            return resultResponse(HaoBanErrCode.ERR_100031);
-        }
-        wxEnterpriseApiService.saveMiniprogramSetting(EntityUtil.changeEntityByOrika(MiniprogramSettingDTO.class, settingDTO));
+		if (settingDTO.getMiniprogramType() == 0) {
+			MiniprogramSettingDTO miniprogramSettingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, settingDTO.getEnterpriseId());
+			if (null != miniprogramSettingDTO
+					&& (!miniprogramSettingDTO.getMiniprogramSettingId().equals(settingDTO.getMiniprogramSettingId()))) {
+				return resultResponse(HaoBanErrCode.ERR_100031);
+			}
+		}
+		wxEnterpriseApiService.saveMiniprogramSetting(EntityUtil.changeEntityByOrika(MiniprogramSettingDTO.class, settingDTO));
         return resultResponse(HaoBanErrCode.ERR_1);
 	}
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/MiniprogramSettingQo.java

@@ -45,6 +45,18 @@ public class MiniprogramSettingQo implements Serializable {
      * 封面
      */
     private String imageUrl;
+    /**
+     * 类型 0默认 1自定义
+     */
+    private Integer miniprogramType = 0;
+
+    public Integer getMiniprogramType() {
+        return miniprogramType;
+    }
+
+    public void setMiniprogramType(Integer miniprogramType) {
+        this.miniprogramType = miniprogramType;
+    }
 
     public String getMiniprogramSettingId() {
         return miniprogramSettingId;