Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -192,8 +192,8 @@
   <update id="deleteCode" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated" >
     update tab_haoban_staff_department_related
     set 
-      clerk_code = ''
-      and update_time = #{updateTime,jdbcType=TIMESTAMP}
+      clerk_code = '',
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
     where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
   </update>
   

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

@@ -84,10 +84,12 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员绑定
 	@RequestMapping("/staff-bind")
-	public HaobanResponse staffBind(String oldClerkCode,String toClerkCode,String fromStaffDepartmentRelatedId) {
-		if(StringUtils.isAnyBlank(oldClerkCode,toClerkCode,fromStaffDepartmentRelatedId)){
+	public HaobanResponse staffBind(String toClerkCode,String fromStaffDepartmentRelatedId) {
+		if(StringUtils.isAnyBlank(toClerkCode,fromStaffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
+
 		//将指定人绑定clerkCode
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
@@ -95,7 +97,6 @@ public class ClerkController extends WebBaseController{
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
 		//更新gic数据
-		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
 		DepartmentDTO departmentDTO = departmentApiService.selectById(staffDepartmentRelatedDTO.getDepartmentId());
 		String storeId = departmentDTO.getRelatedId();
 		List<String> clerkCodes = new ArrayList<>();
@@ -108,12 +109,15 @@ public class ClerkController extends WebBaseController{
 			clerkService.updateClerk(clerkDTO);
 		}
 		//清空gic原来的手机号
-		List<String> oldClerkCodes = new ArrayList<>();
-		oldClerkCodes.add(oldClerkCode);
-		List<ClerkDTO> oldList = clerkService.listClerk(storeId, oldClerkCodes, true);
-		for(ClerkDTO clerkDTO :oldList){
-			clerkDTO.setPhoneNumber("--");
-			clerkService.updateClerk(clerkDTO);
+		if(StringUtils.isNotBlank(staffDepartmentRelatedDTO.getClerkCode())){
+			List<String> oldClerkCodes = new ArrayList<>();
+			oldClerkCodes.add(staffDepartmentRelatedDTO.getClerkCode());
+			List<ClerkDTO> oldList = clerkService.listClerk(storeId, oldClerkCodes, true);
+			for(ClerkDTO clerkDTO :oldList){
+				clerkDTO.setPhoneNumber("--");
+				clerkDTO.setClerkName("--");
+				clerkService.updateClerk(clerkDTO);
+			}
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}

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

@@ -159,6 +159,21 @@ public class ClerkController extends WebBaseController{
 		if(StringUtils.isAnyBlank(departmentId,fromClerkCode,fromStaffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		StaffDepartmentRelatedDTO oldStaffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
+		if(oldStaffDepartmentRelatedDTO!=null){
+			//删除gic测的手机号和姓名
+			String clerkCode = oldStaffDepartmentRelatedDTO.getClerkCode();
+			DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+			String storeId = departmentDTO.getRelatedId();
+			List<String> clerkCodes = new ArrayList<>();
+			clerkCodes.add(clerkCode);
+			List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
+			for(ClerkDTO clerkDTO :list){
+				clerkDTO.setPhoneNumber("--");
+				clerkDTO.setClerkName("--");
+				clerkService.updateClerk(clerkDTO);
+			}
+		}
 		//将指定人绑定clerkCode
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);

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

@@ -141,7 +141,7 @@ public class StoreController extends WebBaseController{
 	}
 	//获取门店详情
 	@RequestMapping("/store-detail")
-	public HaobanResponse storeDetail(String storeId) {
+	public HaobanResponse storeDetail(String storeId,String staffDepartmentRelatedId) {
 		if(StringUtils.isAnyBlank(storeId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
@@ -160,6 +160,10 @@ public class StoreController extends WebBaseController{
 			vo.setCloseTimeStr(sdf.format(vo.getCloseTime()));
 		}
 		vo.setStoreAddress(store.getFullArea()+" "+store.getStoreAddress());
+		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		vo.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
+		vo.setBindFlag(StringUtils.isEmpty(staffDepartmentRelatedDTO.getClerkCode())?0:1);
+		
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}
 	

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

@@ -13,6 +13,8 @@ public class StoreDetailVO implements Serializable {
      */
     private static final long serialVersionUID = -2084664462494949485L;
     // Fields
+    private String clerkCode;
+    private int bindFlag;
     private String storeId;
     private String storeName;
     private String storeCode;
@@ -36,6 +38,23 @@ public class StoreDetailVO implements Serializable {
 
     private Double storeArea;
 
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+
+
+	public int getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(int bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
 	public String getStoreId() {
 		return storeId;
 	}