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
f6911035
Commit
f6911035
authored
May 17, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa
parents
5d5bfcbf
79001388
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
5 deletions
+27
-5
order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
+0
-0
order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
+27
-5
No files found.
order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
0 → 100644
View file @
f6911035
This diff is collapsed.
Click to expand it.
order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
View file @
f6911035
...
@@ -5,15 +5,14 @@ import cn.freemud.management.entities.dto.request.console.ConsoleResponseDTO;
...
@@ -5,15 +5,14 @@ import cn.freemud.management.entities.dto.request.console.ConsoleResponseDTO;
import
cn.freemud.management.entities.dto.request.console.StoreInfoDTO
;
import
cn.freemud.management.entities.dto.request.console.StoreInfoDTO
;
import
com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto
;
import
com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderType
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.math.NumberUtils
;
import
org.apache.commons.lang.math.NumberUtils
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.*
;
import
java.util.LinkedList
;
import
java.util.Objects
;
import
java.util.Optional
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Component
@Component
...
@@ -30,7 +29,7 @@ public class DeliverySdkAdapter {
...
@@ -30,7 +29,7 @@ public class DeliverySdkAdapter {
,
ConsoleResponseDTO
<
BizDTO
>
bizDTO
,
String
deliveryCallBackUrl
)
{
,
ConsoleResponseDTO
<
BizDTO
>
bizDTO
,
String
deliveryCallBackUrl
)
{
StoreInfoDTO
storeInfo
=
bizDTO
.
getBizVO
().
getStoreInfo
();
StoreInfoDTO
storeInfo
=
bizDTO
.
getBizVO
().
getStoreInfo
();
CreateDeliveryOrderRequestDto
deliveryOrderRequestDto
=
new
CreateDeliveryOrderRequestDto
();
CreateDeliveryOrderRequestDto
deliveryOrderRequestDto
=
new
CreateDeliveryOrderRequestDto
();
deliveryOrderRequestDto
.
setDepatchWeight
(
new
BigDecimal
(
1
));
deliveryOrderRequestDto
.
setDepatchWeight
(
this
.
getDepatchWeightByOrder
(
order
.
getProductList
()
));
deliveryOrderRequestDto
.
setSerialNumber
(
order
.
getOtherCode
());
deliveryOrderRequestDto
.
setSerialNumber
(
order
.
getOtherCode
());
deliveryOrderRequestDto
.
setOrderId
(
order
.
getOid
());
deliveryOrderRequestDto
.
setOrderId
(
order
.
getOid
());
deliveryOrderRequestDto
.
setOrderRemark
(
order
.
getRemark
());
deliveryOrderRequestDto
.
setOrderRemark
(
order
.
getRemark
());
...
@@ -78,4 +77,27 @@ public class DeliverySdkAdapter {
...
@@ -78,4 +77,27 @@ public class DeliverySdkAdapter {
}).
collect
(
Collectors
.
toCollection
(
LinkedList:
:
new
))));
}).
collect
(
Collectors
.
toCollection
(
LinkedList:
:
new
))));
return
deliveryOrderRequestDto
;
return
deliveryOrderRequestDto
;
}
}
private
BigDecimal
getDepatchWeightByOrder
(
List
<
ProductBeanV1
>
productList
)
{
if
(
CollectionUtils
.
isEmpty
(
productList
))
{
return
new
BigDecimal
(
"0.5"
);
}
BigDecimal
result
=
BigDecimal
.
ZERO
;
productList
.
forEach
(
p
->
{
BigDecimal
sum
=
p
.
getWeight
().
multiply
(
new
BigDecimal
(
p
.
getNumber
()));
if
(
CollectionUtils
.
isNotEmpty
(
p
.
getComboProduct
()))
{
long
comboProductSum
=
p
.
getComboProduct
().
stream
().
mapToLong
(
value
->
value
.
getWeight
().
multiply
(
new
BigDecimal
(
value
.
getNumber
())).
longValue
()).
sum
();
long
materialProductSum
=
p
.
getMaterialProduct
().
stream
().
mapToLong
(
value
->
value
.
getWeight
().
multiply
(
new
BigDecimal
(
value
.
getNumber
())).
longValue
()).
sum
();
long
sendProductSum
=
p
.
getSendProduct
().
stream
().
mapToLong
(
value
->
value
.
getWeight
().
multiply
(
new
BigDecimal
(
value
.
getNumber
())).
longValue
()).
sum
();
BigDecimal
otherProductSum
=
new
BigDecimal
(
comboProductSum
+
materialProductSum
+
sendProductSum
);
sum
.
add
(
otherProductSum
);
}
result
.
add
(
sum
);
});
if
(
result
.
compareTo
(
BigDecimal
.
ZERO
)
<=
0
)
{
return
new
BigDecimal
(
"0.5"
);
}
// 这里 计算的结果是 g 需要变成 kg 给接口 保留2位小数 后面多余直接舍弃
return
result
.
divide
(
new
BigDecimal
(
"1000"
),
2
,
BigDecimal
.
ROUND_DOWN
);
}
}
}
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