设置导购编辑权限以及提示刷新展示

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

@@ -15,6 +15,8 @@ public class ClerkMainStoreRelatedDTO implements Serializable{
 
     private Integer mainStoreFlag;
 
+    private Integer freshFriendFlag;
+
     private Integer statusFlag;
 
     private Date createTime;
@@ -23,6 +25,14 @@ public class ClerkMainStoreRelatedDTO implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
+    public Integer getFreshFriendFlag() {
+        return freshFriendFlag;
+    }
+
+    public void setFreshFriendFlag(Integer freshFriendFlag) {
+        this.freshFriendFlag = freshFriendFlag;
+    }
+
     public String getClerkMainStoreRelatedId() {
         return clerkMainStoreRelatedId;
     }

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

@@ -18,13 +18,25 @@ public class EnterpriseDetailDTO implements Serializable{
 	private String version;
 	private int nodeCount;
 	private String enterpriseLogo;
-	private String staffId;
+    /**
+     * 导购编辑权限
+     */
+    private Integer clerkEditFlag;
+    private String staffId;
 	private String staffName;
 	private Date createTime;
 	private String brandName;
 	private Integer wxEnterpriseType;
 	private Integer memberOpenCardFlag;
 
+    public Integer getClerkEditFlag() {
+        return clerkEditFlag;
+    }
+
+    public void setClerkEditFlag(Integer clerkEditFlag) {
+        this.clerkEditFlag = clerkEditFlag;
+    }
+
 	public Integer getWxEnterpriseType() {
 		return wxEnterpriseType;
 	}

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

@@ -42,9 +42,27 @@ public class MaterialDTO implements Serializable{
     private Date updateTime;
 
     private String fromMaterialId = "-1";
+    //appid  link路径  img_url 封面图 materialTitle
+    private String appId;
 
     private static final long serialVersionUID = 1L;
 
+    public String getMediaid() {
+        return mediaid;
+    }
+
+    public void setMediaid(String mediaid) {
+        this.mediaid = mediaid;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
     public String getFromMaterialId() {
         return fromMaterialId;
     }

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

@@ -35,6 +35,18 @@ public class StaffClerkInfoDTO implements Serializable{
     private Date updateTime;
 
     private String clerkPhoneNumber;
+    /**
+     * 是否主门店
+     */
+    private Integer mainStoreFlag;
+
+    public Integer getMainStoreFlag() {
+        return mainStoreFlag;
+    }
+
+    public void setMainStoreFlag(Integer mainStoreFlag) {
+        this.mainStoreFlag = mainStoreFlag;
+    }
 
     private static final long serialVersionUID = 1L;
 

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

@@ -8,4 +8,12 @@ public interface ClerkMainStoreRelatedApiService {
 
 	ClerkMainStoreRelatedDTO getWxEnterpriseIdAndStaffId(String wxEnterpriseId, String staffId);
 
+	/**
+	 * 设置刷新好友状态为已刷新
+	 *
+	 * @param wxEnterpriseId
+	 * @param staffId
+	 */
+	void setFreshFriend(String wxEnterpriseId, String staffId);
+
 }

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

@@ -134,4 +134,11 @@ public interface WxEnterpriseRelatedApiService {
      */
     public boolean initHistoryEnterprise(String wxEnterpriseId);
 
+    /**
+     * 初始化历史门店数据
+     *
+     * @return
+     */
+    public boolean setClerkEditFlag(String wxEnterprieseRelatedId, int clerkEditFlag);
+
 }

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

@@ -14,6 +14,8 @@ public class TabHaobanClerkMainStoreRelated implements Serializable {
 
     private Integer mainStoreFlag;
 
+    private Integer freshFriendFlag;
+
     private Integer statusFlag;
 
     private Date createTime;
@@ -22,6 +24,14 @@ public class TabHaobanClerkMainStoreRelated implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public Integer getFreshFriendFlag() {
+        return freshFriendFlag;
+    }
+
+    public void setFreshFriendFlag(Integer freshFriendFlag) {
+        this.freshFriendFlag = freshFriendFlag;
+    }
+
     public String getClerkMainStoreRelatedId() {
         return clerkMainStoreRelatedId;
     }

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

@@ -34,12 +34,22 @@ public class TabHaobanMaterial implements Serializable {
 
     private String link;
 
+    private String appId;
+
     private Date createTime;
 
     private Date updateTime;
 
     private String fromMaterialId;
 
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
     public String getFromMaterialId() {
         return fromMaterialId;
     }

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

@@ -28,7 +28,15 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
 
     private Integer rangeType;
 
+    private Integer clerkEditFlag;
 
+    public Integer getClerkEditFlag() {
+        return clerkEditFlag;
+    }
+
+    public void setClerkEditFlag(Integer clerkEditFlag) {
+        this.clerkEditFlag = clerkEditFlag;
+    }
 
     private static final long serialVersionUID = 1L;
 

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

@@ -27,4 +27,12 @@ public interface WxEnterpriseRelatedService {
 	 * @return
 	 */
 	TabHaobanWxEnterpriseRelated getByEnterpriseId(String wxEnterpriseId, String enterpriseId);
+
+	/**
+	 * 设置导购编辑权限
+	 *
+	 * @param id
+	 * @return
+	 */
+	void setClerkEdit(String id, int clerkEditFlag);
 }

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

@@ -13,6 +13,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -59,4 +60,14 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
     public TabHaobanWxEnterpriseRelated getByEnterpriseId(String wxEnterpriseId, String enterpriseId) {
         return mapper.findOneByEIdAndWxEid(enterpriseId, wxEnterpriseId);
     }
+
+    @Override
+    public void setClerkEdit(String id, int clerkEditFlag) {
+        TabHaobanWxEnterpriseRelated record = new TabHaobanWxEnterpriseRelated();
+        record.setClerkEditFlag(clerkEditFlag);
+        record.setWxEnterpriseRelatedId(id);
+        record.setUpdateTime(new Date());
+        mapper.updateByPrimaryKeySelective(record);
+
+    }
 }

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

@@ -33,4 +33,13 @@ public class ClerkMainStoreRelatedApiServiceImpl implements ClerkMainStoreRelate
 		return EntityUtil.changeEntityByJSON(ClerkMainStoreRelatedDTO.class, clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId));
 	}
 
+	@Override
+	public void setFreshFriend(String wxEnterpriseId, String staffId) {
+		TabHaobanClerkMainStoreRelated related = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+		if (related != null) {
+			related.setUpdateTime(new Date());
+			related.setFreshFriendFlag(1);
+			clerkMainStoreRelatedService.update(related);
+		}
+	}
 }

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

@@ -457,6 +457,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 			String midGroupId = null;
 
 			//如果是1的话 加入对应企业
+
 			if (midGroupIds.size() == 1) {
 				midGroupId = midGroupIds.iterator().next();
 			} else {
@@ -622,4 +623,10 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		}
         return true;
     }
+
+	@Override
+	public boolean setClerkEditFlag(String wxEnterprieseRelatedId, int clerkEditFlag) {
+		wxEnterpriseRelatedService.setClerkEdit(wxEnterprieseRelatedId, clerkEditFlag);
+		return true;
+	}
 }

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

@@ -7,12 +7,13 @@
     <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
     <result column="store_id" property="storeId" jdbcType="VARCHAR" />
     <result column="main_store_flag" property="mainStoreFlag" jdbcType="INTEGER" />
+    <result column="fresh_friend_flag" property="freshFriendFlag" jdbcType="INTEGER"/>
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    clerk_main_store_related_id, staff_id, wx_enterprise_id, store_id, main_store_flag, 
+    clerk_main_store_related_id, staff_id, wx_enterprise_id, store_id, main_store_flag, fresh_friend_flag,
     status_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -26,12 +27,13 @@
     where clerk_main_store_related_id = #{clerkMainStoreRelatedId,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated" >
-    insert into tab_haoban_clerk_main_store_related (clerk_main_store_related_id, staff_id, 
-      wx_enterprise_id, store_id, main_store_flag, 
+    insert into tab_haoban_clerk_main_store_related (clerk_main_store_related_id, staff_id,
+    wx_enterprise_id, store_id, main_store_flag, fresh_friend_flag,
       status_flag, create_time, update_time
       )
-    values (#{clerkMainStoreRelatedId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR}, 
-      #{wxEnterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR}, #{mainStoreFlag,jdbcType=INTEGER}, 
+    values (#{clerkMainStoreRelatedId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR},
+    #{wxEnterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR}, #{mainStoreFlag,jdbcType=INTEGER},
+    #{freshFriendFlag}
       #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -53,6 +55,9 @@
       <if test="mainStoreFlag != null" >
         main_store_flag,
       </if>
+      <if test="freshFriendFlag != null">
+        fresh_friend_flag,
+      </if>
       <if test="statusFlag != null" >
         status_flag,
       </if>
@@ -79,6 +84,9 @@
       <if test="mainStoreFlag != null" >
         #{mainStoreFlag,jdbcType=INTEGER},
       </if>
+      <if test="freshFriendFlag != null">
+        #{freshFriendFlag},
+      </if>
       <if test="statusFlag != null" >
         #{statusFlag,jdbcType=INTEGER},
       </if>
@@ -105,6 +113,9 @@
       <if test="mainStoreFlag != null" >
         main_store_flag = #{mainStoreFlag,jdbcType=INTEGER},
       </if>
+      <if test="freshFriendFlag != null">
+        fresh_friend_flag = #{freshFriendFlag,jdbcType=INTEGER},
+      </if>
       <if test="statusFlag != null" >
         status_flag = #{statusFlag,jdbcType=INTEGER},
       </if>
@@ -123,6 +134,7 @@
       wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
       store_id = #{storeId,jdbcType=VARCHAR},
       main_store_flag = #{mainStoreFlag,jdbcType=INTEGER},
+    fresh_friend_flag = #{freshFriendFlag,jdbcType=INTEGER},
       status_flag = #{statusFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -18,13 +18,14 @@
     <result column="material_desc" property="materialDesc" jdbcType="VARCHAR" />
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="link" property="link" jdbcType="VARCHAR" />
+    <result column="app_id" property="appId" jdbcType="VARCHAR"/>
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     material_id,from_material_id, material_title, material_type, category_id, material_content, wx_last_upload_time,
-    media_id, wx_enterprise_id, staff_id, staff_name, img_url, material_desc, status_flag, 
-    link, create_time, update_time,wx_img_url
+    media_id, wx_enterprise_id, staff_id, staff_name, img_url, material_desc, status_flag,
+    link,app_id, create_time, update_time,wx_img_url
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -51,15 +52,16 @@
     insert into tab_haoban_material (material_id, from_material_id, material_title, material_type,
       category_id, material_content, wx_last_upload_time, 
       media_id, wx_enterprise_id, staff_id, 
-      staff_name, img_url,wx_img_url, material_desc, 
-      status_flag, link, create_time, 
+      staff_name, img_url,wx_img_url, material_desc,
+    status_flag, link,app_id, create_time,
       update_time)
     values (#{materialId,jdbcType=VARCHAR},#{fromMaterialId}, #{materialTitle,jdbcType=VARCHAR},
     #{materialType,jdbcType=INTEGER},
       #{categoryId,jdbcType=VARCHAR}, #{materialContent,jdbcType=VARCHAR}, #{wxLastUploadTime,jdbcType=TIMESTAMP}, 
       #{mediaId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR}, 
-      #{staffName,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR},#{wxImgUrl,jdbcType=VARCHAR}, #{materialDesc,jdbcType=VARCHAR}, 
-      #{statusFlag,jdbcType=INTEGER}, #{link,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{staffName,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR},#{wxImgUrl,jdbcType=VARCHAR}, #{materialDesc,jdbcType=VARCHAR},
+    #{statusFlag,jdbcType=INTEGER}, #{link,jdbcType=VARCHAR},#{appId,jdbcType=VARCHAR},
+    #{createTime,jdbcType=TIMESTAMP},
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaterial" >
@@ -216,6 +218,9 @@
       <if test="link != null" >
         link = #{link,jdbcType=VARCHAR},
       </if>
+      <if test="appId != null">
+        app_id = #{appId,jdbcType=VARCHAR},
+      </if>
       <if test="createTime != null" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>

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

@@ -11,12 +11,13 @@
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
       <result column="wx_enterprise_type" property="wxEnterpriseType" jdbcType="INTEGER"/>
       <result column="member_open_card_flag" property="memberOpenCardFlag" jdbcType="INTEGER"/>
+    <result column="clerk_edit_flag" property="clerkEditFlag" jdbcType="INTEGER"/>
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
       wx_enterprise_related_id, wx_enterprise_id, enterprise_id, version, status_flag, wx_enterprise_type,
-      member_open_card_flag,
+    member_open_card_flag,clerk_edit_flag,
     create_time, update_time,staff_id,staff_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -61,6 +62,9 @@
         <if test="memberOpenCardFlag != null">
             member_open_card_flag,
         </if>
+      <if test="clerkEditFlag != null">
+        clerk_edit_flag,
+      </if>
       <if test="createTime != null" >
         create_time,
       </if>
@@ -96,6 +100,9 @@
         <if test="memberOpenCardFlag != null">
             #{memberOpenCardFlag,jdbcType=INTEGER},
         </if>
+      <if test="clerkEditFlag != null">
+        #{clerkEditFlag,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -131,6 +138,9 @@
       <if test="memberOpenCardFlag != null">
         member_open_card_flag = #{memberOpenCardFlag,jdbcType=INTEGER},
       </if>
+      <if test="clerkEditFlag != null">
+        clerk_edit_flag = #{clerkEditFlag,jdbcType=INTEGER},
+      </if>
       <if test="wxEnterpriseType != null">
         wx_enterprise_type = #{wxEnterpriseType,jdbcType=INTEGER},
       </if>

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

@@ -84,6 +84,9 @@ public class StaffController extends WebBaseController{
 	@Autowired
 	private EnterpriseService enterpriseService;
 
+	@Autowired
+	private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
+
 
 	@RequestMapping("staff-add")
 	public HaobanResponse staffAdd(StaffDTO staffDTO,String departmentIds){
@@ -293,6 +296,19 @@ public class StaffController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_10007);
 		}
 		List<StaffClerkInfoDTO> retList = staffClerkRelationApiService.listBindDetailByStaffId(staffId);
+		if (CollectionUtils.isEmpty(retList)) {
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}
+		ClerkMainStoreRelatedDTO mainStoreRelatedDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(staff.getWxEnterpriseId(), staffId);
+		if (null != mainStoreRelatedDTO) {
+			retList.forEach(dto -> {
+				if (dto.getStoreId().equals(mainStoreRelatedDTO.getStoreId())) {
+					dto.setMainStoreFlag(1);
+				} else {
+					dto.setMainStoreFlag(0);
+				}
+			});
+		}
 		return resultResponse(HaoBanErrCode.ERR_1,retList);
 	}
 

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

@@ -838,4 +838,20 @@ public class WxEnterpriseController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 
+	/**
+	 * 授权绑定-设置导购编辑权限
+	 *
+	 * @return
+	 */
+	@IgnoreLogin
+	@RequestMapping("set-clerk-edit")
+	public HaobanResponse setClerkEdit(String wxEnterprieseRelatedId, int clerkEditFlag) {
+		if (StringUtils.isBlank(wxEnterprieseRelatedId)) {
+			logger.info("缺少参数");
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		wxEnterpriseRelatedApiService.setClerkEditFlag(wxEnterprieseRelatedId, clerkEditFlag);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+
 }

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

@@ -186,7 +186,7 @@ public class ClerkController extends WebBaseController{
 		}
 		auditSettingVO.setMemberOpenCardFlag(enterpriseBindInfo.getMemberOpenCardFlag());
 		auditSettingVO.setWxEnterpriseType(enterpriseBindInfo.getWxEnterpriseType());
-
+		auditSettingVO.setFreshFriendFlag(mainStore.getFreshFriendFlag());
 		return resultResponse(HaoBanErrCode.ERR_1, auditSettingVO);
 	}
 	
@@ -454,6 +454,8 @@ public class ClerkController extends WebBaseController{
 				return resultResponse(HaoBanErrCode.ERR_10022);
 			}
 		}
+		//刷新状态变更
+		clerkMainStoreRelatedApiService.setFreshFriend(wxEnterpriseId, staffId);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 
@@ -736,6 +738,9 @@ public class ClerkController extends WebBaseController{
 		Map<String,Object> map = new HashMap<>();
 		map.put("bindList", bindList);
 		map.put("unBindList", unBindList);
+		WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, store.getEnterpriseId());
+//		map.put("clerkEditFlag",enterpriseBindInfo.get)
+		//todo 导购是否可编辑
 		return resultResponse(HaoBanErrCode.ERR_1,map);
 		
 	}

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

@@ -20,9 +20,18 @@ public class AuditSettingVO implements Serializable {
 
     private int wxEnterpriseType;
     private int memberOpenCardFlag;
+    private int freshFriendFlag;
 
     private static final long serialVersionUID = 1L;
 
+    public int getFreshFriendFlag() {
+        return freshFriendFlag;
+    }
+
+    public void setFreshFriendFlag(int freshFriendFlag) {
+        this.freshFriendFlag = freshFriendFlag;
+    }
+
     public int getWxEnterpriseType() {
         return wxEnterpriseType;
     }