111

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

@@ -65,6 +65,13 @@ public interface StaffClerkRelationApiService {
 	 * @param clerkId
 	 * @return
 	 */
+	StaffClerkRelationDTO getOneByStoreIdAndStaffId(String storeId,String staffId);
+	
+	/**
+	 * 查询导购信息
+	 * @param clerkId
+	 * @return
+	 */
 	StaffClerkRelationDTO getByClerkId(String clerkId);
 
 }

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

@@ -59,6 +59,8 @@ public interface TabHaobanStaffClerkRelationMapper {
     List<TabHaobanStaffClerkRelation> listByClerkIds(@Param("clerkIds") List<String> clerkIds);
 
     List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId")String storeId);
+    
+    TabHaobanStaffClerkRelation getOneByStoreIdAndStaffId(@Param("storeId")String storeId,@Param("staffId")String staffId);
 
     /**
      * 解绑

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

@@ -192,4 +192,14 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 		StaffClerkRelationDTO staffRelation = staffClerkRelatinService.getByClerkId(clerkId);
 		return staffRelation;
 	}
+	@Override
+	public StaffClerkRelationDTO getOneByStoreIdAndStaffId(String storeId,
+			String staffId) {
+		TabHaobanStaffClerkRelation tab  = tabHaobanStaffClerkRelationMapper.getOneByStoreIdAndStaffId(storeId,staffId);
+		if(tab == null){
+			return null;
+		}
+		StaffClerkRelationDTO dto = EntityUtil.changeEntity(StaffClerkRelationDTO.class, tab);
+		return dto;
+	}
 }

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

@@ -259,7 +259,15 @@
     where status_flag=1
     	  and store_id = #{storeId,jdbcType=VARCHAR}
   </select>
-
+  
+  <select id="getOneByStoreIdAndStaffId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where status_flag=1
+    	  and store_id = #{storeId,jdbcType=VARCHAR}
+    	  and staff_id = #{staffId,jdbcType=VARCHAR}
+  </select>
 
 
 

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

@@ -410,7 +410,7 @@ public class ClerkController extends WebBaseController{
 	}
 	//绑定
 	@RequestMapping("bind-staff")
-	public HaobanResponse bindStaff(String clerkId,String staffId,Integer auditType){
+	public HaobanResponse bindStaff(String clerkId,String staffId,String storeId,Integer auditType){
 		if(StringUtils.isAnyBlank(clerkId,staffId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
@@ -429,6 +429,11 @@ public class ClerkController extends WebBaseController{
 		if(auditDTO != null){
 			return resultResponse(HaoBanErrCode.ERR_10018);
 		}
+		StaffClerkRelationDTO haveclekCode = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId);
+		if(haveclekCode !=null){
+			return resultResponse(HaoBanErrCode.ERR_10020);
+		}
+		
 		StoreDTO store = storeService.getStore(clerk.getStoreId());
 		String clerkCode = clerk.getClerkCode();
 		String wxEnterpriseId = staff.getWxEnterpriseId();

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

@@ -208,6 +208,9 @@ public enum HaoBanErrCode {
     ERR_10018(10018,"审核记录已存在"),
 
     ERR_10019(10019,"没有配置secret"),
+    
+    ERR_10020(10020,"该用户已在该门店绑定过code"),
+
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),