Skip to content

H
haoban-manage3.0
Commit d48d7737 by 徐高华
Options

Merge branch 'feature-haoban-role' into 'developer' 

token

See merge request !326
parents 37ca64ee bffc9fa4
Showing with 17 additions and 39 deletions
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);
......@@ -143,9 +141,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);
......@@ -830,9 +826,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);
}
......@@ -998,9 +992,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);
......@@ -1045,9 +1037,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());
......@@ -1326,9 +1316,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();
......@@ -1363,7 +1351,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());
}
......@@ -1373,15 +1361,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());
}
......@@ -1393,8 +1378,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()));
......@@ -1408,8 +1393,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);
}
......@@ -1567,8 +1552,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);
......
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