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
76561474
Commit
76561474
authored
Sep 12, 2024
by
徐高华
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/xgh/240820' into 'master'
Feature/xgh/240820 See merge request
!2139
parents
fe1d687c
b1e0fc08
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
184 additions
and
14 deletions
+184
-14
WxEnterpriseInfoController.java
...ban/manage/web/controller/WxEnterpriseInfoController.java
+2
-0
WxStaffController.java
...m/gic/haoban/manage/web/controller/WxStaffController.java
+52
-13
CustomSwitcher.java
.../java/com/gic/haoban/manage/web/utils/CustomSwitcher.java
+16
-0
SwitcherInitialization.java
...m/gic/haoban/manage/web/utils/SwitcherInitialization.java
+17
-0
AiCustomVO.java
...rc/main/java/com/gic/haoban/manage/web/vo/AiCustomVO.java
+66
-0
AuditSettingVO.java
...ain/java/com/gic/haoban/manage/web/vo/AuditSettingVO.java
+10
-1
StoreMemberVO.java
...main/java/com/gic/haoban/manage/web/vo/StoreMemberVO.java
+18
-0
dubbo-haoban-manage-wx.xml
...ge3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
+3
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
View file @
76561474
...
...
@@ -472,6 +472,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
storeMemberVO
.
setClerkType
(
clerkDTO
.
getClerkType
());
storeMemberVO
.
setStaffId
(
staffDTO
.
getStaffId
());
storeMemberVO
.
setClerkId
(
clerkDTO
.
getClerkId
());
storeMemberVO
.
setClerkName
(
clerkDTO
.
getClerkName
());
storeMemberVO
.
setClerkHead
(
clerkDTO
.
getHeadImgUrl
());
retList
.
add
(
storeMemberVO
);
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
View file @
76561474
...
...
@@ -19,6 +19,8 @@ import com.gic.enterprise.api.dto.custompage.CustomPageRenderDTO;
import
com.gic.enterprise.api.enums.CustomPageTypeEnum
;
import
com.gic.enterprise.api.service.*
;
import
com.gic.haoban.manage.web.qo.StaffAddVO
;
import
com.gic.haoban.manage.web.utils.CustomSwitcher
;
import
com.gic.haoban.manage.web.vo.*
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
...
...
@@ -94,19 +96,6 @@ import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
import
com.gic.haoban.manage.web.config.Config
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.qo.CommonQO
;
import
com.gic.haoban.manage.web.vo.AuditSettingVO
;
import
com.gic.haoban.manage.web.vo.BindClerkVO
;
import
com.gic.haoban.manage.web.vo.ClerkDetailVo
;
import
com.gic.haoban.manage.web.vo.ClerkEditInfoVO
;
import
com.gic.haoban.manage.web.vo.ClerkListVO
;
import
com.gic.haoban.manage.web.vo.ClerkStoreVO
;
import
com.gic.haoban.manage.web.vo.OperationSettingVO
;
import
com.gic.haoban.manage.web.vo.RightVO
;
import
com.gic.haoban.manage.web.vo.StaffStoreVO
;
import
com.gic.haoban.manage.web.vo.StaffVO
;
import
com.gic.haoban.manage.web.vo.StoreClerkVO
;
import
com.gic.haoban.manage.web.vo.StoreListVO
;
import
com.gic.haoban.manage.web.vo.StoreRoleVO
;
import
com.gic.haoban.manage.web.vo.notify.CustomerFriendMemberVO
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
...
...
@@ -164,6 +153,9 @@ public class WxStaffController extends WebBaseController {
private
EnterpriseUseForbidService
enterpriseUseForbidService
;
@Autowired
private
CustomPageNewService
customPageNewService
;
@Autowired
private
EnterpriseWxaLinkService
enterpriseWxaLinkService
;
// 选择成员列表
@RequestMapping
(
"/staff-list"
)
...
...
@@ -355,9 +347,56 @@ public class WxStaffController extends WebBaseController {
JSONObject
json
=
this
.
getMemberSignPage
(
storeDTO
.
getEnterpriseId
())
;
auditSettingVO
.
setShowMemberSign
(
null
==
json
?
0
:
1
);
auditSettingVO
.
setShareMemberSignInfo
(
json
);
auditSettingVO
.
setShowAiCustom
(
this
.
aiCustom
(
storeDTO
.
getEnterpriseId
()));
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
auditSettingVO
);
}
private
int
aiCustom
(
String
enterpriseId
)
{
List
<
JSONObject
>
list
=
CustomSwitcher
.
haoban_ai_custom
;
if
(
CollectionUtils
.
isEmpty
(
list
))
{
return
0
;
}
List
<
AiCustomVO
>
voList
=
list
.
stream
().
map
(
o
->
JSONObject
.
parseObject
(
o
.
toJSONString
(),
AiCustomVO
.
class
)).
collect
(
Collectors
.
toList
());
voList
=
voList
.
stream
().
filter
(
o
->
o
.
getIsOpen
()==
1
&&
o
.
getEid
().
equals
(
enterpriseId
)).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
voList
))
{
return
1
;
}
return
0
;
}
/**
* 获取会员签到页分析配置
* @param enterpriseId
* @return
*/
@IgnoreLogin
@RequestMapping
(
"/get-ai-custom-setting"
)
public
RestResponse
<
Object
>
getAiCustomSetting
(
String
enterpriseId
,
String
clerkId
)
{
String
clerkCode
=
""
;
if
(
null
!=
clerkId
)
{
ClerkDTO
clerkDTO
=
this
.
clerkService
.
getClerkByClerkId
(
clerkId
);
if
(
null
!=
clerkDTO
&&
clerkDTO
.
getClerkType
()<=
1
)
{
clerkCode
=
clerkDTO
.
getClerkCode
();
}
}
List
<
JSONObject
>
list
=
CustomSwitcher
.
haoban_ai_custom
;
List
<
AiCustomVO
>
voList
=
list
.
stream
().
map
(
o
->
JSONObject
.
parseObject
(
o
.
toJSONString
(),
AiCustomVO
.
class
)).
collect
(
Collectors
.
toList
());
voList
=
voList
.
stream
().
filter
(
o
->
o
.
getIsOpen
()==
1
&&
o
.
getEid
().
equals
(
enterpriseId
)).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
voList
))
{
AiCustomVO
vo
=
voList
.
get
(
0
)
;
String
h5
=
String
.
format
(
vo
.
getUrl
(),
clerkCode
)
;
String
str
=
"{\"url\":\""
+
h5
+
"\",\"id\":\"5\"}"
;
Map
<
String
,
Object
>
map
=
this
.
enterpriseWxaLinkService
.
getWxaLinkAndQrCode
(
enterpriseId
,
str
)
;
vo
.
setPath
(
map
.
get
(
"link"
).
toString
());
vo
.
setQrcode
(
map
.
get
(
"url"
).
toString
());
return
RestResponse
.
successResult
(
vo
);
}
return
RestResponse
.
failure
(
"9999"
,
"请联系管理员配置"
)
;
}
/**
* 获取会员签到页分析配置
* @param enterpriseId
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/CustomSwitcher.java
0 → 100644
View file @
76561474
package
com
.
gic
.
haoban
.
manage
.
web
.
utils
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.commons.switcher.Switcher
;
import
com.gic.commons.switcher.SwitcherNamespace
;
import
java.util.List
;
@SwitcherNamespace
(
"BUZ.qywx.open"
)
public
class
CustomSwitcher
{
@Switcher
public
static
List
<
JSONObject
>
haoban_ai_custom
;
}
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/SwitcherInitialization.java
0 → 100644
View file @
76561474
package
com
.
gic
.
haoban
.
manage
.
web
.
utils
;
import
com.gic.commons.switcher.SwitcherApplication
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.stereotype.Component
;
import
java.util.concurrent.atomic.AtomicBoolean
;
@Component
public
class
SwitcherInitialization
implements
InitializingBean
{
static
AtomicBoolean
INIT
=
new
AtomicBoolean
(
false
);
@Override
public
void
afterPropertiesSet
()
throws
Exception
{
SwitcherApplication
.
init
(
CustomSwitcher
.
class
);
}
}
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/AiCustomVO.java
0 → 100644
View file @
76561474
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
java.io.Serializable
;
public
class
AiCustomVO
implements
Serializable
{
private
int
isOpen
=
0
;
private
String
eid
;
private
String
url
;
private
String
img
;
private
String
path
;
private
String
qrcode
;
public
String
getPath
()
{
return
path
;
}
public
void
setPath
(
String
path
)
{
this
.
path
=
path
;
}
public
String
getQrcode
()
{
return
qrcode
;
}
public
void
setQrcode
(
String
qrcode
)
{
this
.
qrcode
=
qrcode
;
}
public
String
getImg
()
{
return
img
;
}
public
void
setImg
(
String
img
)
{
this
.
img
=
img
;
}
public
int
getIsOpen
()
{
return
isOpen
;
}
public
void
setIsOpen
(
int
isOpen
)
{
this
.
isOpen
=
isOpen
;
}
public
String
getEid
()
{
return
eid
;
}
public
void
setEid
(
String
eid
)
{
this
.
eid
=
eid
;
}
public
String
getUrl
()
{
return
url
;
}
public
void
setUrl
(
String
url
)
{
this
.
url
=
url
;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/AuditSettingVO.java
View file @
76561474
...
...
@@ -17,7 +17,6 @@ public class AuditSettingVO implements Serializable {
private
Date
updateTime
;
private
Integer
statusFlag
;
private
Integer
clerkChangeFlag
;
private
int
wxEnterpriseType
;
...
...
@@ -25,9 +24,19 @@ public class AuditSettingVO implements Serializable {
private
int
freshFriendFlag
;
// 是否显示会员签到
private
int
showMemberSign
;
// 是否显示ai换装
private
int
showAiCustom
;
private
JSONObject
shareMemberSignInfo
;
public
int
getShowAiCustom
()
{
return
showAiCustom
;
}
public
void
setShowAiCustom
(
int
showAiCustom
)
{
this
.
showAiCustom
=
showAiCustom
;
}
private
static
final
long
serialVersionUID
=
1L
;
public
JSONObject
getShareMemberSignInfo
()
{
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreMemberVO.java
View file @
76561474
...
...
@@ -21,6 +21,24 @@ public class StoreMemberVO implements Serializable {
private
String
storeImg
;
private
int
clerkType
;
private
int
bindFlag
;
private
String
clerkName
;
private
String
clerkHead
;
public
String
getClerkHead
()
{
return
clerkHead
;
}
public
void
setClerkHead
(
String
clerkHead
)
{
this
.
clerkHead
=
clerkHead
;
}
public
String
getClerkName
()
{
return
clerkName
;
}
public
void
setClerkName
(
String
clerkName
)
{
this
.
clerkName
=
clerkName
;
}
public
String
getUserId
()
{
return
userId
;
...
...
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
View file @
76561474
...
...
@@ -173,5 +173,8 @@
<dubbo:reference
id=
"enterpriseChannelApiService"
interface=
"com.gic.enterprise.api.service.EnterpriseChannelApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"storeRankApiService"
interface=
"com.gic.enterprise.api.service.rank.StoreRankApiService"
timeout=
"100000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"enterpriseWxaLinkService"
interface=
"com.gic.enterprise.api.service.EnterpriseWxaLinkService"
timeout=
"100000"
retries=
"0"
check=
"false"
/>
</beans>
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