Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 40ad5f18
authored
Jul 18, 2024
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
[chg] 代码优化
1 parent
784207e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
src/main/java/vion/cron/ContractRunner.java
src/main/java/vion/service/impl/StoreServiceImpl.java
src/main/java/vion/cron/ContractRunner.java
View file @
40ad5f1
...
...
@@ -221,7 +221,7 @@ public class ContractRunner {
if
(!
productArr
.
isEmpty
())
{
productArr
.
forEach
(
pro
->
{
var
product
=
JSONUtil
.
parseObj
(
pro
);
var
crmProJson
=
crmProList
.
stream
().
filter
(
p
->
p
.
getInt
(
"dataId"
).
equals
(
product
.
getInt
(
"text_1"
))).
toList
().
get
(
0
);
var
crmProJson
=
crmProList
.
stream
().
filter
(
p
->
p
.
getInt
(
"dataId"
).
equals
(
product
.
getInt
(
"text_1"
))).
toList
().
get
First
(
);
var
crmPro
=
crmProJson
.
getJSONObject
(
"data"
);
var
contractProduct
=
new
RContractProduct
();
...
...
src/main/java/vion/service/impl/StoreServiceImpl.java
View file @
40ad5f1
...
...
@@ -217,7 +217,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
Opt
.
ofNullable
(
masterContract
)
.
map
(
c
->
contractId2CpMap
.
getOrDefault
(
c
.
getId
(),
ListUtil
.
empty
()))
.
filter
(
CollUtil:
:
isNotEmpty
)
.
map
(
l
->
l
.
get
(
0
).
getNodeDate
())
.
map
(
l
->
l
.
get
First
(
).
getNodeDate
())
.
ifPresent
(
nodeDate
->
masterContract
.
setFinalDate
(
nodeDate
));
storeVO
.
setMainContract
(
Opt
.
ofNullable
(
masterContract
).
map
(
c
->
converter
.
convert
(
c
,
ContractVO
.
class
)).
orElse
(
null
));
...
...
@@ -312,7 +312,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
Opt
.
ofNullable
(
contractId2CpMap
.
getOrDefault
(
masterContract
.
getId
(),
ListUtil
.
empty
()))
.
filter
(
CollUtil:
:
isNotEmpty
)
.
map
(
l
->
l
.
get
(
0
).
getNodeDate
())
.
map
(
l
->
l
.
get
First
(
).
getNodeDate
())
.
ifPresent
(
masterContract:
:
setFinalDate
);
Date
finalDate
=
masterContract
.
getFinalDate
();
...
...
@@ -442,7 +442,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
.
leftJoin
(
StoreLog
.
class
,
StoreLog:
:
getStoreId
,
Store:
:
getId
)
.
eq
(
StoreLog:
:
getId
,
id
);
var
storeVO
=
this
.
selectJoinOne
(
StoreVO
.
class
,
wrapper
);
var
storeLog
=
storeVO
.
getStoreLog
().
get
(
0
);
var
storeLog
=
storeVO
.
getStoreLog
().
get
First
(
);
var
user
=
(
User
)
redissonClient
.
getBucket
(
RedisKeyEnum
.
DING_PREFIX
.
getVal
()
+
RedisKeyEnum
.
USER_ID
.
getVal
()
+
storeLog
.
getCreateUser
()).
get
();
var
content
=
storeLog
.
getContent
();
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment