Skip to content

H
haoban-manage3.0
Commit 306c11e7 by qwmqiuwenmin
Options

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

parents 3f8669e4 215ddf39
Showing with 139 additions and 15 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
......@@ -150,5 +150,13 @@ public interface DepartmentApiService {
* @param departmentId
*/
ServiceResponse gicDel(String departmentId);
/**
* 查门店/部门列表
*
* @param
* @return
*/
ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
......@@ -162,6 +162,7 @@ public class AuditApiServiceImpl implements AuditApiService{
StoreDetailDTO detailDTO = new StoreDetailDTO();
detailDTO.setStoreId(storeId);
detailDTO.setEnterpriseId(store.getEnterpriseId());
detailDTO.setStatus(2);
getStoreDTO( detailDTO, changeField, oldValue, newValue);
logger.info("detailDTO====================>为{}",JSONObject.toJSONString(detailDTO));
......@@ -208,7 +209,8 @@ public class AuditApiServiceImpl implements AuditApiService{
String arr[] = storeAddress.split(" ");
store.setAreaId(areaId);
store.setFullArea(arr[0]);
store.setStoreAddress(arr[1]);
//避免多个空格造成数据混乱
store.setStoreAddress(storeAddress.substring(storeAddress.indexOf(arr[0])+arr[0].length()+1));
}else if(StoreFieldEnum.STORE_AREA.getValue().equals(changeField)){
//门店面积
store.setStoreArea(Double.parseDouble(newValue));
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
......@@ -4,13 +4,16 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil;
import com.gic.haoban.base.api.common.Constant;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
......@@ -70,6 +73,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
private StoreGroupService storeGroupService;
@Autowired
private StaffApiService staffApiService;
@Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
@Override
......@@ -661,4 +667,18 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
}
@Override
public ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String staffId) {
ServiceResponse<List<DepartmentDTO>> rer = new ServiceResponse<List<DepartmentDTO>>();
List<StaffDepartmentRelatedDTO> relateList = staffDepartmentRelatedApiService.listByStaffId(staffId);
if (CollectionUtils.isEmpty(relateList)) {
logger.info("没有部分显示:{}", staffId);
return rer;
}
List<String> departmentIds = relateList.stream().map(dto -> dto.getDepartmentId()).collect(Collectors.toList());
List<DepartmentDTO> departmentList = listByDepartmentIds(departmentIds, 1);
rer.setResult(departmentList);
return rer;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java
......@@ -2,19 +2,26 @@ package com.gic.haoban.manage.web.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.contacts.manage.api.service.StoreService;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.web.config.Config;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.MemberLoginQo;
import com.gic.haoban.manage.web.vo.AppStaffVo;
import com.gic.haoban.manage.web.vo.InfoVo;
import com.gic.haoban.manage.web.vo.StoreVO;
import com.gic.wechat.api.dto.qywx.UserDTO;
import com.gic.wechat.api.service.qywx.QywxCorpApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -42,6 +49,12 @@ public class InfoController extends WebBaseController{
@Autowired
private QywxUserApiService qywxUserApiService;
@Autowired
private DepartmentApiService departmentApiService;
@Autowired
private com.gic.enterprise.api.service.StoreService storeService;
private static Logger logger= LoggerFactory.getLogger(InfoController.class);
@Autowired
......@@ -88,7 +101,7 @@ public class InfoController extends WebBaseController{
}
@RequestMapping("get-user-by-member-code")
public HaobanResponse getInfoByMemberCode(String code, String gicEnterpriseId) {
public HaobanResponse getInfoByMemberCode(String code, String gicEnterpriseId, String userId) {
EnterpriseDetailDTO enterpriseDetailDTO = wxEnterpriseRelatedApiService.getByEnterpriseId(gicEnterpriseId);
if (enterpriseDetailDTO == null) {
logger.info("改企业没有关系好办:{}", gicEnterpriseId);
......@@ -100,21 +113,48 @@ public class InfoController extends WebBaseController{
logger.info("改企业不存在:{}", gicEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_400002);
}
String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), enterpriseDTO.getMemberSecret(), code);
logger.info("会员微信登录信息=============>{}", userDTOJson);
UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
if (user == null) {
MemberLoginQo user = new MemberLoginQo();
if (StringUtils.isBlank(userId)) {
String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), enterpriseDTO.getMemberSecret(), code);
logger.info("会员微信登录信息=============>{}", userDTOJson);
user = JSON.parseObject(userDTOJson, MemberLoginQo.class);
if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6);
}
} else {
user.setUserId(userId);
}
StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(user.getUserId(), enterpriseDTO.getWxEnterpriseId());
if (staffDTO == null) {
logger.info("成员不存在");
return resultResponse(HaoBanErrCode.ERR_6);
}
String userId = user.getUserid();
String corpId = user.getCorpid();
Map<String, String> ret = new HashMap<>();
ret.put("userId", userId);
ret.put("corpId", corpId);
return resultResponse(HaoBanErrCode.ERR_1, ret);
ServiceResponse<List<DepartmentDTO>> response = departmentApiService.listStoreListByStaffId(staffDTO.getStaffId());
List<DepartmentDTO> result = response.getResult();
List<StoreVO> retList = new ArrayList<>();
if (response.getCode() == 1 && CollectionUtils.isNotEmpty(result)) {
result.stream().forEach(dto -> {
StoreVO VO = new StoreVO();
VO.setDepartmentId(dto.getDepartmentId());
VO.setStoreId(dto.getRelatedId());//为空，则无该值
VO.setStoreName(dto.getDepartmentName());
VO.setWxEnterpriseId(dto.getWxEnterpriseId());
VO.setStoreImg("");//先置空
if (org.apache.commons.lang.StringUtils.isNotBlank(dto.getRelatedId())) {
StoreDTO storeDTO = storeService.getStore(dto.getRelatedId());
if (storeDTO != null) {
VO.setEnterpriseId(storeDTO.getEnterpriseId());
VO.setStoreImg(storeDTO.getImageUrl());//先置空
}
}
VO.setCreateTime(dto.getCreateTime());
retList.add(VO);
});
user.setStoreList(retList);
}
return resultResponse(HaoBanErrCode.ERR_1, user);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
......@@ -39,6 +39,7 @@ import com.gic.haoban.manage.api.dto.AuditSettingDTO;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
import com.gic.haoban.manage.api.enums.StoreFieldEnum;
import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.AuditSettingApiService;
import com.gic.haoban.manage.api.service.DepartmentApiService;
......@@ -239,6 +240,17 @@ public class StoreController extends WebBaseController{
if(StringUtils.isBlank(newValue)){
newValue = "";
}
//增加判断是否是门店面积数字合法
if(StoreFieldEnum.STORE_AREA.getValue().equals(changeField)){
try {
Double.parseDouble(newValue);
} catch (Exception e) {
return resultResponse(HaoBanErrCode.ERR_400019);
}
}
StoreDTO store = storeService.getStore(storeId);
String enterpriseId = store.getEnterpriseId();
logger.info("==================aaaa");
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
......@@ -90,6 +90,7 @@ public enum HaoBanErrCode {
ERR_400016(400016, "提交人不存在"),
ERR_400017(400017, "成员不存在"),
ERR_400018(400018, "已有待审核的门店字段信息提交，请等待审核完再提交"),
ERR_400019(400019, "门店面积不合法"),
/**
* 文件不存在
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/MemberLoginQo.java 0 → 100644
package com.gic.haoban.manage.web.qo;
import com.gic.haoban.manage.web.vo.StoreVO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2020/4/1.
*
* @author hua
*/
public class MemberLoginQo implements Serializable {
private String userId;
private String corpId;
private List<StoreVO> storeList;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getCorpId() {
return corpId;
}
public void setCorpId(String corpId) {
this.corpId = corpId;
}
public List<StoreVO> getStoreList() {
return storeList;
}
public void setStoreList(List<StoreVO> storeList) {
this.storeList = storeList;
}
}
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