Skip to content

H
haoban-manage3.0
Commit 41345bb0 by qwmqiuwenmin
Options

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

parents 6958ad7e e1827a17
Showing with 88 additions and 27 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -17,8 +17,10 @@ import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
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.DepartmentApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.ClerkVo;
......@@ -31,6 +33,9 @@ public class ClerkController extends WebBaseController{
private DepartmentApiService departmentApiService;
@Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
@Autowired
private StaffApiService staffApiService;
//未绑定的clerkCode列表
@RequestMapping("/clerk-code-list")
public HaobanResponse clerkCodeList(String departmentId) {
......@@ -79,8 +84,8 @@ public class ClerkController extends WebBaseController{
}
//成员绑定
@RequestMapping("/staff-bind")
public HaobanResponse staffBind(String toClerkCode,String fromStaffDepartmentRelatedId) {
if(StringUtils.isAnyBlank(toClerkCode,fromStaffDepartmentRelatedId)){
public HaobanResponse staffBind(String oldClerkCode,String toClerkCode,String fromStaffDepartmentRelatedId) {
if(StringUtils.isAnyBlank(oldClerkCode,toClerkCode,fromStaffDepartmentRelatedId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
//将指定人绑定clerkCode
......@@ -89,29 +94,26 @@ public class ClerkController extends WebBaseController{
dto.setClerkCode(toClerkCode);
dto.setUpdateTime(new Date());
staffDepartmentRelatedApiService.updateById(dto);
return resultResponse(HaoBanErrCode.ERR_1);
}
//成员换绑定
@RequestMapping("/clerk-unbind")
public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toClerkCode) {
if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
return resultResponse(HaoBanErrCode.ERR_2);
}
//将别人clerkCode置空
StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(toClerkCode,departmentId);
if(one != null){
//存在，则先置空
one.setClerkCode(null);
one.setUpdateTime(new Date());
staffDepartmentRelatedApiService.deleteCode(one);
//更新gic数据
StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
DepartmentDTO departmentDTO = departmentApiService.selectById(staffDepartmentRelatedDTO.getDepartmentId());
String storeId = departmentDTO.getRelatedId();
List<String> clerkCodes = new ArrayList<>();
clerkCodes.add(toClerkCode);
List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
StaffDTO staffDTO = staffApiService.selectById(staffDepartmentRelatedDTO.getStaffId());
for(ClerkDTO clerkDTO :list){
clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
clerkDTO.setClerkName(staffDTO.getStaffName());
clerkService.updateClerk(clerkDTO);
}
//将别人的clerkCode换到自己上面
StaffDepartmentRelatedDTO two = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
if(two != null){
//存在，则先置空
two.setClerkCode(toClerkCode);
two.setUpdateTime(new Date());
staffDepartmentRelatedApiService.updateById(two);
//清空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);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -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