记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
2a5ee94b
Commit
2a5ee94b
authored
Dec 06, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交 同步订单 方法
parent
d47dfbd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
GoblinOrderSkuVo.java
...com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java
+1
-3
WdtServiceImpl.java
...net/service/platform/service/impl/erp/WdtServiceImpl.java
+4
-3
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java
View file @
2a5ee94b
...
...
@@ -79,7 +79,7 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
private
String
erpWarehouseNo
;
public
String
getPushTime
()
{
return
pushTime
==
null
?
""
:
pushTime
;
return
pushTime
==
null
?
""
:
pushTime
;
}
public
GoblinOrderSkuVo
copy
(
GoblinOrderSku
source
)
{
...
...
@@ -100,13 +100,11 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
this
.
setSkuSpecs
(
source
.
getSkuSpecs
());
this
.
setPriceModify
(
source
.
getPriceModify
());
this
.
setPriceVoucher
(
source
.
getPriceVoucher
());
this
.
setSpuErpCode
(
source
.
getSpuErpCode
());
this
.
setSkuErpCode
(
source
.
getSkuErpCode
());
this
.
setErpType
(
source
.
getErpType
());
this
.
setErpWarehouseNo
(
source
.
getErpWarehouseNo
());
this
.
setErpHosting
(
source
.
getErpHosting
());
this
.
setCreatedAt
(
source
.
getCreatedAt
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
return
this
;
}
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/erp/WdtServiceImpl.java
View file @
2a5ee94b
...
...
@@ -16,6 +16,7 @@ import com.liquidnet.service.erp.vo.StockQueryBaseVo;
import
com.liquidnet.service.erp.vo.StockQueryVo
;
import
com.liquidnet.service.erp.vo.SyncStockVo
;
import
com.liquidnet.service.erp.vo.TradePushVo
;
import
com.liquidnet.service.goblin.constant.GoblinStatusConst
;
import
com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo
;
...
...
@@ -176,10 +177,10 @@ public class WdtServiceImpl implements IGoblinErpService {
for
(
String
orderSkuId
:
orderSkuIds
)
{
OrderListParam
orderSkuParam
=
OrderListParam
.
getNew
();
GoblinOrderSkuVo
orderSkuVo
=
goblinRedisUtils
.
getGoblinOrderSkuVo
(
orderSkuId
);
if
(
orderSkuVo
.
getErpHosting
()
==
0
)
{
continue
;
}
else
{
if
(
orderSkuVo
.
getErpHosting
()
==
1
&&
orderSkuVo
.
getStatus
()
==
GoblinStatusConst
.
Status
.
ORDER_STATUS_2
.
getValue
())
{
erpHosting
=
1
;
}
else
{
continue
;
}
orderSkuParam
.
setOid
(
orderSkuVo
.
getOrderSkuId
());
orderSkuParam
.
setNum
(
BigDecimal
.
valueOf
(
orderSkuVo
.
getNum
()));
...
...
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