Skip to content

H
haoban-manage3.0
Commit 5b0b771b by 陶光胜
Options

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

parents c3f8433b b249f314
Showing with 55 additions and 36 deletions
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java
......@@ -32,8 +32,8 @@ public class EnterpriseController extends WebBaseController{
private WxEnterpriseApiService wxEnterpriseApiService;
//企业列表
@RequestMapping("wx-enterprise-list")
public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,Integer contactFlag,String version) {
Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,contactFlag,version);
public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,Integer gicContactHelper,String version) {
Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,gicContactHelper,version);
PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());
for(YwWxEnterpriseDTO dto : list){
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -391,6 +391,8 @@ public class StaffApiServiceImpl implements StaffApiService {
userDTO.setMobile(staffDTO.getPhoneNumber());
userDTO.setName(staffDTO.getStaffName());
userDTO.setUserid(oldStaff.getWxUserId());
userDTO.setPosition(staffDTO.getPostion());
userDTO.setExternalPosition(staffDTO.getExtendPostion());
JSONResponse jp = qywxUserApiService.updateWorkWxUser(userDTO, enterpriseDTO.getCorpid(), application.getSiteId());
}
......@@ -507,8 +509,16 @@ public class StaffApiServiceImpl implements StaffApiService {
}
TabHaobanDepartment department = departmentService.selectByRelatedId(gicStoreId);
if(department == null){
logger.info("【店员同步】gicStoreId为空");
return;
try {
Thread.sleep(3 * 1000);
department = departmentService.selectByRelatedId(gicStoreId);
} catch (InterruptedException e) {
e.printStackTrace();
}
if(department == null){
logger.info("【店员同步】department为空");
return;
}
}
String departmentId = department.getDepartmentId();
String wxEnterpriseId = department.getWxEnterpriseId();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
......@@ -87,7 +87,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
}
@Override
public StaffDepartmentRelatedDTO getOneByStaffIdAndDepartmentId(String staffId, String departmentId) {
TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getDepartmentIdAndStaffId(staffId,departmentId);
TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getDepartmentIdAndStaffId(departmentId,staffId);
if(tab== null){
return null;
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -144,14 +144,14 @@ public class ClerkController extends WebBaseController{
}
//成员绑定
@RequestMapping("/staff-bind")
public HaobanResponse staffBind(String toClerkCode,String fromStaffDepartmentRelatedId) {
if(StringUtils.isAnyBlank(toClerkCode,fromStaffDepartmentRelatedId)){
public HaobanResponse staffBind(String fromClerkCode,String fromStaffDepartmentRelatedId) {
if(StringUtils.isAnyBlank(fromClerkCode,fromStaffDepartmentRelatedId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
//将指定人绑定clerkCode
StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
dto.setStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
dto.setClerkCode(toClerkCode);
dto.setClerkCode(fromClerkCode);
dto.setUpdateTime(new Date());
staffDepartmentRelatedApiService.updateById(dto);
return resultResponse(HaoBanErrCode.ERR_1);
......@@ -174,11 +174,11 @@ public class ClerkController extends WebBaseController{
}
//成员换绑定
@RequestMapping("/clerk-unbind")
public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toStaffId,int manager) {
public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toStaffId,String manager) {
if(StringUtils.isAnyBlank(fromClerkCode,toStaffId)){
return resultResponse(HaoBanErrCode.ERR_2);
}
if(manager == 1){
if("1".equals(manager)){
//店长操作
//第一个点击的人的clerkCode置空
StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
......@@ -189,6 +189,9 @@ public class ClerkController extends WebBaseController{
staffDepartmentRelatedApiService.deleteCode(one);
}
StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
if(dto == null){
return resultResponse(HaoBanErrCode.ERR_400017);
}
//存在，则先置空
dto.setClerkCode(fromClerkCode);
dto.setUpdateTime(new Date());
......@@ -203,6 +206,9 @@ public class ClerkController extends WebBaseController{
staffDepartmentRelatedApiService.deleteCode(one);
}
StaffDepartmentRelatedDTO dto = staffDepartmentRelatedApiService.getOneByStaffIdAndDepartmentId(toStaffId, departmentId);
if(dto == null){
return resultResponse(HaoBanErrCode.ERR_400017);
}
dto.setClerkCode(fromClerkCode);
dto.setUpdateTime(new Date());
staffDepartmentRelatedApiService.updateById(dto);
......@@ -211,7 +217,7 @@ public class ClerkController extends WebBaseController{
}
//成员换绑定
@RequestMapping("/clerk-unbind22222")
public HaobanResponse clerkUnbind(String departmentId,String fromClerkCode,String toClerkCode) {
public HaobanResponse clerkUnbind2222(String departmentId,String fromClerkCode,String toClerkCode) {
if(StringUtils.isAnyBlank(fromClerkCode,toClerkCode)){
return resultResponse(HaoBanErrCode.ERR_2);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
......@@ -159,6 +159,7 @@ public class StoreController extends WebBaseController{
if(vo.getCloseTime()!=null){
vo.setCloseTimeStr(sdf.format(vo.getCloseTime()));
}
vo.setStoreAddress(store.getFullArea()+" "+store.getStoreAddress());
return resultResponse(HaoBanErrCode.ERR_1,vo);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
......@@ -88,6 +88,8 @@ public enum HaoBanErrCode {
ERR_400014(400014, "仅支持认证企业建立企业通讯录共享"),
ERR_400015(400015, "数据为空"),
ERR_400016(400016, "提交人不存在"),
ERR_400017(400017, "成员不存在"),
/**
* 文件不存在
*/
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java
......@@ -28,33 +28,33 @@ public class GlobalExceptionHandler extends WebBaseController {
private static final Pattern pattern = Pattern.compile("(.*: )(.*)(\\n.*)");
@ResponseBody
@ExceptionHandler(ShowFrontMessageException.class)
public HaobanResponse ControllerException(HttpServletResponse response, ShowFrontMessageException ex) {
HaobanResponse res = new HaobanResponse();
res.setErrorCode(HaoBanErrCode.ERR_0.getCode());
res.setMessage(ex.getMessage());
return res;
}
// @ResponseBody
// @ExceptionHandler(ShowFrontMessageException.class)
// public HaobanResponse ControllerException(HttpServletResponse response, ShowFrontMessageException ex) {
// HaobanResponse res = new HaobanResponse();
// res.setErrorCode(HaoBanErrCode.ERR_0.getCode());
// res.setMessage(ex.getMessage());
// return res;
// }
@ResponseBody
@ExceptionHandler(RuntimeException.class)
public HaobanResponse ControllerException(HttpServletResponse response, RuntimeException ex) {
HaobanResponse res = new HaobanResponse();
res.setErrorCode(HaoBanErrCode.ERR_3.getCode());
String message = ex.getMessage();
if (message != null && message.indexOf(ShowFrontMessageException.class.getName()) > -1) {
Matcher matcher = pattern.matcher(message);
while (matcher.find()) {
message = (matcher.group(2));
}
} else {
message = HaoBanErrCode.ERR_3.getMsg();
}
res.setMessage(message);
return res;
}
// @ResponseBody
// @ExceptionHandler(RuntimeException.class)
// public HaobanResponse ControllerException(HttpServletResponse response, RuntimeException ex) {
// HaobanResponse res = new HaobanResponse();
// res.setErrorCode(HaoBanErrCode.ERR_3.getCode());
// String message = ex.getMessage();
// if (message != null && message.indexOf(ShowFrontMessageException.class.getName()) > -1) {
// Matcher matcher = pattern.matcher(message);
// while (matcher.find()) {
// message = (matcher.group(2));
// }
// } else {
// message = HaoBanErrCode.ERR_3.getMsg();
// }
// res.setMessage(message);
// return res;
// }
@ResponseBody
@ExceptionHandler(Exception.class)
......
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