Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
f448aec5
Commit
f448aec5
authored
Jun 07, 2021
by
hanghang.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整取餐码起始规则
parent
bf0faadb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
+0
-6
No files found.
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
View file @
f448aec5
...
...
@@ -49,9 +49,7 @@ public class OrderTackCodeManager {
public
String
generateTackCode
(
Integer
orderType
,
String
partnerId
,
String
storeId
,
ConfirmOrderRequest
var1
,
Function
<
Integer
,
String
>
fun
)
{
String
key
=
this
.
getOrderTackCodeKey
(
partnerId
);
String
randomKey
=
getRandomOrderTackCodeKey
(
partnerId
,
storeId
);
redisTemplate
.
delete
(
randomKey
);
String
rule
=
(
String
)
redisTemplate
.
opsForHash
().
entries
(
key
).
get
(
"rule"
);
log
.
info
(
"tackCode rule1 : "
+
rule
);
AssortmentTackCodeRule
assortmentTackCodeRule
=
null
;
if
(
Objects
.
isNull
(
rule
)
||
rule
.
isEmpty
())
{
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
...
...
@@ -76,13 +74,10 @@ public class OrderTackCodeManager {
}
else
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
THE_CUSTOM
.
getCode
()+
""
))
{
//规则自定义
Map
<
Object
,
Object
>
tackCodeSettingMap
=
redisTemplate
.
opsForHash
().
entries
(
randomKey
);
// log.info("tackCode rule3 : " + assortmentTackCodeRule );
if
(
tackCodeSettingMap
.
isEmpty
())
{
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
// log.info("tackCode rule4 : " + assortmentTackCodeRule );
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
}
// log.info("tackCode rule5 : " + assortmentTackCodeRule );
initTackCodeSettingHash
(
assortmentTackCodeRule
,
randomKey
,
tackCodeSettingMap
);
}
//判断订单类型
...
...
@@ -104,7 +99,6 @@ public class OrderTackCodeManager {
}
code
=
String
.
format
(
"%0"
+
length
+
"d"
,
Integer
.
parseInt
(
code
));
}
log
.
info
(
"tackCode rule7 : "
+
head
+
code
);
return
head
+
code
;
}
else
{
...
...
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