Skip to content

H
haoban-manage3.0
Commit 99185043 by 墨竹
Options

Merge remote-tracking branch 'origin/feature-haoban-role' into feature-haoban-role

parents 4e7e7a39 bffc9fa4
Showing with 56 additions and 44 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
......@@ -488,11 +488,16 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
}
} else if (type == 2) {
logger.info("导购门店转移,新的导购和门店,clerkId={},storeId={}", clerkId, clerkSyncQDTO.getStoreId());
StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByCodeAndEnterpriseId(clerkCode,enterpriseId);
if (null == oldRelationDTO) {
logger.info("导购未关联成员,clerkCode={}", clerkCode);
logger.info("导购未关联成员,clerkCode={}",clerkCode);
return;
}
/* StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
if (null == oldRelationDTO) {
logger.info("导购未关联成员,clerkCode={}", clerkCode);
return;
}*/
logger.info("导购门店转移,老的绑定导购id={}", oldRelationDTO.getClerkId());
this.moveOrAddClerk(clerkSyncQDTO, oldRelationDTO);
} else if (type == 3) {
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
......@@ -131,9 +131,7 @@ public class AuditController extends WebBaseController {
//门店记录列表
@RequestMapping("store-apply-list")
public HaobanResponse storeApplyList(String storeId, BasePageInfo pageInfo, Integer auditType,
Integer auditStatus, Integer manageFlag, String clerkId, String enterpriseId) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
Integer auditStatus, Integer manageFlag, String clerkId, String enterpriseId , String wxEnterpriseId) {
List<String> storeIds = new ArrayList<>();
if (manageFlag != null && manageFlag == 1) {
List<String> roleStoreIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
......@@ -355,12 +353,8 @@ public class AuditController extends WebBaseController {
* @return
*/
@RequestMapping("get-audit-count")
public RestResponse getAuditCount(String clerkId, String enterpriseId) {
WellDoneLoginDTO loginUser = this.getLoginUser();
if (loginUser == null) {
return RestResponse.successResult(0);
}
int count = this.auditApiService.getAuditCount(loginUser.getWxEnterpriseId(), enterpriseId, clerkId);
public RestResponse getAuditCount(String clerkId, String enterpriseId ,String wxEnterpriseId) {
int count = this.auditApiService.getAuditCount(wxEnterpriseId, enterpriseId, clerkId);
return RestResponse.successResult(count);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
......@@ -173,13 +173,13 @@ public class StoreController extends WebBaseController {
//获取首页销售数据
@RequestMapping("/sale-date")
public HaobanResponse saleDate(String storeId, Integer clerkType, String clerkId, String enterpriseId) {
public HaobanResponse saleDate(String storeId, Integer clerkType, String clerkId, String enterpriseId,String wxEnterpriseId) {
if (StringUtils.isAnyBlank(clerkId)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
List<String> storeIds = new ArrayList<>();
if (clerkType == 2) {
List<String> haobanStoreIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, this.getLoginUser().getWxEnterpriseId());
List<String> haobanStoreIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
if (!haobanStoreIds.contains("-1")) {
storeIds.addAll(haobanStoreIds);
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
......@@ -103,9 +103,7 @@ public class WxStaffController extends WebBaseController {
//选择成员列表
@RequestMapping("/staff-list")
public HaobanResponse staffList(String storeId, Integer manageFlag, String clerkId) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
public HaobanResponse staffList(String storeId, Integer manageFlag, String clerkId,String wxEnterpriseId) {
List<String> storeIds = new ArrayList<>();
if (manageFlag != null && manageFlag == 1) {
List<String> roleStoreIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
......@@ -155,9 +153,7 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping("/store-clerks")
public HaobanResponse storeClerks(BasePageInfo basePageInfo, String clerkId, String enterpriseId, String storeId, Integer manageFlag) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
public HaobanResponse storeClerks(BasePageInfo basePageInfo, String clerkId, String enterpriseId, String storeId, Integer manageFlag,String wxEnterpriseId) {
List<String> storeIds = new ArrayList<>();
if (manageFlag != null && manageFlag == 1) {
List<String> roleStoreIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
......@@ -842,9 +838,7 @@ public class WxStaffController extends WebBaseController {
*/
@HttpLimit
@RequestMapping("bind-staff")
public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType, Integer manageFlag) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
public HaobanResponse bindStaff(String clerkId, String staffId, Integer auditType, Integer manageFlag,String wxEnterpriseId) {
if (StringUtils.isAnyBlank(clerkId, staffId)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
......@@ -1010,9 +1004,7 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping("store-clerk-list")
public HaobanResponse storeClerkList(String storeId, String enterpriseId) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
public HaobanResponse storeClerkList(String storeId, String enterpriseId,String wxEnterpriseId) {
List<ClerkDTO> list = clerkService.listClerkByNameOrCode(enterpriseId, null, Collections.singletonList(storeId));
if (CollectionUtils.isEmpty(list)) {
return resultResponse(HaoBanErrCode.ERR_10016);
......@@ -1049,9 +1041,7 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping("clerk-manage-list")
public RestResponse clerkManageList(String enterpriseId) {
WellDoneLoginDTO loginUser = this.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
public RestResponse clerkManageList(String enterpriseId,String wxEnterpriseId) {
List<ClerkDTO> list = clerkService.listClerkEnableHaoban(Collections.singletonList(enterpriseId), null);
if (CollectionUtils.isEmpty(list)) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_10016.getCode()), HaoBanErrCode.ERR_10016.getMsg());
......@@ -1330,9 +1320,7 @@ public class WxStaffController extends WebBaseController {
* @date 2021-12-29 10:42:24
*/
@RequestMapping(value = "getOpenIdByStaffId", method = {RequestMethod.POST, RequestMethod.GET})
public RestResponse<String> getOpenIdByStaffId() {
String staffId = this.getLoginUser().getStaffId();
String wxEnterpriseId = this.getLoginUser().getWxEnterpriseId();
public RestResponse<String> getOpenIdByStaffId(String staffId,String wxEnterpriseId) {
StaffDTO staffDTO = staffApiService.selectById(staffId);
if (staffDTO == null) {
int code = HaoBanErrCode.ERR_6.getCode();
......@@ -1367,7 +1355,7 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping(value = "/queryMenuCodesByClerkType", method = RequestMethod.GET)
public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType) {
public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId , String wxEnterpriseId) {
if (clerkType == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
}
......@@ -1377,15 +1365,12 @@ public class WxStaffController extends WebBaseController {
ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType("-1", RoleClerkTypeEnum.CLERK.getCode(), 0);
return RestResponse.successResult(serviceResponse.getResult());
}
WellDoneLoginDTO loginUser = this.getLoginUser();
String staffId = loginUser.getStaffId();
if (StringUtils.isBlank(staffId) || "-1".equals(staffId)) {
logger.info("未登录游客获取系统级别的导购权限");
//游客获取系统级别的导购权限
ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType("-1", RoleClerkTypeEnum.CLERK.getCode(), 0);
return RestResponse.successResult(serviceResponse.getResult());
}
String wxEnterpriseId = loginUser.getWxEnterpriseId();
ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1);
return RestResponse.successResult(serviceResponse.getResult());
}
......@@ -1397,8 +1382,8 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping(value = "/getCountHaoBanStoreIdsByClerkId", method = RequestMethod.GET)
public RestResponse<StoreRoleVO> getCountHaoBanStoreIdsByClerkId(String clerkId) {
StoreRoleDTO storeRoleDTO = staffApiService.getCountHaoBanStoreIdsByClerkId(clerkId, this.getLoginUser().getWxEnterpriseId());
public RestResponse<StoreRoleVO> getCountHaoBanStoreIdsByClerkId(String clerkId,String wxEnterpriseId) {
StoreRoleDTO storeRoleDTO = staffApiService.getCountHaoBanStoreIdsByClerkId(clerkId, wxEnterpriseId);
StoreRoleVO storeRoleVO = new StoreRoleVO();
storeRoleVO.setStoreCount(storeRoleDTO.getStoreCount());
storeRoleVO.setStoreDTO(storeService.getStore(storeRoleDTO.getStoreId()));
......@@ -1412,8 +1397,8 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping(value = "/getHaoBanStoreIdsRolesByClerkId", method = RequestMethod.GET)
public RestResponse<List<String>> getHaoBanStoreIdsRolesByClerkId(String clerkId) {
List<String> storeIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, this.getLoginUser().getWxEnterpriseId());
public RestResponse<List<String>> getHaoBanStoreIdsRolesByClerkId(String clerkId,String wxEnterpriseId) {
List<String> storeIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
return RestResponse.successResult(storeIds);
}
......@@ -1423,12 +1408,10 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping(value = "/getEnterpriseStoreListByStaffId", method = RequestMethod.GET)
public RestResponse<List<StaffStoreVO>> getEnterpriseStoreListByStaffId(Integer manageFlag, String gicEnterpriseId) {
public RestResponse<List<StaffStoreVO>> getEnterpriseStoreListByStaffId(String staffId,String wxEnterpriseId ,Integer manageFlag, String gicEnterpriseId) {
if (manageFlag == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
}
String staffId = this.getLoginUser().getStaffId();
String wxEnterpriseId = this.getLoginUser().getWxEnterpriseId();
List<StaffClerkRelationDTO> bindRelationList = new ArrayList<>();
List<StaffStoreVO> list = new ArrayList<>();
//区经商户
......@@ -1573,8 +1556,7 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping("external-friend-count")
public RestResponse friendCount() {
String staffId = this.getLoginUser().getStaffId();
public RestResponse friendCount(String staffId) {
StaffDTO staff = staffApiService.selectById(staffId);
if (staff == null) {
return RestResponse.successResult(0);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/LogInterceptor.java 0 → 100644
package com.gic.haoban.manage.web.utils;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import com.gic.commons.util.IPUtil;
public class LogInterceptor extends HandlerInterceptorAdapter {
private static final Logger log = LogManager.getLogger(LogInterceptor.class);
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object object) throws Exception {
String uri = request.getRequestURI();
Map<String, String[]> parameterMap = request.getParameterMap();
String ip = null;
try {
ip = IPUtil.getIpAddr(request);
} catch (Exception e) {
}
log.info("请求参数,ip={},url={},参数={}", ip, uri, parameterMap);
return true;
}
}
haoban-manage3-wx/src/main/webapp/WEB-INF/spring-interceptor.xml
......@@ -4,6 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
<mvc:interceptors>
<bean class="com.gic.commons.interceptor.HeaderTagInterceptor"/>
<bean class="com.gic.haoban.manage.web.utils.LogInterceptor"/>
<bean class="com.gic.haoban.common.interceptor.HttpLimitInterceptor"/>
<bean class="com.gic.haoban.common.ext.PropertyViewClearInterceptor"/>
<mvc:interceptor>
......
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