Skip to content

H
haoban-manage3.0
Commit 9774e9d5 by 墨竹
Options

Merge branch 'feature-haoban-role' into developer

parents c86d733f 224efe06
Showing with 104 additions and 39 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkInfoDTO.java
......@@ -17,7 +17,7 @@ public class StaffClerkInfoDTO implements Serializable {
private String enterpriseId;
private String BrandName;
private String brandName;
private String enterpriseName;
......@@ -43,6 +43,10 @@ public class StaffClerkInfoDTO implements Serializable {
*/
private Integer mainStoreFlag;
private Integer manageFlag;
private Integer manageStoreCount;
public Integer getMainStoreFlag() {
return mainStoreFlag;
}
......@@ -124,11 +128,11 @@ public class StaffClerkInfoDTO implements Serializable {
}
public String getBrandName() {
return BrandName;
return brandName;
}
public void setBrandName(String brandName) {
BrandName = brandName;
this.brandName = brandName;
}
public String getStoreId() {
......@@ -179,4 +183,19 @@ public class StaffClerkInfoDTO implements Serializable {
this.updateTime = updateTime;
}
public Integer getManageFlag() {
return manageFlag;
}
public void setManageFlag(Integer manageFlag) {
this.manageFlag = manageFlag;
}
public Integer getManageStoreCount() {
return manageStoreCount;
}
public void setManageStoreCount(Integer manageStoreCount) {
this.manageStoreCount = manageStoreCount;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java
......@@ -31,9 +31,10 @@ public class StaffClerkRelationDTO implements Serializable {
private String staffName;
private Integer openConcatFlag;
private String qwUserId ;
private String openUserId ;
private String qwUserId;
private String openUserId;
private Integer manageFlag;
public String getQwUserId() {
return qwUserId;
......@@ -148,13 +149,20 @@ public class StaffClerkRelationDTO implements Serializable {
}
public Integer getOpenConcatFlag() {
if(null == openConcatFlag) {
return 1 ;
if (null == openConcatFlag) {
return 1;
}
return openConcatFlag;
}
public void setOpenConcatFlag(Integer openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
public Integer getManageFlag() {
return manageFlag;
}
public void setManageFlag(Integer manageFlag) {
this.manageFlag = manageFlag;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java
......@@ -68,5 +68,4 @@ public class HaobanRoleController {
return RestResponse.successResult(serviceResponse.getResult());
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaffClerkRelation.java
......@@ -27,6 +27,8 @@ public class TabHaobanStaffClerkRelation implements Serializable {
private Date updateTime;
private Integer openConcatFlag;
private Integer manageFlag;
public String getStaffClerkRelationId() {
return staffClerkRelationId;
......@@ -115,4 +117,12 @@ public class TabHaobanStaffClerkRelation implements Serializable {
public void setOpenConcatFlag(Integer openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
public Integer getManageFlag() {
return manageFlag;
}
public void setManageFlag(Integer manageFlag) {
this.manageFlag = manageFlag;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
......@@ -13,10 +13,11 @@
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="open_concat_flag" property="openConcatFlag" jdbcType="INTEGER"/>
<result column="manage_flag" property="manageFlag" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
staff_clerk_relation_id, staff_id, wx_enterprise_id, enterprise_id, store_id,
clerk_id, clerk_code, status_flag, create_time, update_time,open_concat_flag
clerk_id, clerk_code, status_flag, create_time, update_time,open_concat_flag,manage_flag
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select
......@@ -29,12 +30,12 @@
insert into tab_haoban_staff_clerk_relation (staff_clerk_relation_id, staff_id, wx_enterprise_id,
enterprise_id, store_id,
clerk_id, clerk_code, status_flag,
create_time, update_time,open_concat_flag)
create_time, update_time,open_concat_flag,manage_flag)
values (#{staffClerkRelationId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR},
#{wxEnterpriseId,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR},
#{clerkId,jdbcType=VARCHAR}, #{clerkCode,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{openConcatFlag})
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{openConcatFlag},#{manageFlag})
</insert>
......
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
......@@ -115,8 +115,8 @@
left join tab_haoban_role b on a.role_id = b.role_id
left join tab_haoban_menu c on c.menu_code = a.menu_code
where
a.clerk_type = #{clerkType}
and a.wx_enterprise_id = #{wxEnterpriseId}
b.clerk_type = #{clerkType}
and b.wx_enterprise_id = #{wxEnterpriseId}
and c.status_flag = 1
and c.parent_code = 'workbench'
order by c.menu_sort
......@@ -129,8 +129,8 @@
left join tab_haoban_role b on a.role_id = b.role_id
left join tab_haoban_menu c on c.menu_code = a.menu_code
where
a.clerk_type = #{clerkType}
and a.wx_enterprise_id = #{wxEnterpriseId}
b.clerk_type = #{clerkType}
and b.wx_enterprise_id = #{wxEnterpriseId}
and c.status_flag = 1
and c.parent_code != 'workbench'
order by c.menu_sort
......@@ -144,8 +144,8 @@
left join tab_haoban_role b on a.role_id = b.role_id
left join tab_haoban_menu c on c.menu_code = a.menu_code
where
a.clerk_type = #{clerkType}
and a.wx_enterprise_id = #{wxEnterpriseId}
b.clerk_type = #{clerkType}
and b.wx_enterprise_id = #{wxEnterpriseId}
and c.status_flag = 1
order by c.menu_sort
</select>
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
......@@ -11,6 +11,7 @@ import com.gic.commons.util.DateUtil;
import com.gic.commons.util.ExcelUtils;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.StoreService;
import com.gic.enterprise.api.service.StoreWidgetService;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
......@@ -75,6 +76,8 @@ public class StaffController extends WebBaseController {
private HaobanUserApiService haobanUserApiService;
@Autowired
private DealSyncOperationApiService dealSyncOperationApiService;
@Autowired
private StoreWidgetService storeWidgetService;
@RequestMapping("set-default-gicenterprise")
......@@ -254,14 +257,17 @@ public class StaffController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1);
}
ClerkMainStoreRelatedDTO mainStoreRelatedDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(staff.getWxEnterpriseId(), staffId);
if (null != mainStoreRelatedDTO) {
retList.forEach(dto -> {
for (StaffClerkInfoDTO dto : retList) {
if (mainStoreRelatedDTO != null) {
if (dto.getStoreId().equals(mainStoreRelatedDTO.getStoreId())) {
dto.setMainStoreFlag(1);
} else {
dto.setMainStoreFlag(0);
}
});
}
if (dto.getManageFlag() == 1) {
dto.setManageStoreCount(storeWidgetService.getClerkWidgetStore(dto.getClerkId()));
}
}
return resultResponse(HaoBanErrCode.ERR_1, retList);
}
......@@ -275,7 +281,7 @@ public class StaffController extends WebBaseController {
@RequestMapping("del-clerk-relation")
public HaobanResponse delStaffClerkList(String clerkId) {
WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId,ChannelCodeEnum.ADMIN_UNBIND.getCode());
boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId, ChannelCodeEnum.ADMIN_UNBIND.getCode());
return resultResponse(HaoBanErrCode.ERR_1, b);
}
......@@ -286,7 +292,7 @@ public class StaffController extends WebBaseController {
* @return
*/
@RequestMapping("search-clerk-relation")
public HaobanResponse staffClerkSearch(String search) {
public HaobanResponse staffClerkSearch(String search, Integer manageFlag) {
WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
String wxEnterpriseId = login.getWxEnterpriseId();
if (null == wxEnterpriseId) {
......@@ -307,7 +313,12 @@ public class StaffController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1);
}
logger.info("好办门店数={},wxEnterpriseId={},enterpriseIds={}", storeIds.size(), wxEnterpriseId, enterpriseIds);
List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIds, storeIds, search);
List<ClerkDTO> clerkDTOList = new ArrayList<>();
if (manageFlag == 1) {
clerkDTOList = clerkService.listClerkEnableHaoban(enterpriseIds, search);
} else {
clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIds, storeIds, search);
}
List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList);
if (CollectionUtils.isNotEmpty(retList)) {
logger.info("导购数量={}", retList.size());
......@@ -342,7 +353,7 @@ public class StaffController extends WebBaseController {
* @return
*/
@RequestMapping("add-clerk-relation")
public HaobanResponse staffClerkSearch(String staffId, String clerkId) {
public HaobanResponse staffClerkSearch(String staffId, String clerkId, Integer manageFlag) {
WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
if (StringUtils.isAnyBlank(staffId, clerkId)) {
return resultResponse(HaoBanErrCode.ERR_2);
......@@ -362,8 +373,7 @@ public class StaffController extends WebBaseController {
relationDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
relationDTO.setStoreId(clerkDTO.getStoreId());
relationDTO.setWxEnterpriseId(staffDTO.getWxEnterpriseId());
// relationDTO.setWxUserId(staffDTO.getWxUserId());
relationDTO.setManageFlag(manageFlag);
ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(relationDTO, login.getClerkId(), ChannelCodeEnum.ADMIN_BIND.getCode());
logger.info("返回信息：{}", JSONObject.toJSONString(response));
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -16,6 +16,7 @@ import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.enterprise.api.service.StoreWidgetService;
import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
import com.gic.haoban.base.api.common.BasePageInfo;
......@@ -89,6 +90,8 @@ public class ClerkController extends WebBaseController {
private QywxUserApiService qywxUserApiService;
@Autowired
private Config config;
@Autowired
private StoreWidgetService storeWidgetService;
//选择成员列表
@RequestMapping("/staff-list")
......@@ -630,7 +633,7 @@ public class ClerkController extends WebBaseController {
//精确查，根据手机号或者code，查找
@RequestMapping("query-clerk-list-by-code")
public HaobanResponse queryClerkListByCode(String keyword, String wxEnterpriseId, String staffId) {
public HaobanResponse queryClerkListByCode(String keyword, String wxEnterpriseId, String staffId, Integer manageFlag) {
if (StringUtils.isAnyBlank(staffId, wxEnterpriseId, keyword)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
......@@ -650,7 +653,12 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_1, new ArrayList<>());
}
logger.info("查询到企微门店数={},{}", storeIds.size(), storeIds);
List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIds, keyword);
List<ClerkDTO> clerkList = new ArrayList<>();
if (manageFlag == 1) {
clerkList = clerkService.listClerkEnableHaoban(enterpriseIdList, keyword);
} else {
clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIds, keyword);
}
List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
}
......@@ -670,7 +678,7 @@ public class ClerkController extends WebBaseController {
return resultResponse(HaoBanErrCode.ERR_2);
}
List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
if (list == null || list.isEmpty()) {
if (CollectionUtils.isEmpty(list)) {
return resultResponse(HaoBanErrCode.ERR_1);
}
List<String> enterpriseIdList = list.stream().filter(s -> {
......@@ -679,7 +687,6 @@ public class ClerkController extends WebBaseController {
}).map(s -> s.getEnterpriseId()).collect(Collectors.toList());
List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
List<ClerkDTO> clerkList = this.getUnbindClerkList(enterpriseIdList, storeIds, staffId);
List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
}
......@@ -725,7 +732,7 @@ public class ClerkController extends WebBaseController {
clerkStoreList.add(vo);
}
if (CollectionUtil.isNotEmpty(clerkStoreList)) {
clerkStoreList = clerkStoreList.stream().filter(s -> org.apache.commons.lang.StringUtils.isNotBlank(s.getStoreId())).collect(Collectors.toList());
clerkStoreList = clerkStoreList.stream().filter(s -> StringUtils.isNotBlank(s.getStoreId())).collect(Collectors.toList());
}
return clerkStoreList;
}
......@@ -737,7 +744,7 @@ public class ClerkController extends WebBaseController {
* @return
*/
private List<ClerkDTO> getUnbindClerkList(List<String> enterpriseIdList, List<String> storeIdList, String staffId) {
List<ClerkDTO> ret = new ArrayList<ClerkDTO>();
List<ClerkDTO> ret = new ArrayList<>();
StaffDTO staffDTO = staffApiService.selectById(staffId);
if (staffDTO != null) {
String phoneNumber = staffDTO.getPhoneNumber();
......@@ -777,7 +784,7 @@ public class ClerkController extends WebBaseController {
//绑定
@HttpLimit
@RequestMapping("bind-staff")
public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType) {
public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType,Integer manageFlag) {
if (StringUtils.isAnyBlank(clerkId, staffId)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
......@@ -796,8 +803,8 @@ public class ClerkController extends WebBaseController {
if (auditDTO != null) {
return resultResponse(HaoBanErrCode.ERR_10018);
}
StaffClerkRelationDTO haveclekCode = staffClerkRelationApiService.getOneByStoreIdAndStaffId(clerk.getStoreId(), staffId);
if (haveclekCode != null) {
StaffClerkRelationDTO haveClerkCode = staffClerkRelationApiService.getOneByStoreIdAndStaffId(clerk.getStoreId(), staffId);
if (haveClerkCode != null) {
return resultResponse(HaoBanErrCode.ERR_10020);
}
......@@ -818,6 +825,7 @@ public class ClerkController extends WebBaseController {
staffClerkRelation.setEnterpriseId(clerk.getEnterpriseId());
staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
staffClerkRelation.setStaffId(staffId);
staffClerkRelation.setManageFlag(manageFlag);
staffClerkRelationApiService.delAndInsert(staffClerkRelation, staffId, ChannelCodeEnum.SELF_BIND.getCode());
......@@ -1173,12 +1181,11 @@ public class ClerkController extends WebBaseController {
}
/**
* 我的-好友会员数
* 我的-关联导购数量
*
* @return
*/
@RequestMapping("can-relation-count")
@IgnoreLogin
public RestResponse canRelationCount(@RequestBody @Valid CommonQO qo) {
List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(qo.getWxEnterpriseId());
if (list == null || list.isEmpty()) {
......@@ -1194,6 +1201,16 @@ public class ClerkController extends WebBaseController {
return RestResponse.successResult(clerkList.size());
}
/**
* 好友数量
* @param clerkId
* @return
*/
@RequestMapping(value = "manage-store-count",method = RequestMethod.GET)
public RestResponse<Integer> manageStoreCount(String clerkId) {
return RestResponse.successResult(storeWidgetService.getClerkWidgetStore(clerkId));
}
/**
* 根据员工id获取openId
......
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