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
c45a2388
Commit
c45a2388
authored
Jul 21, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加说明
parent
9246cd6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
HmLinkWxaDTO.java
...n/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
+7
-5
HmLinkApiServiceImpl.java
...age/service/service/out/impl/hm/HmLinkApiServiceImpl.java
+10
-6
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
View file @
c45a2388
...
...
@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.hm;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.Map
;
/**
*
...
...
@@ -30,7 +31,7 @@ public class HmLinkWxaDTO implements Serializable {
// 推荐的门店列表
private
List
<
HmLinkStoreDTO
>
storeList
;
// 说明
private
String
sm
;
private
Map
<
String
,
String
>
remarkMap
;
public
Long
getHmId
()
{
return
hmId
;
...
...
@@ -55,13 +56,14 @@ public class HmLinkWxaDTO implements Serializable {
public
void
setPageId
(
Long
pageId
)
{
this
.
pageId
=
pageId
;
}
public
String
getSm
()
{
return
sm
;
public
Map
<
String
,
String
>
getRemarkMap
()
{
return
remarkMap
;
}
public
void
set
Sm
(
String
sm
)
{
this
.
sm
=
sm
;
public
void
set
RemarkMap
(
Map
<
String
,
String
>
remarkMap
)
{
this
.
remarkMap
=
remarkMap
;
}
public
String
getHmQrcode
()
{
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
View file @
c45a2388
...
...
@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.out.impl.hm;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Random
;
...
...
@@ -10,7 +11,6 @@ import java.util.stream.Collectors;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter.Red
;
import
org.redisson.api.RRateLimiter
;
import
org.redisson.api.RateIntervalUnit
;
import
org.redisson.api.RateType
;
...
...
@@ -160,6 +160,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
log
.
info
(
"小程序获取活码={},linkShortCode={},mixPhone={},memberId={},unionid={},门店={}{}"
,
enterpriseId
,
linkShortCode
,
mixPhone
,
memberId
,
unionid
,
inStoreId
,
whitchStore
);
HmLinkBO
link
=
this
.
hmLinkService
.
getByLinkShortCodeCache
(
linkShortCode
);
Map
<
String
,
String
>
remarkMap
=
new
HashMap
<>();
if
(
null
==
link
)
{
log
.
error
(
"链接记录不存,linkShortCode={}"
,
linkShortCode
);
return
ServiceResponse
.
failure
(
HaoBanErrCode
.
ERR_OTHER
.
getCode
(),
"链接记录不存"
);
...
...
@@ -221,7 +222,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
if
(
null
==
hm
)
{
return
ServiceResponse
.
failure
(
HaoBanErrCode
.
ERR_OTHER
.
getCode
(),
"导购活码不存在"
);
}
re
tDTO
.
setSm
(
"会员选门店活码"
);
re
markMap
.
put
(
"sm"
,
"会员选门店活码"
);
}
}
// 会员门店
...
...
@@ -262,7 +263,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
hm
=
this
.
getHmFormStore
(
wxEnterpriseId
,
mainStoreId
,
fwStore
.
getDz
(),
fwStore
.
getDy
());
}
if
(
null
!=
hm
)
{
re
tDTO
.
setSm
(
"会员主门店活码"
);
re
markMap
.
put
(
"sm"
,
"会员主门店活码"
);
}
}
// 协管门店
...
...
@@ -303,7 +304,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
}
}
if
(
null
!=
hm
)
{
re
tDTO
.
setSm
(
"会员协管活码"
);
re
markMap
.
put
(
"sm"
,
"会员协管活码"
);
}
}
}
...
...
@@ -334,6 +335,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
if
(
null
!=
hm
)
{
log
.
info
(
"获取到单人活码={}"
,
JSON
.
toJSONString
(
hm
));
retDTO
.
setHmId
(
hm
.
getHmId
());
remarkMap
.
put
(
"clerk"
,
hm
.
getClerkId
())
;
// 判断是否已经是好友
boolean
isFriend
=
false
;
if
(
null
!=
memberId
)
{
...
...
@@ -344,7 +346,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
isFriend
=
true
;
log
.
info
(
"已经是好友,staffid={},memberId={}"
,
staffId
,
memberId
);
retDTO
.
setHmQrcode
(
hm
.
getWxQrcode
());
re
tDTO
.
setSm
(
"老好友,取单人活码"
);
re
markMap
.
put
(
"sm"
,
"老好友,取单人活码"
);
}
}
...
...
@@ -357,10 +359,11 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
if
(
null
!=
dthmKey
)
{
ServiceResponse
<
String
>
addResp
=
this
.
addQrcode
(
hm
,
dthmKey
,
wxEnterpriseDTO
.
getCorpid
(),
retDTO
);
if
(!
addResp
.
isSuccess
())
{
re
tDTO
.
setSm
(
"创建动态活码失败,取单人活码"
);
re
markMap
.
put
(
"sm"
,
"创建动态活码失败,取单人活码"
);
if
(
StringUtils
.
isBlank
(
hm
.
getWxQrcode
()))
{
return
ServiceResponse
.
failure
(
HaoBanErrCode
.
ERR_OTHER
.
getCode
(),
"导购活码不存在"
);
}
remarkMap
.
put
(
"isDT"
,
"动态活码"
)
;
retDTO
.
setHmQrcode
(
hm
.
getWxQrcode
());
}
else
{
retDTO
.
setHmQrcode
(
addResp
.
getResult
());
...
...
@@ -369,6 +372,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
}
}
// 生成动态活码
retDTO
.
setRemarkMap
(
remarkMap
);
log
.
info
(
JSON
.
toJSONString
(
retDTO
,
true
));
return
ServiceResponse
.
success
(
retDTO
);
}
...
...
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