群活码

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

@@ -47,8 +47,17 @@ public class GroupChatHmDTO implements Serializable {
     private Integer statusFlag ;
     // 可以群数
     private Integer usableChatCount;
-    
-    
+
+    private String storeId ;
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
     public Integer getUsableChatCount() {
         return usableChatCount;
     }

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

@@ -28,7 +28,17 @@ public class GroupChatOwnerDTO  implements Serializable {
     private String wxOpenUserId;
     private java.util.Date createTime;
     private java.util.Date updateTime;
-    
+
+    private String storeNames ;
+
+    public String getStoreNames() {
+        return storeNames;
+    }
+
+    public void setStoreNames(String storeNames) {
+        this.storeNames = storeNames;
+    }
+
     public String getWxUserId() {
         return wxUserId;
     }

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

@@ -46,6 +46,16 @@ public class HmLinkDTO implements Serializable {
     // 群活码配置
     private List<HmLinkChatDTO> linkChatList ;
 
+    private String chatStoreRule ;
+
+    public String getChatStoreRule() {
+        return chatStoreRule;
+    }
+
+    public void setChatStoreRule(String chatStoreRule) {
+        this.chatStoreRule = chatStoreRule;
+    }
+
     public List<HmLinkChatDTO> getLinkChatList() {
         return linkChatList;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/ChatHmSearchQDTO.java

@@ -23,6 +23,17 @@ public class ChatHmSearchQDTO extends PageQo implements Serializable {
     private List<String> creatorIdList;
     private Integer linkCount;
     private int allFlag;
+
+    private String storeId ;
+
+    public String getStoreId() {
+		return storeId;
+	}
+
+    public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
     public String getSearchParamsCode() {
         return searchParamsCode;
     }

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

@@ -41,6 +41,15 @@ public class TabGroupChatHm implements Serializable{
 	// 1有效 2作废 3待生效
 	private Integer statusFlag ;
 	private Integer linkCount ;
+	private String storeId ;
+
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
 	
 	public Integer getLinkCount() {
         return linkCount;

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

@@ -43,6 +43,16 @@ public class TabHmLink implements Serializable {
     
     private Long otherChatHmId ;
 
+    private String chatStoreRule ;
+
+    public String getChatStoreRule() {
+		return chatStoreRule;
+	}
+
+    public void setChatStoreRule(String chatStoreRule) {
+		this.chatStoreRule = chatStoreRule;
+	}
+
     public Long getOtherChatHmId() {
         return otherChatHmId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/chat/GroupChatHmBO.java

@@ -44,6 +44,16 @@ public class GroupChatHmBO implements Serializable{
     private Integer statusFlag ;
     // 可以群数
     private Integer usableChatCount;
+
+	private String storeId ;
+
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
     
 	public Integer getUsableChatCount() {
         return usableChatCount;

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmMapper.xml

@@ -25,6 +25,7 @@
 		<result column="chat_count" property="chatCount" />
 		<result column="link_count" property="linkCount"/>
 		<result column="status_flag" property="statusFlag"/>
+		<result column="store_id" property="storeId" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		chat_hm_id,
@@ -46,7 +47,7 @@
 		create_time,
 		update_time,
 		chat_count, link_count ,
-		status_flag
+		status_flag , store_id
 	</sql>
 	<!-- ===================== 新增 ======================== -->
 	<insert id="insert"
@@ -72,7 +73,7 @@
 	  create_time,
 	  update_time,
 	  chat_count,
-	  status_flag
+	  status_flag , store_id
   )VALUES(
 	  #{chatHmId},
 	  #{chatHmCode},
@@ -93,7 +94,7 @@
 	  now(),
 	  now(),
 	  #{chatCount},
-	   1
+	   1 , #{storeId}
   )
   ]]>
 	</insert>
@@ -118,7 +119,7 @@
 	  modifier_id=#{modifierId},
 	  modifier_name=#{modifierName},
 	  update_time=now(),
-	  chat_count=#{chatCount}
+	  chat_count=#{chatCount} , store_id = #{storeId}
   where chat_hm_id = #{chatHmId}
   ]]>
 	</update>
@@ -169,6 +170,9 @@
 				#{id}
 			</foreach>
 		</if>
+		<if test="null != storeId and ''!=storeId">
+			and store_id = #{storeId}
+		</if>
 		order by create_time desc
 	</select>
 	<select id="listAvailableByEnterpriseId"

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatOwnerMapper.xml

@@ -94,7 +94,7 @@
             </foreach>
         </if>
         <if test="null != searchParams and ''!=searchParams ">
-            and b.staff_name like #{searchParams}
+            and b.staff_name like #{searchParams}g
         </if>
             and b.status_flag = 1
         <if test="departmentIdList != null and departmentIdList.size() > 0">

haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml

@@ -23,6 +23,7 @@
       <result column="status_flag"  property="statusFlag"/>
       <result column="short_code" property="shortCode" />
       <result column="other_chat_hm_id" property="otherChatHmId"/>
+      <result column="chat_store_rule" property="chatStoreRule"/>
   </resultMap>
   <sql id="Base_Column_List">
 	  link_id,
@@ -43,7 +44,7 @@
 	  store_rule_json,
 	  custom_rule_json,
 	  member_label_id,
-	  status_flag,short_code , other_chat_hm_id
+	  status_flag,short_code , other_chat_hm_id , chat_store_rule
   </sql>
   <!-- ===================== 新增 ======================== -->
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHmLink">
@@ -67,7 +68,7 @@
 	  store_rule_json,
 	  custom_rule_json,
 	  member_label_id,
-	  status_flag , short_code , other_chat_hm_id
+	  status_flag , short_code , other_chat_hm_id , chat_store_rule
   )VALUES(
 	  #{linkId,jdbcType=BIGINT},
 	  #{linkCode,jdbcType=VARCHAR},
@@ -87,7 +88,7 @@
 	  #{storeRuleJson,jdbcType=VARCHAR},
 	  #{customRuleJson,jdbcType=VARCHAR},
 	  #{memberLabelId,jdbcType=VARCHAR},
-	  #{statusFlag,jdbcType=INTEGER} , #{shortCode} , #{otherChatHmId}
+	  #{statusFlag,jdbcType=INTEGER} , #{shortCode} , #{otherChatHmId} , #{chatStoreRule}
   )
   ]]>
   </insert>
@@ -105,7 +106,7 @@
 			  update_time=now(),
 			  store_rule_json=#{storeRuleJson,jdbcType=VARCHAR},
 			  custom_rule_json=#{customRuleJson,jdbcType=VARCHAR},
-			  member_label_id=#{memberLabelId,jdbcType=VARCHAR} , other_chat_hm_id = #{otherChatHmId}
+			  member_label_id=#{memberLabelId,jdbcType=VARCHAR} , other_chat_hm_id = #{otherChatHmId} , chat_store_rule = #{chatStoreRule}
 		  WHERE link_id = #{linkId}
 	  ]]>
   </update>

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

@@ -15,6 +15,8 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -88,6 +90,8 @@ public class GroupChatHmController {
     private DownloadReportService downloadReportService;
     @Autowired
     private EnterpriseService enterpriseService;
+    @Autowired
+    private StoreService storeService ;
 
     @RequestMapping("add")
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QHM, optType = GicLogRecordOptTypeEnum.HB_1002_01, userFunc = LogRecordUserServiceImpl.class, optPage = "群活码-新建活码")
@@ -283,6 +287,18 @@ public class GroupChatHmController {
                 if (vo.getUsableChatCount() == 0) {
                     vo.setUseRemark("无可加入的群聊");
                 }
+                if(StringUtils.isNotBlank(vo.getStoreId())) {
+                    StoreDTO storeDTO = this.storeService.getStoreByIdNoStatus(vo.getStoreId());
+                    if(null != storeDTO) {
+                        vo.setStoreName(storeDTO.getStoreName());
+                        vo.setStoreCode(storeDTO.getStoreCode());
+                        if(null != storeDTO.getStatus() && storeDTO.getStatus()!=0) {
+                            vo.setStoreStatus(1);
+                        }else {
+                            storeDTO.setStatus(0);
+                        }
+                    }
+                }
             });
         }
         return RestResponse.successResult(retPage);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatHmVO.java

@@ -42,6 +42,43 @@ public class GroupChatHmVO implements Serializable {
     // 可以群数
     private Integer usableChatCount;
     private String useRemark;
+    private String storeId ;
+    private String storeName ;
+    private String storeCode ;
+    // 0已删除 1有效
+    private int storeStatus ;
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public int getStoreStatus() {
+        return storeStatus;
+    }
+
+    public void setStoreStatus(int storeStatus) {
+        this.storeStatus = storeStatus;
+    }
 
     public String getUseRemark() {
         return useRemark;