Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
7c25782e
Commit
7c25782e
authored
Jun 05, 2025
by
王祖波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配置
parent
e18a95dd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
19 deletions
+34
-19
WxStaffController.java
...m/gic/haoban/manage/web/controller/WxStaffController.java
+17
-9
AuditSettingVO.java
...ain/java/com/gic/haoban/manage/web/vo/AuditSettingVO.java
+0
-10
HaobanRoleVO.java
.../main/java/com/gic/haoban/manage/web/vo/HaobanRoleVO.java
+17
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
View file @
7c25782e
...
@@ -295,11 +295,6 @@ public class WxStaffController extends WebBaseController {
...
@@ -295,11 +295,6 @@ public class WxStaffController extends WebBaseController {
AuditSettingDTO
auditSetting
=
auditSettingApiService
.
findSettingByWxEnterpriseId
(
wxEnterpriseId
);
AuditSettingDTO
auditSetting
=
auditSettingApiService
.
findSettingByWxEnterpriseId
(
wxEnterpriseId
);
AuditSettingVO
auditSettingVO
=
EntityUtil
.
changeEntityNew
(
AuditSettingVO
.
class
,
auditSetting
);
AuditSettingVO
auditSettingVO
=
EntityUtil
.
changeEntityNew
(
AuditSettingVO
.
class
,
auditSetting
);
int
potentialHide
=
StringUtils
.
isNotBlank
(
MarketingSwitcher
.
POTENTIAL_HIDE_STORE_ENTERPRISE_ID
)
&&
StringUtils
.
isNotBlank
(
enterpriseId
)
&&
MarketingSwitcher
.
POTENTIAL_HIDE_STORE_ENTERPRISE_ID
.
contains
(
enterpriseId
)
?
1
:
0
;
auditSettingVO
.
setPotentialHide
(
potentialHide
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
auditSettingVO
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
auditSettingVO
);
}
}
...
@@ -1563,7 +1558,7 @@ public class WxStaffController extends WebBaseController {
...
@@ -1563,7 +1558,7 @@ public class WxStaffController extends WebBaseController {
* @return
* @return
*/
*/
@RequestMapping
(
value
=
"/queryMenuCodesByClerkType"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/queryMenuCodesByClerkType"
,
method
=
RequestMethod
.
GET
)
public
RestResponse
<
HaobanRole
DT
O
>
queryMenuByClerkType
(
Integer
clerkType
,
String
staffId
,
String
wxEnterpriseId
,
String
enterpriseId
)
{
public
RestResponse
<
HaobanRole
V
O
>
queryMenuByClerkType
(
Integer
clerkType
,
String
staffId
,
String
wxEnterpriseId
,
String
enterpriseId
)
{
if
(
clerkType
==
null
)
{
if
(
clerkType
==
null
)
{
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_2
.
getCode
()),
HaoBanErrCode
.
ERR_2
.
getMsg
());
return
RestResponse
.
failure
(
Convert
.
toStr
(
HaoBanErrCode
.
ERR_2
.
getCode
()),
HaoBanErrCode
.
ERR_2
.
getMsg
());
}
}
...
@@ -1572,18 +1567,31 @@ public class WxStaffController extends WebBaseController {
...
@@ -1572,18 +1567,31 @@ public class WxStaffController extends WebBaseController {
// 游客获取系统级别的导购权限
// 游客获取系统级别的导购权限
ServiceResponse
<
HaobanRoleDTO
>
serviceResponse
=
haobanRoleApiService
ServiceResponse
<
HaobanRoleDTO
>
serviceResponse
=
haobanRoleApiService
.
getMenuByWxEnterpriseIdAndClerkType
(
"-1"
,
RoleClerkTypeEnum
.
CLERK
.
getCode
(),
0
);
.
getMenuByWxEnterpriseIdAndClerkType
(
"-1"
,
RoleClerkTypeEnum
.
CLERK
.
getCode
(),
0
);
return
RestResponse
.
successResult
(
serviceResponse
.
getResult
(
));
return
RestResponse
.
successResult
(
convertHaobanRoleVO
(
serviceResponse
.
getResult
(),
enterpriseId
));
}
}
if
(
StringUtils
.
isBlank
(
staffId
)
||
"-1"
.
equals
(
staffId
))
{
if
(
StringUtils
.
isBlank
(
staffId
)
||
"-1"
.
equals
(
staffId
))
{
logger
.
info
(
"未登录游客获取系统级别的导购权限"
);
logger
.
info
(
"未登录游客获取系统级别的导购权限"
);
// 游客获取系统级别的导购权限
// 游客获取系统级别的导购权限
ServiceResponse
<
HaobanRoleDTO
>
serviceResponse
=
haobanRoleApiService
ServiceResponse
<
HaobanRoleDTO
>
serviceResponse
=
haobanRoleApiService
.
getMenuByWxEnterpriseIdAndClerkType
(
"-1"
,
RoleClerkTypeEnum
.
CLERK
.
getCode
(),
0
);
.
getMenuByWxEnterpriseIdAndClerkType
(
"-1"
,
RoleClerkTypeEnum
.
CLERK
.
getCode
(),
0
);
return
RestResponse
.
successResult
(
serviceResponse
.
getResult
(
));
return
RestResponse
.
successResult
(
convertHaobanRoleVO
(
serviceResponse
.
getResult
(),
enterpriseId
));
}
}
ServiceResponse
<
HaobanRoleDTO
>
serviceResponse
=
haobanRoleApiService
ServiceResponse
<
HaobanRoleDTO
>
serviceResponse
=
haobanRoleApiService
.
getMenuByWxEnterpriseIdAndClerkType
(
wxEnterpriseId
,
clerkType
,
1
,
enterpriseId
);
.
getMenuByWxEnterpriseIdAndClerkType
(
wxEnterpriseId
,
clerkType
,
1
,
enterpriseId
);
return
RestResponse
.
successResult
(
serviceResponse
.
getResult
());
return
RestResponse
.
successResult
(
convertHaobanRoleVO
(
serviceResponse
.
getResult
(),
enterpriseId
));
}
private
HaobanRoleVO
convertHaobanRoleVO
(
HaobanRoleDTO
haobanRoleDTO
,
String
enterpriseId
)
{
if
(
haobanRoleDTO
==
null
)
{
return
null
;
}
HaobanRoleVO
haobanRoleVO
=
EntityUtil
.
changeEntityNew
(
HaobanRoleVO
.
class
,
haobanRoleDTO
);
int
potentialHide
=
StringUtils
.
isNotBlank
(
MarketingSwitcher
.
POTENTIAL_HIDE_STORE_ENTERPRISE_ID
)
&&
StringUtils
.
isNotBlank
(
enterpriseId
)
&&
MarketingSwitcher
.
POTENTIAL_HIDE_STORE_ENTERPRISE_ID
.
contains
(
enterpriseId
)
?
1
:
0
;
haobanRoleVO
.
setPotentialHide
(
potentialHide
);
return
haobanRoleVO
;
}
}
/**
/**
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/AuditSettingVO.java
View file @
7c25782e
...
@@ -26,8 +26,6 @@ public class AuditSettingVO implements Serializable {
...
@@ -26,8 +26,6 @@ public class AuditSettingVO implements Serializable {
private
int
showMemberSign
;
private
int
showMemberSign
;
// 是否显示ai换装
// 是否显示ai换装
private
int
showAiCustom
;
private
int
showAiCustom
;
// 潜客雷达隐藏折扣店
private
int
potentialHide
;
private
JSONObject
shareMemberSignInfo
;
private
JSONObject
shareMemberSignInfo
;
...
@@ -39,14 +37,6 @@ public class AuditSettingVO implements Serializable {
...
@@ -39,14 +37,6 @@ public class AuditSettingVO implements Serializable {
this
.
showAiCustom
=
showAiCustom
;
this
.
showAiCustom
=
showAiCustom
;
}
}
public
int
getPotentialHide
()
{
return
potentialHide
;
}
public
void
setPotentialHide
(
int
potentialHide
)
{
this
.
potentialHide
=
potentialHide
;
}
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
public
JSONObject
getShareMemberSignInfo
()
{
public
JSONObject
getShareMemberSignInfo
()
{
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/HaobanRoleVO.java
0 → 100644
View file @
7c25782e
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
com.gic.haoban.manage.api.dto.role.HaobanRoleDTO
;
public
class
HaobanRoleVO
extends
HaobanRoleDTO
{
// 潜客雷达隐藏折扣店
private
int
potentialHide
;
public
int
getPotentialHide
()
{
return
potentialHide
;
}
public
void
setPotentialHide
(
int
potentialHide
)
{
this
.
potentialHide
=
potentialHide
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment