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
1
Merge Requests
1
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
1c0226d8
Commit
1c0226d8
authored
Apr 08, 2023
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 互动记录加锁操作
parent
a5527591
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
73 deletions
+79
-73
InteractRecordMessageService.java
...service/content/message/InteractRecordMessageService.java
+73
-71
MaterialDataStaticsController.java
...web/controller/content/MaterialDataStaticsController.java
+6
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java
View file @
1c0226d8
This diff is collapsed.
Click to expand it.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/MaterialDataStaticsController.java
View file @
1c0226d8
...
...
@@ -93,7 +93,7 @@ public class MaterialDataStaticsController {
MaterialIndexDataVO
indexDataVO
=
MaterialIndexDataVO
.
builder
()
.
newMaterialNum
(
totalMaterialNum
)
.
useMaterialClerkNum
(
temp
.
getUseMatlClerkNum
())
.
unUseMaterialClerkNum
(
temp
.
get
ClickUser
Num
())
.
unUseMaterialClerkNum
(
temp
.
get
UnusedMatlClerk
Num
())
.
conversionAmount
(
Optional
.
ofNullable
(
temp
.
getConvSalesAmt
()).
orElse
(
BigDecimal
.
ZERO
))
.
storeManagerNum
(
totalManagerStoreNum
)
.
build
();
...
...
@@ -117,7 +117,11 @@ public class MaterialDataStaticsController {
}
MaterialTodayDataBO
materialTodayDataBO
=
materialDataAdaptor
.
queryMaterialTodayData
(
materialStatisticsBaseQO
.
getEnterpriseId
(),
storeIds
);
MaterialRealDataVO
temp
=
new
MaterialRealDataVO
();
BeanUtils
.
copyProperties
(
materialTodayDataBO
,
temp
);
temp
.
setUseMatlClerkNum
(
materialTodayDataBO
.
getUseMatlClerkNum
());
temp
.
setUnusedMatlClerkNum
(
materialTodayDataBO
.
getUnusedMatlClerkNum
());
temp
.
setClickUserNum
(
materialTodayDataBO
.
getClickUserNum
());
temp
.
setConvUserNum
(
materialTodayDataBO
.
getConvUserNum
());
temp
.
setConvSalesAmt
(
materialTodayDataBO
.
getConvSalesAmt
());
return
RestResponse
.
successResult
(
temp
);
}
...
...
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