Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
276afec7
Commit
276afec7
authored
Jun 27, 2024
by
shiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配置lot加锁,预估价默认为0
parent
e1313049
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java
.../wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java
+12
-6
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java
...va/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java
+1
-1
No files found.
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java
View file @
276afec7
...
@@ -18,10 +18,12 @@ import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
...
@@ -18,10 +18,12 @@ import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
import
com.xxdxxs.utils.DateUtils
;
import
com.xxdxxs.utils.DateUtils
;
import
com.xxdxxs.utils.EntityMapper
;
import
com.xxdxxs.utils.EntityMapper
;
import
io.swagger.models.auth.In
;
import
io.swagger.models.auth.In
;
import
javafx.beans.binding.ObjectExpression
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Isolation
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.interceptor.TransactionAspectSupport
;
import
org.springframework.transaction.interceptor.TransactionAspectSupport
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
...
@@ -220,6 +222,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
...
@@ -220,6 +222,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
specialPerformanceConfig
.
setItemId
(
Long
.
valueOf
(
itemId
));
specialPerformanceConfig
.
setItemId
(
Long
.
valueOf
(
itemId
));
specialPerformanceConfig
.
setSpecialPerformanceId
(
dto
.
getSpecialPerformanceId
());
specialPerformanceConfig
.
setSpecialPerformanceId
(
dto
.
getSpecialPerformanceId
());
specialPerformanceConfig
.
setCurrentPrice
(
auctionConfig
.
getStartPrice
());
specialPerformanceConfig
.
setCurrentPrice
(
auctionConfig
.
getStartPrice
());
specialPerformanceConfig
.
setLot
(
0
);
specialPerformanceConfig
.
setState
(
SpecialPerformanceEnum
.
ConfigStateEnum
.
VALID
.
getCode
());
specialPerformanceConfig
.
setState
(
SpecialPerformanceEnum
.
ConfigStateEnum
.
VALID
.
getCode
());
Random
random
=
new
Random
();
Random
random
=
new
Random
();
int
randomNumber
=
random
.
nextInt
(
20
);
int
randomNumber
=
random
.
nextInt
(
20
);
...
@@ -267,6 +270,8 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
...
@@ -267,6 +270,8 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
@Override
@Override
public
Result
itemSort
(
SpecialPerformanceConfigRequestDto
dto
)
{
public
Result
itemSort
(
SpecialPerformanceConfigRequestDto
dto
)
{
try
{
try
{
Object
lock
=
new
Object
();
synchronized
(
lock
)
{
//校验是否lot重复
//校验是否lot重复
boolean
isExist
=
specialPerformanceConfigDao
.
isExistedSort
(
dto
.
getSpecialPerformanceId
(),
dto
.
getItemId
(),
dto
.
getLot
());
boolean
isExist
=
specialPerformanceConfigDao
.
isExistedSort
(
dto
.
getSpecialPerformanceId
(),
dto
.
getItemId
(),
dto
.
getLot
());
if
(
isExist
)
{
if
(
isExist
)
{
...
@@ -274,6 +279,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
...
@@ -274,6 +279,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
}
}
specialPerformanceConfigDao
.
itemSort
(
dto
.
getSpecialPerformanceId
(),
dto
.
getItemId
(),
dto
.
getLot
());
specialPerformanceConfigDao
.
itemSort
(
dto
.
getSpecialPerformanceId
(),
dto
.
getItemId
(),
dto
.
getLot
());
return
Result
.
success
();
return
Result
.
success
();
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
"专场商品排序 error {}"
,
e
);
logger
.
error
(
"专场商品排序 error {}"
,
e
);
}
}
...
...
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java
View file @
276afec7
...
@@ -531,7 +531,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
...
@@ -531,7 +531,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
auctionConfig
.
setRealEndTime
(
StringUtils
.
isEmpty
(
dto
.
getAuctionEndTime
())
?
endTime
:
DateUtils
.
parseString
(
dto
.
getAuctionEndTime
()));
auctionConfig
.
setRealEndTime
(
StringUtils
.
isEmpty
(
dto
.
getAuctionEndTime
())
?
endTime
:
DateUtils
.
parseString
(
dto
.
getAuctionEndTime
()));
auctionConfig
.
setStartPrice
(
StringUtils
.
isEmpty
(
dto
.
getStartPrice
())
?
0
:
PriceUtil
.
convertPriceFromStr
(
dto
.
getStartPrice
()));
auctionConfig
.
setStartPrice
(
StringUtils
.
isEmpty
(
dto
.
getStartPrice
())
?
0
:
PriceUtil
.
convertPriceFromStr
(
dto
.
getStartPrice
()));
auctionConfig
.
setAddExtent
(
StringUtils
.
isEmpty
(
dto
.
getAddExtent
())
?
5000
:
PriceUtil
.
convertPriceFromStr
(
dto
.
getAddExtent
()));
auctionConfig
.
setAddExtent
(
StringUtils
.
isEmpty
(
dto
.
getAddExtent
())
?
5000
:
PriceUtil
.
convertPriceFromStr
(
dto
.
getAddExtent
()));
auctionConfig
.
setEstimatedPrice
(
StringUtils
.
isEmpty
(
dto
.
getEstimatedPrice
())
?
999999999
:
PriceUtil
.
convertPriceFromStr
(
dto
.
getEstimatedPrice
()));
auctionConfig
.
setEstimatedPrice
(
StringUtils
.
isEmpty
(
dto
.
getEstimatedPrice
())
?
0
:
PriceUtil
.
convertPriceFromStr
(
dto
.
getEstimatedPrice
()));
auctionConfig
.
setCreateTime
(
now
);
auctionConfig
.
setCreateTime
(
now
);
auctionConfig
.
setUpdateTime
(
now
);
auctionConfig
.
setUpdateTime
(
now
);
auctionConfigDao
.
insert
(
auctionConfig
);
auctionConfigDao
.
insert
(
auctionConfig
);
...
...
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