fix

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ClerkMainStoreRelatedDTO implements Serializable{
+	
+	private String clerkMainStoreRelatedId;
+
+    private String staffId;
+
+    private String wxEnterpriseId;
+
+    private String storeId;
+
+    private Integer mainStoreFlag;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getClerkMainStoreRelatedId() {
+        return clerkMainStoreRelatedId;
+    }
+
+    public void setClerkMainStoreRelatedId(String clerkMainStoreRelatedId) {
+        this.clerkMainStoreRelatedId = clerkMainStoreRelatedId == null ? null : clerkMainStoreRelatedId.trim();
+    }
+
+
+    public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId == null ? null : storeId.trim();
+    }
+
+    public Integer getMainStoreFlag() {
+        return mainStoreFlag;
+    }
+
+    public void setMainStoreFlag(Integer mainStoreFlag) {
+        this.mainStoreFlag = mainStoreFlag;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}

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

+package com.gic.haoban.manage.api.service;
+
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+
+public interface ClerkMainStoreRelatedApiService {
+
+	void setMainStore(String staffId, String storeId, String wxEnterpriseId);
+
+	ClerkMainStoreRelatedDTO getWxEnterpriseIdAndStaffId(String wxEnterpriseId, String staffId);
+
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanClerkMainStoreRelatedMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 
 public interface TabHaobanClerkMainStoreRelatedMapper {
@@ -14,4 +16,6 @@ public interface TabHaobanClerkMainStoreRelatedMapper {
     int updateByPrimaryKeySelective(TabHaobanClerkMainStoreRelated record);
 
     int updateByPrimaryKey(TabHaobanClerkMainStoreRelated record);
+
+	TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(@Param("staffId")String staffId, @Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -6,9 +6,9 @@ import java.util.Date;
 public class TabHaobanClerkMainStoreRelated implements Serializable {
     private String clerkMainStoreRelatedId;
 
-    private String clerkId;
+    private String staffId;
 
-    private String enterpriseId;
+    private String wxEnterpriseId;
 
     private String storeId;
 
@@ -30,20 +30,21 @@ public class TabHaobanClerkMainStoreRelated implements Serializable {
         this.clerkMainStoreRelatedId = clerkMainStoreRelatedId == null ? null : clerkMainStoreRelatedId.trim();
     }
 
-    public String getClerkId() {
-        return clerkId;
+
+    public String getStaffId() {
+		return staffId;
 	}
 
-    public void setClerkId(String clerkId) {
-        this.clerkId = clerkId == null ? null : clerkId.trim();
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
 	}
 
-    public String getEnterpriseId() {
-        return enterpriseId;
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
 	}
 
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
 	}
 
 	public String getStoreId() {

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

+package com.gic.haoban.manage.service.service;
+
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+
+public interface ClerkMainStoreRelatedService {
+
+	void setMainStore(String staffId, String storeId, String wxEnterpriseId);
+
+	TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(String staffId, String wxEnterpriseId);
+
+	void update(TabHaobanClerkMainStoreRelated r);
+
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanClerkMainStoreRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+
+@Service
+public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedService {
+	
+	@Autowired
+	private TabHaobanClerkMainStoreRelatedMapper mapper;
+
+	@Override
+	public void setMainStore(String staffId, String storeId, String wxEnterpriseId) {
+		String uuId = com.gic.haoban.common.utils.StringUtil.randomUUID();
+		Date now = new Date();
+		TabHaobanClerkMainStoreRelated t = new TabHaobanClerkMainStoreRelated();
+		t.setStaffId(staffId);
+		t.setWxEnterpriseId(wxEnterpriseId);
+		t.setStoreId(storeId);
+		t.setCreateTime(now);
+		t.setUpdateTime(now);
+		t.setStatusFlag(1);
+		t.setClerkMainStoreRelatedId(uuId);
+		mapper.insert(t);
+		
+	}
+
+	@Override
+	public TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(String staffId, String wxEnterpriseId) {
+		return mapper.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId);
+	}
+
+	@Override
+	public void update(TabHaobanClerkMainStoreRelated r) {
+		r.setUpdateTime(new Date());
+		mapper.updateByPrimaryKeySelective(r);
+	}
+
+}

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

+package com.gic.haoban.manage.service.service.out.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+
+@Service
+public class ClerkMainStoreRelatedApiServiceImpl implements ClerkMainStoreRelatedApiService {
+	
+	@Autowired
+	ClerkMainStoreRelatedService clerkMainStoreRelatedService;
+	
+	@Override
+	public void setMainStore(String staffId, String storeId, String wxEnterpriseId) {
+		TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId);
+		if(r  != null){
+			r.setStoreId(storeId);
+			clerkMainStoreRelatedService.update(r);
+		}else{
+			clerkMainStoreRelatedService.setMainStore(staffId, storeId, wxEnterpriseId);
+		}
+	}
+
+	@Override
+	public ClerkMainStoreRelatedDTO getWxEnterpriseIdAndStaffId(String wxEnterpriseId, String staffId) {
+		return EntityUtil.changeEntityByJSON(ClerkMainStoreRelatedDTO.class, clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId,wxEnterpriseId));
+	}
+
+}

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

@@ -3,8 +3,8 @@
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanClerkMainStoreRelatedMapper" >
   <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated" >
     <id column="clerk_main_store_related_id" property="clerkMainStoreRelatedId" jdbcType="VARCHAR" />
-    <result column="clerk_id" property="clerkId" jdbcType="VARCHAR" />
-    <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" />
+    <result column="staff_id" property="staffId" jdbcType="VARCHAR" />
+    <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="status_flag" property="statusFlag" jdbcType="INTEGER" />
@@ -12,7 +12,7 @@
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    clerk_main_store_related_id, clerk_id, enterprise_id, store_id, main_store_flag, 
+    clerk_main_store_related_id, staff_id, wx_enterprise_id, store_id, main_store_flag, 
     status_flag, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -26,12 +26,12 @@
     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, clerk_id, 
-      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, 
       status_flag, create_time, update_time
       )
-    values (#{clerkMainStoreRelatedId,jdbcType=VARCHAR}, #{clerkId,jdbcType=VARCHAR}, 
-      #{enterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR}, #{mainStoreFlag,jdbcType=INTEGER}, 
+    values (#{clerkMainStoreRelatedId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR}, 
+      #{wxEnterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR}, #{mainStoreFlag,jdbcType=INTEGER}, 
       #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -41,11 +41,11 @@
       <if test="clerkMainStoreRelatedId != null" >
         clerk_main_store_related_id,
       </if>
-      <if test="clerkId != null" >
-        clerk_id,
+      <if test="staffId != null" >
+        staff_id,
       </if>
-      <if test="enterpriseId != null" >
-        enterprise_id,
+      <if test="wxEnterpriseId != null" >
+        wx_enterprise_id,
       </if>
       <if test="storeId != null" >
         store_id,
@@ -67,11 +67,11 @@
       <if test="clerkMainStoreRelatedId != null" >
         #{clerkMainStoreRelatedId,jdbcType=VARCHAR},
       </if>
-      <if test="clerkId != null" >
-        #{clerkId,jdbcType=VARCHAR},
+      <if test="staffId != null" >
+        #{staffId,jdbcType=VARCHAR},
       </if>
-      <if test="enterpriseId != null" >
-        #{enterpriseId,jdbcType=VARCHAR},
+      <if test="wxEnterpriseId != null" >
+        #{wxEnterpriseId,jdbcType=VARCHAR},
       </if>
       <if test="storeId != null" >
         #{storeId,jdbcType=VARCHAR},
@@ -93,11 +93,11 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated" >
     update tab_haoban_clerk_main_store_related
     <set >
-      <if test="clerkId != null" >
-        clerk_id = #{clerkId,jdbcType=VARCHAR},
+      <if test="staffId != null" >
+        staff_id = #{staffId,jdbcType=VARCHAR},
       </if>
-      <if test="enterpriseId != null" >
-        enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      <if test="wxEnterpriseId != null" >
+        wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
       </if>
       <if test="storeId != null" >
         store_id = #{storeId,jdbcType=VARCHAR},
@@ -119,8 +119,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated" >
     update tab_haoban_clerk_main_store_related
-    set clerk_id = #{clerkId,jdbcType=VARCHAR},
-      enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+    set staff_id = #{staffId,jdbcType=VARCHAR},
+      wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
       store_id = #{storeId,jdbcType=VARCHAR},
       main_store_flag = #{mainStoreFlag,jdbcType=INTEGER},
       status_flag = #{statusFlag,jdbcType=INTEGER},
@@ -128,4 +128,14 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where clerk_main_store_related_id = #{clerkMainStoreRelatedId,jdbcType=VARCHAR}
   </update>
+  
+  <select id="selectByWxEnterpriseIdAndStoreId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_clerk_main_store_related
+    where staff_id = #{staffId,jdbcType=VARCHAR}
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+    limit 1
+  </select>
 </mapper>
\ No newline at end of file

haoban-manage3-wx/pom.xml

@@ -220,6 +220,12 @@
 			<artifactId>gic-quartz-api</artifactId>
 			<version>${gic-quartz-api}</version>
 		</dependency>
+		
+		<dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>haoban-app-customer-api</artifactId>
+            <version>${haoban-app-customer-api}</version>
+        </dependency>
 	</dependencies>
 
 	<build>

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

@@ -19,14 +19,19 @@ import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.BindApiService;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
@@ -35,6 +40,7 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.interceptor.WebInterceptor;
 import com.gic.haoban.manage.web.vo.ClerkVo;
 import com.gic.haoban.manage.web.vo.StoreVO;
+import com.gic.redis.data.util.RedisUtil;
 
 @RestController
 public class ClerkController extends WebBaseController{
@@ -52,6 +58,12 @@ public class ClerkController extends WebBaseController{
 	private DepartmentApiService departmentApiService;
 	@Autowired
 	private BindApiService bindApiService;
+	@Autowired
+	private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi;
+	@Autowired
+	private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
+	@Autowired
+	private DistributeApiService distributeApiService;
 	
 	//导购列表
 	@RequestMapping("/clerk-list")
@@ -212,4 +224,87 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 	
 	}
+	
+	//新增店员
+	@RequestMapping("/satff-add")
+	public HaobanResponse staffAdd(StaffDTO staffDTO,String storeId,String clerkCode) {
+		String wxEnterpriseId = staffDTO.getWxEnterpriseId();
+		String staffName = staffDTO.getStaffName();
+		String phoneNumber = staffDTO.getPhoneNumber();
+		String nationcode = staffDTO.getNationCode();
+		String postion = staffDTO.getPostion();
+		Integer sex = staffDTO.getSex();
+		staffDTO.setWxEnterpriseId(wxEnterpriseId);
+		if(StringUtils.isBlank(staffName)) {
+			return resultResponse(HaoBanErrCode.ERR_10004);
+		}
+		StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);
+		if(staff != null) {
+			return resultResponse(HaoBanErrCode.ERR_10005);
+		}
+		syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	
+	//删除店员
+	@RequestMapping("/staff-del")
+	public HaobanResponse staffDel(String staffDepartmentRelatedId,String storeId) {
+		DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(storeId);
+		if(departmentDTO == null){
+			return resultResponse(HaoBanErrCode.ERR_10006);
+		}
+		StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		if(related == null){
+			return resultResponse(HaoBanErrCode.ERR_10006);
+		}
+		if(StringUtils.isBlank(related.getClerkCode())){
+			staffApiService.del(staffDepartmentRelatedId);
+		}else{
+			ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
+			if(clerk != null && distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId) == 0){
+				syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
+			}
+		}
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	
+	
+	//设置主导购
+	@RequestMapping("/set-main-store")
+	public HaobanResponse setMainStore(String staffId,String storeId,String wxEnterpriseId,String staffDepartmentRelatedId) {
+		StaffDTO staff = staffApiService.selectById(staffId);
+		String yyyyMM = DateUtil.dateToStr(new Date(), "yyyyMM");
+		if(staff == null){
+			return resultResponse(HaoBanErrCode.ERR_10006);
+		}
+		String key = "haoban_set_main_store_" + yyyyMM + staffId;
+		Object hasSet = RedisUtil.getCache(key);
+		if(hasSet == null){
+			RedisUtil.setCache(key,true,31 * 24 * 60 * 60l);
+			clerkMainStoreRelatedApiService.setMainStore(staffId,storeId,wxEnterpriseId);
+		}else{
+			return resultResponse(HaoBanErrCode.ERR_10007);
+		}
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	
+	//刷新微信好友
+	@RequestMapping("/fresh-wx-friend")
+	public HaobanResponse freshWxFrend(String staffId,String storeId,String wxEnterpriseId,String staffDepartmentRelatedId,String wxUserId) {
+		StaffDTO staff = staffApiService.selectById(staffId);
+		String yyyyMM = DateUtil.dateToStr(new Date(), "yyyyMM");
+		if(staff == null){
+			return resultResponse(HaoBanErrCode.ERR_10006);
+		}
+		String key = "haoban_set_main_store_" + yyyyMM + staffId;
+		Object hasSet = RedisUtil.getCache(key);
+		if(hasSet == null){
+			RedisUtil.setCache(key,true,31 * 24 * 60 * 60l);
+			clerkMainStoreRelatedApiService.setMainStore(staffId,storeId,wxEnterpriseId);
+		}else{
+			return resultResponse(HaoBanErrCode.ERR_10007);
+		}
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	
 }

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

@@ -36,12 +36,14 @@ import com.gic.haoban.data.api.dto.HaobanDataDTO;
 import com.gic.haoban.data.api.service.HaobanDataApiService;
 import com.gic.haoban.manage.api.dto.AuditDTO;
 import com.gic.haoban.manage.api.dto.AuditSettingDTO;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.enums.StoreFieldEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.AuditSettingApiService;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
@@ -73,6 +75,8 @@ public class StoreController extends WebBaseController{
 	private AuditApiService auditApiService;
 	@Autowired
 	private AuditSettingApiService auditSettingApiService;
+	@Autowired
+	private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
 	//门店列表
 	@RequestMapping("/store-list")
 	public HaobanResponse storeList(String staffId,String wxEnterpriseId) {
@@ -121,6 +125,8 @@ public class StoreController extends WebBaseController{
 				}
 			}
 		}
+		
+		ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId,staffId);
 		//3、判断是否是店长
 		for(StoreVO VO : resultList){
 			//查gic门店
@@ -149,6 +155,12 @@ public class StoreController extends WebBaseController{
 			if(CollectionUtil.isNotEmpty(imgList)){
 				VO.setStoreImg(imgList.get(0).getQcloudImageUrl());;
 			}
+			
+			if(mainStore != null && mainStore.getStoreId().equals(VO.getStoreId())){
+				VO.setMainStoreFlag(1);
+			}else{
+				VO.setMainStoreFlag(0);
+			}
 		}
 		if(CollectionUtils.isNotEmpty(resultList)){
 			Map<Integer,StoreVO> map = com.gic.commons.util.CollectionUtil.toMap(resultList, "clerkType");
@@ -312,6 +324,13 @@ public class StoreController extends WebBaseController{
 		if(vo.getStoreArea() == null||vo.getStoreArea()==-1 ){
 			vo.setStoreArea(-1d);
 		}
+		
+		ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(staffDepartmentRelatedDTO.getWxEnterpriseId(),staffDepartmentRelatedDTO.getStaffId());
+		if(mainStore != null && mainStore.getStoreId().equals(storeId)){
+			vo.setMainStoreFlag(1);
+		}else{
+			vo.setMainStoreFlag(0);
+		}
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}
 	

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

@@ -36,6 +36,14 @@ public class WebBaseController {
         return resultResponse(errCode, null, null);
     }
     
+    public HaobanResponse resultResponse(HaoBanErrCode errCode, String message,Object data,String detailError) {
+        HaobanResponse response = new HaobanResponse();
+        response.setMessage(message);
+        response.setDetailError(detailError);
+        response.setErrorCode(errCode.getCode());
+        return response;
+    }
+
     /**
      * 获取登陆信息
      *

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -186,6 +186,11 @@ public enum HaoBanErrCode {
     ERR_600001(600001, "成员不存在,请联系管理员后台授权通讯录权限"),
     ERR_600002(600002, "无手机号"),
     
+    ERR_10004(10004,"成员名称不能为空"),
+    ERR_10005(10005,"成员已存在"),
+    ERR_10006(10006,"成员不存在"),
+    ERR_10007(10007,"本月已经设置过主导购"),
+
     
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

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

@@ -43,6 +43,8 @@ public class StoreDetailVO implements Serializable {
     
     private Integer auditFlag = 0;
     
+    private Integer MainStoreFlag;
+
 	public Integer getAuditFlag() {
 		return auditFlag;
 	}
@@ -230,4 +232,14 @@ public class StoreDetailVO implements Serializable {
 		this.storeArea = storeArea;
 	}
 
+	public Integer getMainStoreFlag() {
+		return MainStoreFlag;
+	}
+
+	public void setMainStoreFlag(Integer mainStoreFlag) {
+		MainStoreFlag = mainStoreFlag;
+	}
+	
+	
+
 }

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

@@ -24,6 +24,7 @@ public class StoreVO implements Serializable {
     private int clerkType;
     private String wxEnterpriseRelatedId;
     private Date  createTime;
+    private Integer mainStoreFlag;
 
 	public Date getCreateTime() {
 		return createTime;
@@ -110,6 +111,12 @@ public class StoreVO implements Serializable {
 	public void setWxEnterpriseRelatedId(String wxEnterpriseRelatedId) {
 		this.wxEnterpriseRelatedId = wxEnterpriseRelatedId;
 	}
+	public Integer getMainStoreFlag() {
+		return mainStoreFlag;
+	}
+	public void setMainStoreFlag(Integer mainStoreFlag) {
+		this.mainStoreFlag = mainStoreFlag;
+	}
 
     
 }

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -36,6 +36,10 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationSettingApiService" id="applicationSettingApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService" id="memberUnionidRelatedApiService"/>
 	
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService" id="clerkMainStoreRelatedApiService"/>
+	
+	<dubbo:reference interface="com.gic.haoban.app.customer.service.api.service.DistributeApiService" id="distributeApiService"/>
+	
 	
 	<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/>