Merge remote-tracking branch 'origin/feature-content4' into feature-content4

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

@@ -251,6 +251,8 @@ public class WxStaffController extends WebBaseController {
             } else {
                 vo.setBindFlag(0);
             }
+            long memberCount = customerApiService.countMember(enterpriseId, storeId, dto.getClerkId());
+            vo.setMemberCount(Convert.toInt(memberCount, 0));
             resultList.add(vo);
         }
         Page<StoreClerkVO> page = new Page();

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreClerkVO.java

@@ -18,6 +18,8 @@ public class StoreClerkVO implements Serializable {
     private String clerkImg;
     private String clerkName;
 
+	private Integer memberCount;
+
 	public String getClerkName() {
 		return clerkName;
 	}
@@ -60,7 +62,12 @@ public class StoreClerkVO implements Serializable {
 	public void setBindFlag(int bindFlag) {
 		this.bindFlag = bindFlag;
 	}
-    
 
-    
+	public Integer getMemberCount() {
+		return memberCount;
+	}
+
+	public void setMemberCount(Integer memberCount) {
+		this.memberCount = memberCount;
+	}
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/share/ContentMaterialLandingPageVO.java

@@ -51,6 +51,17 @@ public class ContentMaterialLandingPageVO implements Serializable {
      */
     private Integer shoppingCartNum;
 
+    /**
+     * 跳转穿搭社区开关
+     * 1 开启; 0关闭
+     */
+    private Integer communityJumpFlag;
+
+    /**
+     * 同款搭配数量
+     */
+    private Integer collocationNum;
+
 
     public ContentMaterialInfoVO getContentMaterialInfo() {
         return contentMaterialInfo;
@@ -99,4 +110,20 @@ public class ContentMaterialLandingPageVO implements Serializable {
     public void setShoppingCartNum(Integer shoppingCartNum) {
         this.shoppingCartNum = shoppingCartNum;
     }
+
+    public Integer getCollocationNum() {
+        return collocationNum;
+    }
+
+    public void setCollocationNum(Integer collocationNum) {
+        this.collocationNum = collocationNum;
+    }
+
+    public Integer getCommunityJumpFlag() {
+        return communityJumpFlag;
+    }
+
+    public void setCommunityJumpFlag(Integer communityJumpFlag) {
+        this.communityJumpFlag = communityJumpFlag;
+    }
 }