Commit 89b6cad8 by huangZW

111

parent 4a05106d
......@@ -155,8 +155,8 @@ public class ClerkController extends WebBaseController{
}
//成员绑定
@RequestMapping("/staff-bind")
public HaobanResponse staffBind(String fromClerkCode,String fromStaffDepartmentRelatedId) {
if(StringUtils.isAnyBlank(fromClerkCode,fromStaffDepartmentRelatedId)){
public HaobanResponse staffBind(String departmentId,String fromClerkCode,String fromStaffDepartmentRelatedId) {
if(StringUtils.isAnyBlank(departmentId,fromClerkCode,fromStaffDepartmentRelatedId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
//将指定人绑定clerkCode
......@@ -165,6 +165,22 @@ public class ClerkController extends WebBaseController{
dto.setClerkCode(fromClerkCode);
dto.setUpdateTime(new Date());
staffDepartmentRelatedApiService.updateById(dto);
//更新gic数据
DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
String storeId = departmentDTO.getRelatedId();
List<String> clerkCodes = new ArrayList<>();
clerkCodes.add(fromClerkCode);
List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
StaffDTO staffDTO = staffApiService.selectById(staffDepartmentRelatedDTO.getStaffId());
for(ClerkDTO clerkDTO :list){
clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
clerkDTO.setClerkName(staffDTO.getStaffName());
clerkService.updateClerk(clerkDTO);
}
return resultResponse(HaoBanErrCode.ERR_1);
}
//成员解除绑定
......@@ -181,6 +197,17 @@ public class ClerkController extends WebBaseController{
one.setUpdateTime(new Date());
staffDepartmentRelatedApiService.deleteCode(one);
}
//更新gic数据
DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
String storeId = departmentDTO.getRelatedId();
List<String> clerkCodes = new ArrayList<>();
clerkCodes.add(fromClerkCode);
List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
for(ClerkDTO clerkDTO :list){
clerkDTO.setPhoneNumber("");
clerkService.updateClerk(clerkDTO);
}
return resultResponse(HaoBanErrCode.ERR_1);
}
//成员换绑定
......@@ -189,6 +216,8 @@ public class ClerkController extends WebBaseController{
if(StringUtils.isAnyBlank(fromClerkCode,toStaffId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
StaffDTO oldStaffDTO = staffApiService.selectById(toStaffId);
String oldClerkCode = oldStaffDTO.getClerkCode();
if("1".equals(manager)){
//店长操作
//第一个点击的人的clerkCode置空
......@@ -219,7 +248,14 @@ public class ClerkController extends WebBaseController{
clerkDTO.setClerkName(staffDTO.getStaffName());
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);
}
}else{
//把别人的的clerkCode置空
......@@ -249,7 +285,16 @@ public class ClerkController extends WebBaseController{
clerkDTO.setClerkName(staffDTO.getStaffName());
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);
}
}
return resultResponse(HaoBanErrCode.ERR_1);
}
//店长转让
......@@ -272,6 +317,20 @@ public class ClerkController extends WebBaseController{
dto.setUpdateTime(new Date());
staffDepartmentRelatedApiService.updateById(dto);
//更新gic数据
DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
String storeId = departmentDTO.getRelatedId();
List<String> clerkCodes = new ArrayList<>();
clerkCodes.add(fromClerkCode);
List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
StaffDTO staffDTO = staffApiService.selectById(staffDepartmentRelatedDTO.getStaffId());
for(ClerkDTO clerkDTO :list){
clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
clerkDTO.setClerkName(staffDTO.getStaffName());
clerkService.updateClerk(clerkDTO);
}
return resultResponse(HaoBanErrCode.ERR_1);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment