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
91b6c184
Commit
91b6c184
authored
Jun 07, 2021
by
hanghang.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉日志
parent
8b2d667b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
13 deletions
+0
-13
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
+0
-13
No files found.
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
View file @
91b6c184
...
...
@@ -47,19 +47,12 @@ public class OrderTackCodeManager {
* @return
*/
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
(
key
);
redisTemplate
.
delete
(
randomKey
);
String
rule
=
(
String
)
redisTemplate
.
opsForHash
().
entries
(
key
).
get
(
"rule"
);
log
.
info
(
"assortmentTackCodeRule 1 key:"
+
key
+
" randomKey:"
+
randomKey
+
" rule:"
+
rule
);
AssortmentTackCodeRule
assortmentTackCodeRule
=
null
;
if
(
Objects
.
isNull
(
rule
)
||
rule
.
isEmpty
())
{
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
log
.
info
(
"assortmentTackCodeRule 2 :"
+
assortmentTackCodeRule
);
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
rule
=
String
.
valueOf
(
OrderTackCodeRuleEnum
.
RANDOM_NUMBER_ONE
.
getCode
());
}
else
{
...
...
@@ -67,10 +60,8 @@ public class OrderTackCodeManager {
}
redisTemplate
.
opsForHash
().
put
(
key
,
"rule"
,
rule
);
redisTemplate
.
expire
(
key
,
24
,
TimeUnit
.
HOURS
);
log
.
info
(
"assortmentTackCodeRule 3 :"
+
rule
);
}
if
(!
Objects
.
isNull
(
var1
)){
var1
.
setMealCodeRule
(
rule
);}
log
.
info
(
"assortmentTackCodeRule 4 :"
+
rule
);
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
RANDOM_NUMBER
.
getCode
()+
""
))
{
//6位码
String
number
=
generateNumber
(
6
);
...
...
@@ -79,11 +70,9 @@ public class OrderTackCodeManager {
redisTemplate
.
expire
(
randomKey
,
getSecondsNextEarlyMorning
(),
TimeUnit
.
SECONDS
);
return
number
;
}
}
else
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
THE_CUSTOM
.
getCode
()+
""
))
{
//规则自定义
Map
<
Object
,
Object
>
tackCodeSettingMap
=
redisTemplate
.
opsForHash
().
entries
(
randomKey
);
log
.
info
(
"assortmentTackCodeRule 5 :"
+
tackCodeSettingMap
);
if
(
tackCodeSettingMap
.
isEmpty
())
{
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
...
...
@@ -93,7 +82,6 @@ public class OrderTackCodeManager {
//判断订单类型
String
head
=
""
,
code
=
""
;
OrderType
orderTypeEnum
=
OrderType
.
getByCode
(
orderType
);
log
.
info
(
"assortmentTackCodeRule 6 :"
+
tackCodeSettingMap
);
if
(!
Objects
.
isNull
(
orderTypeEnum
)){
String
tackDesc
=
orderTypeEnum
.
getTackDesc
();
head
=
tackCodeSettingMap
.
get
(
tackDesc
+
"Head"
).
toString
();
...
...
@@ -111,7 +99,6 @@ public class OrderTackCodeManager {
code
=
String
.
format
(
"%0"
+
length
+
"d"
,
Integer
.
parseInt
(
code
));
}
return
head
+
code
;
}
else
{
if
(!
redisTemplate
.
opsForHash
().
hasKey
(
key
,
storeId
))
{
redisTemplate
.
opsForHash
().
put
(
key
,
storeId
,
Integer
.
parseInt
(
generateNumber
(
4
)));
...
...
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