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
592ab7ee
Commit
592ab7ee
authored
Jul 07, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除打印日志
parent
965f3d1f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
+0
-6
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-2
No files found.
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
View file @
592ab7ee
...
@@ -53,9 +53,7 @@ public class OrderTackCodeManager {
...
@@ -53,9 +53,7 @@ public class OrderTackCodeManager {
String
rule
=
(
String
)
redisTemplate
.
opsForHash
().
entries
(
key
).
get
(
"rule"
);
String
rule
=
(
String
)
redisTemplate
.
opsForHash
().
entries
(
key
).
get
(
"rule"
);
AssortmentTackCodeRule
assortmentTackCodeRule
=
null
;
AssortmentTackCodeRule
assortmentTackCodeRule
=
null
;
if
(
Objects
.
isNull
(
rule
)
||
rule
.
isEmpty
())
{
if
(
Objects
.
isNull
(
rule
)
||
rule
.
isEmpty
())
{
LogUtil
.
info
(
"queryTackCodeRule1"
,
partnerId
,
storeId
);
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
LogUtil
.
info
(
"queryTackCodeRule_end"
,
partnerId
,
storeId
);
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
rule
=
String
.
valueOf
(
OrderTackCodeRuleEnum
.
RANDOM_NUMBER_ONE
.
getCode
());
rule
=
String
.
valueOf
(
OrderTackCodeRuleEnum
.
RANDOM_NUMBER_ONE
.
getCode
());
}
else
{
}
else
{
...
@@ -66,7 +64,6 @@ public class OrderTackCodeManager {
...
@@ -66,7 +64,6 @@ public class OrderTackCodeManager {
}
}
if
(!
Objects
.
isNull
(
var1
)){
var1
.
setMealCodeRule
(
rule
);}
if
(!
Objects
.
isNull
(
var1
)){
var1
.
setMealCodeRule
(
rule
);}
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
RANDOM_NUMBER
.
getCode
()+
""
))
{
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
RANDOM_NUMBER
.
getCode
()+
""
))
{
LogUtil
.
info
(
"queryTackCodeRule2"
,
partnerId
,
storeId
);
//6位码
//6位码
String
number
=
generateNumber
(
6
);
String
number
=
generateNumber
(
6
);
if
(!
redisTemplate
.
opsForHash
().
hasKey
(
randomKey
,
storeId
+
number
))
{
if
(!
redisTemplate
.
opsForHash
().
hasKey
(
randomKey
,
storeId
+
number
))
{
...
@@ -75,12 +72,10 @@ public class OrderTackCodeManager {
...
@@ -75,12 +72,10 @@ public class OrderTackCodeManager {
return
number
;
return
number
;
}
}
}
else
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
THE_CUSTOM
.
getCode
()+
""
))
{
}
else
if
(
StringUtils
.
isNotEmpty
(
rule
)
&&
rule
.
equals
(
OrderTackCodeRuleEnum
.
THE_CUSTOM
.
getCode
()+
""
))
{
LogUtil
.
info
(
"queryTackCodeRule3"
,
partnerId
,
storeId
);
//规则自定义
//规则自定义
Map
<
Object
,
Object
>
tackCodeSettingMap
=
redisTemplate
.
opsForHash
().
entries
(
randomKey
);
Map
<
Object
,
Object
>
tackCodeSettingMap
=
redisTemplate
.
opsForHash
().
entries
(
randomKey
);
if
(
tackCodeSettingMap
.
isEmpty
())
{
if
(
tackCodeSettingMap
.
isEmpty
())
{
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
if
(
Objects
.
isNull
(
assortmentTackCodeRule
))
{
LogUtil
.
info
(
"queryTackCodeRule4"
,
partnerId
,
storeId
);
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
assortmentTackCodeRule
=
assortmentTackCodeRuleManager
.
queryTackCodeRule
(
partnerId
);
}
}
initTackCodeSettingHash
(
assortmentTackCodeRule
,
randomKey
,
tackCodeSettingMap
);
initTackCodeSettingHash
(
assortmentTackCodeRule
,
randomKey
,
tackCodeSettingMap
);
...
@@ -106,7 +101,6 @@ public class OrderTackCodeManager {
...
@@ -106,7 +101,6 @@ public class OrderTackCodeManager {
}
}
return
head
+
code
;
return
head
+
code
;
}
else
{
}
else
{
LogUtil
.
info
(
"queryTackCodeRule5"
,
partnerId
,
storeId
);
if
(!
redisTemplate
.
opsForHash
().
hasKey
(
key
,
storeId
))
{
if
(!
redisTemplate
.
opsForHash
().
hasKey
(
key
,
storeId
))
{
redisTemplate
.
opsForHash
().
put
(
key
,
storeId
,
Integer
.
parseInt
(
generateNumber
(
4
)));
redisTemplate
.
opsForHash
().
put
(
key
,
storeId
,
Integer
.
parseInt
(
generateNumber
(
4
)));
redisTemplate
.
expire
(
key
,
24
,
TimeUnit
.
HOURS
);
redisTemplate
.
expire
(
key
,
24
,
TimeUnit
.
HOURS
);
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
592ab7ee
...
@@ -558,9 +558,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -558,9 +558,7 @@ public class OrderServiceImpl implements Orderservice {
if
(
CollectionUtils
.
isNotEmpty
(
notAutomaticTwistPartnerId
)
&&
notAutomaticTwistPartnerId
.
contains
(
partnerId
))
{
if
(
CollectionUtils
.
isNotEmpty
(
notAutomaticTwistPartnerId
)
&&
notAutomaticTwistPartnerId
.
contains
(
partnerId
))
{
var1
.
setNotAutomaticTwistTime
(
notAutomaticTwistTime
);
var1
.
setNotAutomaticTwistTime
(
notAutomaticTwistTime
);
}
}
LogUtil
.
info
(
"generateTackCode_start"
,
orderBean
.
getOid
(),
storeId
);
String
pickUpGoodsNo
=
orderTackCodeManager
.
generateTackCode
(
orderBean
.
getType
(),
partnerId
,
storeId
,
var1
,
OrderTackCodeFactory
.
getByOrderClient
(
orderBean
.
getOrderClient
()).
getGenerateTackCodeFunc
());
String
pickUpGoodsNo
=
orderTackCodeManager
.
generateTackCode
(
orderBean
.
getType
(),
partnerId
,
storeId
,
var1
,
OrderTackCodeFactory
.
getByOrderClient
(
orderBean
.
getOrderClient
()).
getGenerateTackCodeFunc
());
LogUtil
.
info
(
"generateTackCode_end"
,
orderBean
.
getOid
(),
storeId
);
var1
.
setPickUpGoodsNo
(
pickUpGoodsNo
);
var1
.
setPickUpGoodsNo
(
pickUpGoodsNo
);
// 订单支付成功
// 订单支付成功
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
response
.
order
.
PayAccessResponse
payAccessRes
=
orderBusinessService
.
payAccess
(
var1
);
com
.
freemud
.
sdk
.
api
.
assortment
.
order
.
response
.
order
.
PayAccessResponse
payAccessRes
=
orderBusinessService
.
payAccess
(
var1
);
...
...
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