111

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

@@ -30,4 +30,16 @@ public interface StaffClerkRelationApiService {
 
 	String insert(StaffClerkRelationDTO staffClerkRelation);
 
+	/**
+	 * 解绑
+	 * @param storeId
+	 * @param clerkCode
+	 * @return
+	 */
+	String delByStoreIdAndCode(String storeId,String clerkCode);
+	
+	
+	List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds);
+
+
 }

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

@@ -49,4 +49,11 @@ public interface TabHaobanStaffClerkRelationMapper {
     TabHaobanStaffClerkRelation getBindByClerkId(@Param("clerkId") String clerkId,@Param("wxEnterpriseId") String wxEnterpriseId);
     
     TabHaobanStaffClerkRelation getByCodeAndEnterpriseId(@Param("clerkCode")String clerkCode, @Param("enterpriseId")String enterpriseId);
+    /**
+     * 解绑
+     */
+    void delByStoreIdAndCode( @Param("storeId")String storeId,@Param("clerkCode")String clerkCode);
+    
+    
+    List<TabHaobanStaffClerkRelation> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
@@ -14,12 +17,15 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 
 @Service
@@ -36,7 +42,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
 	@Autowired
 	private StoreService storeService;
-
+	@Autowired
+	private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper;
 	@Override
 	public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
 		return staffClerkRelatinService.listBindCode(enterpriseId,clerkCodeList);
@@ -113,4 +120,18 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	public String insert(StaffClerkRelationDTO staffClerkRelation) {
 		return staffClerkRelatinService.insert(staffClerkRelation);
 	}
+	@Override
+	public String delByStoreIdAndCode(String storeId, String clerkCode) {
+		tabHaobanStaffClerkRelationMapper.delByStoreIdAndCode(storeId,clerkCode);
+		return null;
+	}
+	@Override
+	public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds) {
+		List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds);
+		if(CollectionUtil.isEmpty(list)){
+			return new ArrayList<StaffClerkRelationDTO>();
+		}
+		List<StaffClerkRelationDTO> result = EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, list);
+		return result;
+	}
 }

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

@@ -192,7 +192,7 @@
     set
     status_flag = #{status},
     update_time = now()
-    where clerk_id = #{clerkId,jdbcType=VARCHAR} and status!=#{status}
+    where clerk_id = #{clerkId,jdbcType=VARCHAR} and status_flag!=#{status}
   </update>
 
   <update id="updateByClerkId" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation" >
@@ -221,4 +221,26 @@
     and enterprise_id = #{enterpriseId}
     and clerk_code = #{clerkCode}
       </select>
+      
+ <update id="delByStoreIdAndCode" >
+    update tab_haoban_staff_clerk_relation
+    set
+    status_flag = 0,
+    update_time = now()
+    where clerk_code = #{clerkCode,jdbcType=VARCHAR} 
+    		and store_id = #{storeId,jdbcType=VARCHAR} 
+    		and status_flag =1
+  </update>
+  
+    <select id="listByClerkIds" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where status=1
+	    and clerk_id in 
+	    <foreach collection="clerkIds" item="id" index="index" open="(" close=")" separator=",">
+	      #{id,jdbcType=VARCHAR}
+	    </foreach>
+  </select>
+  
 </mapper>
\ No newline at end of file

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

@@ -35,6 +35,7 @@ import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.AuditDTO;
+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.MemberUnionidRelatedDTO;
@@ -58,6 +59,7 @@ import com.gic.haoban.manage.web.interceptor.WebInterceptor;
 import com.gic.haoban.manage.web.vo.BindClerkVO;
 import com.gic.haoban.manage.web.vo.ClerkStoreVO;
 import com.gic.haoban.manage.web.vo.ClerkVo;
+import com.gic.haoban.manage.web.vo.StaffStoreVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -96,7 +98,6 @@ public class ClerkController extends WebBaseController{
 	private StaffClerkRelationApiService staffClerkRelationApiService;
 	@Autowired
 	private ClerkNewService clerkNewService;
-	
 	//导购列表
 	@RequestMapping("/clerk-list")
 	public HaobanResponse clerkList(String storeId,String bindFlag,String departmentId) {
@@ -493,6 +494,10 @@ public class ClerkController extends WebBaseController{
 		}
 		List<EnterpriseDTO> enterpriselist = enterpriseService.listEnterpriseByIds(enterpriseIdList);
 		Map<String,EnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterpriselist,"enterpriseId");
+		List<String> clerkIds = clerkList.stream().map(s->s.getClerkId()).collect(Collectors.toList());
+		List<StaffClerkRelationDTO> clerkRelations = staffClerkRelationApiService.listByClerkIds(clerkIds);
+		Map<String,StaffClerkRelationDTO> clerkBindMap = com.gic.commons.util.CollectionUtil.toMap(clerkRelations, "clerkId");
+		
 		for (ClerkDTO clerk : clerkList) {
 			String enterpriseId = clerk.getEnterpriseId();
 			EnterpriseDTO enterpriseDTO = map.get(enterpriseId);
@@ -506,17 +511,19 @@ public class ClerkController extends WebBaseController{
 			vo.setNationCode(clerk.getNationcode());
 			StoreDTO store = storeService.getStore(clerk.getStoreId());
 			vo.setStoreName(store == null?"":store.getStoreName());
+			vo.setStoreAddress(store == null?"":store.getStoreAddress());
+			vo.setBindFlag(clerkBindMap.get(clerk.getClerkId())==null ? 0:1);
 			clerkStoreList.add(vo);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,clerkStoreList);
 	}
-	
+	//绑定
 	@RequestMapping("bind-staff")
-	public HaobanResponse bindStaff(String clerkId,String clerkCode,String staffId,String wxUserId,String wxEnterpriseId,Integer auditType,Integer commitType){
-		if(StringUtils.isAnyBlank(clerkId,clerkCode,staffId,wxUserId,wxEnterpriseId)){
+	public HaobanResponse bindStaff(String clerkId,String staffId,Integer auditType){
+		if(StringUtils.isAnyBlank(clerkId,staffId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		if(auditType == null || commitType == null){
+		if(auditType == null ){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		ClerkDTO clerk = clerkService.getclerkById(clerkId);
@@ -528,39 +535,54 @@ public class ClerkController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_10006);
 		}
 		StoreDTO store = storeService.getStore(clerk.getStoreId());
-		AuditDTO audit = new AuditDTO();
-		audit.setCommitName(clerk.getClerkName());
-		audit.setCommitStaffId(staffId);
-		audit.setCommitStaffImg(staff.getHeadImg());
-		audit.setCommitStoreId(clerk.getStoreId());
-		audit.setCommitStoreName(store.getStoreName());
-		audit.setAuditStatus(0);
-		
-		JSONObject json = new JSONObject();
-		json.put("clerkId", clerkId);
-		json.put("clerkCode", clerkCode);
-		json.put("clerkName", clerk.getClerkName());
-		json.put("staffName", staff.getStaffName());
-		json.put("staffId", staffId);
-		json.put("wxUserId", wxUserId);
-		json.put("headPic", staff.getHeadImg());
-		audit.setOldValue(json.toJSONString());
-		audit.setCommitTime(new Date());
-		
-		audit.setAuditType(2);
-		
-		auditApiService.insert(audit);
-		
-		return resultResponse(HaoBanErrCode.ERR_1);
-	}
-	
-	
-	@RequestMapping("clerk-bind-staff")
-	public HaobanResponse clerkBindStaff(String clerkId,String clerkCode,String staffId,String wxUserId,String wxEnterpriseId,Integer auditType,Integer commitType){
-		if(StringUtils.isAnyBlank(clerkId,clerkCode,staffId,wxUserId,wxEnterpriseId)){
-			return resultResponse(HaoBanErrCode.ERR_2);
+		String clerkCode = clerk.getClerkCode();
+		String wxEnterpriseId = staff.getWxEnterpriseId();
+		String wxUserId = staff.getWxUserId();
+		StaffClerkRelationDTO staffClerkRelation  = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode,store.getEnterpriseId());
+		if(staffClerkRelation != null){
+			return resultResponse(HaoBanErrCode.ERR_111117);
 		}
-		if(auditType == null || commitType == null){
+		if(auditType == 2){
+			//无需审核
+			staffClerkRelation = new StaffClerkRelationDTO();
+			staffClerkRelation.setClerkId(clerkId);
+			staffClerkRelation.setClerkCode(clerkCode);
+			staffClerkRelation.setStoreId(clerk.getStoreId());
+			staffClerkRelation.setEnterpriseId(clerk.getEnterpriseId());
+			staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
+			staffClerkRelation.setWxUserId(wxUserId);
+			staffClerkRelation.setStaffId(staffId);
+			staffClerkRelationApiService.insert(staffClerkRelation);
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}else{
+			//需要审核
+			AuditDTO audit = new AuditDTO();
+			audit.setCommitName(clerk.getClerkName());
+			audit.setCommitStaffId(staffId);
+			audit.setCommitStaffImg(staff.getHeadImg());
+			audit.setCommitStoreId(clerk.getStoreId());
+			audit.setCommitStoreName(store.getStoreName());
+			audit.setAuditStatus(0);
+			
+			JSONObject json = new JSONObject();
+			json.put("clerkId", clerkId);
+			json.put("clerkCode", clerkCode);
+			json.put("clerkName", clerk.getClerkName());
+			json.put("staffName", staff.getStaffName());
+			json.put("staffId", staffId);
+			json.put("wxUserId", wxUserId);
+			json.put("headPic", staff.getHeadImg());
+			audit.setOldValue(json.toJSONString());
+			audit.setCommitTime(new Date());
+			audit.setAuditType(2);
+			auditApiService.insert(audit);
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}
+	}
+	//解绑
+	@RequestMapping("unbind-staff")
+	public HaobanResponse unBindStaff(String clerkId,String clerkCode,String staffId,String storeId){
+		if(StringUtils.isAnyBlank(clerkId,clerkCode,staffId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		ClerkDTO clerk = clerkService.getclerkById(clerkId);
@@ -572,18 +594,19 @@ public class ClerkController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_10006);
 		}
 		StoreDTO store = storeService.getStore(clerk.getStoreId());
+		StaffClerkRelationDTO staffClerkRelation  = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode,store.getEnterpriseId());
+		if(staffClerkRelation == null){
+			return resultResponse(HaoBanErrCode.ERR_111145);
+		}
+		
+		//解绑无需审核，只插入记录即可
 		AuditDTO audit = new AuditDTO();
 		audit.setCommitName(clerk.getClerkName());
 		audit.setCommitStaffId(staffId);
 		audit.setCommitStaffImg(staff.getHeadImg());
 		audit.setCommitStoreId(clerk.getStoreId());
 		audit.setCommitStoreName(store.getStoreName());
-		audit.setAuditStatus(0);
-		
-		StaffClerkRelationDTO staffClerkRelation  = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode,store.getEnterpriseId());
-		if(staffClerkRelation != null){
-			return resultResponse(HaoBanErrCode.ERR_111117);
-		}
+		audit.setAuditStatus(1);
 		
 		JSONObject json = new JSONObject();
 		json.put("clerkId", clerkId);
@@ -591,19 +614,18 @@ public class ClerkController extends WebBaseController{
 		json.put("clerkName", clerk.getClerkName());
 		json.put("staffName", staff.getStaffName());
 		json.put("staffId", staffId);
-		json.put("wxUserId", wxUserId);
 		json.put("headPic", staff.getHeadImg());
-		json.put("enterpriseId", clerk.getEnterpriseId());
 		audit.setOldValue(json.toJSONString());
 		audit.setCommitTime(new Date());
-		
+		audit.setAuditName(staff.getStaffName());
 		audit.setAuditType(2);
-		
 		auditApiService.insert(audit);
 		
+		staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
-	
+
+	//门店导购列表
 	@RequestMapping("store-clerk-list")
 	public HaobanResponse storeClerkList(String storeId,String wxEnterpriseId){
 		if(StringUtils.isAnyBlank(storeId,wxEnterpriseId)){
@@ -632,19 +654,42 @@ public class ClerkController extends WebBaseController{
 		
 	}
 	
-	
+	//门店列表
 	@RequestMapping("staff-store-list")
 	public HaobanResponse staffStoreList(String staffId,String wxEnterpriseId){
 		if(StringUtils.isAnyBlank(staffId,wxEnterpriseId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		List<StaffStoreVO> list = new ArrayList<>();
 		List<EnterpriseDetailDTO> enterpriseList = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
 		List<String> enterpriseIdList = enterpriseList.stream().map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
 		List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCodeByStaffId(enterpriseIdList, staffId);
+		//主门店
+		ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
+		String storeId = mainDTO.getStoreId();
 		for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
 			ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
 			if(clerk != null){
 				StoreDTO store = storeService.getStore(clerk.getStoreId());
+				//主门店标志
+				int mainStoreFlag  = 0;
+				if(storeId.equals(store.getStoreId())){
+					mainStoreFlag = 1;
+				}
+				staffDepartmentRelatedApiService.listByStaffId(staffId);
+				StaffStoreVO vo = new StaffStoreVO();
+				vo.setClerkCode(clerk.getClerkCode());
+				vo.setClerkId(clerk.getClerkId());
+				vo.setClerkType(clerk.getClerkType());
+				vo.setEnterpriseId(clerk.getEnterpriseId());
+				vo.setMainStoreFlag(mainStoreFlag);
+				vo.setPhoneNumber(clerk.getPhoneNumber());
+				vo.setStaffId(staffId);
+				vo.setStoreId(clerk.getStoreId());
+				vo.setStoreImg(store.getStoreImage());
+				vo.setStoreName(store.getStoreName());
+				vo.setWxEnterpriseId(wxEnterpriseId);
+				list.add(vo);
 			}
 		}
 		

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

@@ -177,6 +177,7 @@ public enum HaoBanErrCode {
     ERR_111143(111143,"code或者手机号码已存在"),
     
     ERR_111144(111144,"该企业或品牌已关联"),
+    ERR_111145(111145, "已经解绑过了"),
 
     // 企业设置
     ERR_200001(200001, "员工不存在"),

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

@@ -22,6 +22,26 @@ public class ClerkStoreVO implements Serializable{
 	
 	private String headImg;
 
+	private String storeAddress;
+
+	private Integer bindFlag;
+
+	public String getStoreAddress() {
+		return storeAddress;
+	}
+
+	public void setStoreAddress(String storeAddress) {
+		this.storeAddress = storeAddress;
+	}
+
+	public Integer getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(Integer bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
 	public String getClerkName() {
 		return clerkName;
 	}

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class StaffStoreVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String storeId;
+    private String staffId;
+    private String storeName;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String clerkCode;
+    private String clerkId;
+    private String storeImg;
+    private int clerkType;
+    private Integer mainStoreFlag;
+    private String phoneNumber;
+
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+	public String getDepartmentId() {
+		return departmentId;
+	}
+	public void setDepartmentId(String departmentId) {
+		this.departmentId = departmentId;
+	}
+	public String getStoreId() {
+		return storeId;
+	}
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+	public String getStaffId() {
+		return staffId;
+	}
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+	public String getStoreName() {
+		return storeName;
+	}
+	public void setStoreName(String storeName) {
+		this.storeName = storeName;
+	}
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+	public String getClerkCode() {
+		return clerkCode;
+	}
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+	public String getClerkId() {
+		return clerkId;
+	}
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
+	public String getStoreImg() {
+		return storeImg;
+	}
+	public void setStoreImg(String storeImg) {
+		this.storeImg = storeImg;
+	}
+	public int getClerkType() {
+		return clerkType;
+	}
+	public void setClerkType(int clerkType) {
+		this.clerkType = clerkType;
+	}
+	public Integer getMainStoreFlag() {
+		return mainStoreFlag;
+	}
+	public void setMainStoreFlag(Integer mainStoreFlag) {
+		this.mainStoreFlag = mainStoreFlag;
+	}
+    
+
+    
+}