Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
eaf0b25b
Commit
eaf0b25b
authored
Jun 22, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-06-22提交
parent
370dc895
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
175 additions
and
42 deletions
+175
-42
LineChannelPackagingServiceImpl.java
...lineChannelPackaging/LineChannelPackagingServiceImpl.java
+9
-3
OrderQueryServiceImpl.java
...odule/order/service/order/impl/OrderQueryServiceImpl.java
+8
-4
OrderWarehouseInServiceImpl.java
...service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
+11
-4
ProdCostCalculation.java
...r/yudao/module/product/component/ProdCostCalculation.java
+147
-30
ProductPriceStepServiceImpl.java
...uct/service/product/impl/ProductPriceStepServiceImpl.java
+0
-1
No files found.
yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/lineChannelPackaging/LineChannelPackagingServiceImpl.java
View file @
eaf0b25b
...
@@ -93,17 +93,23 @@ public class LineChannelPackagingServiceImpl extends AbstractService<LineChannel
...
@@ -93,17 +93,23 @@ public class LineChannelPackagingServiceImpl extends AbstractService<LineChannel
}
}
@Override
@Override
public
List
<
LineChannelPackagingDO
>
queryAirClearancePrice
(
List
<
String
>
packages
,
Long
channelId
,
Long
lineId
)
{
public
List
<
LineChannelPackagingDO
>
queryAirClearancePrice
(
List
<
String
>
packages
,
Long
channelId
,
Long
lineId
)
{
List
<
LineChannelPackagingDO
>
list
=
new
ArrayList
<>();
List
<
LineChannelPackagingDO
>
list
=
new
ArrayList
<>();
if
(
CollectionUtil
.
isNotEmpty
(
packages
))
{
if
(
CollectionUtil
.
isNotEmpty
(
packages
))
{
for
(
String
packageType
:
packages
)
{
for
(
String
packageType
:
packages
)
{
List
<
LineChannelPackagingDO
>
packagingDOList
=
lineChannelPackagingMapper
.
queryAirClearancePrice
(
packageType
,
channelId
,
lineId
);
List
<
LineChannelPackagingDO
>
packagingDOList
=
lineChannelPackagingMapper
.
queryAirClearancePrice
(
packageType
,
channelId
,
lineId
);
if
(
CollectionUtil
.
isNotEmpty
(
packagingDOList
)){
if
(
CollectionUtil
.
isNotEmpty
(
packagingDOList
)){
list
.
addAll
(
packagingDOList
);
list
.
addAll
(
packagingDOList
);
}
}
}
}
}
else
{
}
else
{
list
=
lineChannelPackagingMapper
.
queryAirClearancePrice
(
null
,
channelId
,
lineId
);
list
=
lineChannelPackagingMapper
.
queryAirClearancePrice
(
null
,
channelId
,
lineId
);
}
}
return
list
;
return
list
;
}
}
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java
View file @
eaf0b25b
...
@@ -613,13 +613,16 @@ public class OrderQueryServiceImpl implements OrderQueryService {
...
@@ -613,13 +613,16 @@ public class OrderQueryServiceImpl implements OrderQueryService {
initialLogisticsInfoDto
.
setLineId
(
dto
.
getLineId
());
initialLogisticsInfoDto
.
setLineId
(
dto
.
getLineId
());
initialLogisticsInfoDto
.
setTransportId
(
dto
.
getTransportId
());
initialLogisticsInfoDto
.
setTransportId
(
dto
.
getTransportId
());
initialLogisticsInfoDto
.
setChannelId
(
dto
.
getChannelId
());
initialLogisticsInfoDto
.
setChannelId
(
dto
.
getChannelId
());
//
保存初始物流信息,该信息为收费信息
//保存初始物流信息,该信息为收费信息
dto
.
setInitialLogisticsInfoDto
(
initialLogisticsInfoDto
);
dto
.
setInitialLogisticsInfoDto
(
initialLogisticsInfoDto
);
LogisticsInfoDto
logisticsInfoDto
=
new
LogisticsInfoDto
();
LogisticsInfoDto
logisticsInfoDto
=
new
LogisticsInfoDto
();
BeanUtils
.
copyProperties
(
initialLogisticsInfoDto
,
logisticsInfoDto
);
BeanUtils
.
copyProperties
(
initialLogisticsInfoDto
,
logisticsInfoDto
);
if
(
Objects
.
nonNull
(
dto
.
getAdjustToDestWarehouseId
())
&&
dto
.
getAdjustToDestWarehouseId
()
>
0L
)
{
if
(
Objects
.
nonNull
(
dto
.
getAdjustToDestWarehouseId
())
&&
dto
.
getAdjustToDestWarehouseId
()
>
0L
)
{
// 如果有始发仓调仓记录id,则获取最新的调仓仓库信息
// 如果有始发仓调仓记录id,则获取最新的调仓仓库信息
WarehouseRegionVO
startWarehouseRegionVO
=
warehouseMapper
.
findWarehouseRegion
(
dto
.
getAdjustToDestWarehouseId
());
WarehouseRegionVO
startWarehouseRegionVO
=
warehouseMapper
.
findWarehouseRegion
(
dto
.
getAdjustToDestWarehouseId
());
if
(
Objects
.
nonNull
(
startWarehouseRegionVO
))
{
if
(
Objects
.
nonNull
(
startWarehouseRegionVO
))
{
logisticsInfoDto
.
setStartWarehouseId
(
dto
.
getAdjustToDestWarehouseId
());
logisticsInfoDto
.
setStartWarehouseId
(
dto
.
getAdjustToDestWarehouseId
());
logisticsInfoDto
.
setStartCityId
(
startWarehouseRegionVO
.
getShi
());
logisticsInfoDto
.
setStartCityId
(
startWarehouseRegionVO
.
getShi
());
...
@@ -632,7 +635,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
...
@@ -632,7 +635,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
logisticsInfoDto
.
setStartVolume
(
startWarehouseRegionVO
.
getVolume
());
logisticsInfoDto
.
setStartVolume
(
startWarehouseRegionVO
.
getVolume
());
}
}
}
}
if
(
Objects
.
nonNull
(
dto
.
getDestAdjustToDestWarehouseId
())
&&
dto
.
getDestAdjustToDestWarehouseId
()
>
0L
)
{
if
(
Objects
.
nonNull
(
dto
.
getDestAdjustToDestWarehouseId
())
&&
dto
.
getDestAdjustToDestWarehouseId
()
>
0L
)
{
// 如果有目的地的目的仓调仓记录id,则获取最新的调仓仓库信息
// 如果有目的地的目的仓调仓记录id,则获取最新的调仓仓库信息
WarehouseRegionVO
destWarehouseRegionVO
=
warehouseMapper
.
findWarehouseRegion
(
dto
.
getDestAdjustToDestWarehouseId
());
WarehouseRegionVO
destWarehouseRegionVO
=
warehouseMapper
.
findWarehouseRegion
(
dto
.
getDestAdjustToDestWarehouseId
());
if
(
Objects
.
nonNull
(
destWarehouseRegionVO
))
{
if
(
Objects
.
nonNull
(
destWarehouseRegionVO
))
{
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @
eaf0b25b
...
@@ -4894,7 +4894,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
...
@@ -4894,7 +4894,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
}
}
@Override
@Override
public
List
<
OrderWarehouseInWithAttrVO
>
getOrderWarehouseInCommonAttrList
(
Long
orderId
,
Long
excludeOrderWarehouseInId
)
{
public
List
<
OrderWarehouseInWithAttrVO
>
getOrderWarehouseInCommonAttrList
(
Long
orderId
,
Long
excludeOrderWarehouseInId
)
{
// 根据订单id获取入库详情
// 根据订单id获取入库详情
OrderDO
orderDO
=
orderService
.
getById
(
orderId
);
OrderDO
orderDO
=
orderService
.
getById
(
orderId
);
...
@@ -4902,13 +4903,19 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
...
@@ -4902,13 +4903,19 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
throw
ServiceExceptionUtil
.
exception
(
ErrorCodeConstants
.
ORDER_NOT_EXISTS
);
throw
ServiceExceptionUtil
.
exception
(
ErrorCodeConstants
.
ORDER_NOT_EXISTS
);
}
}
List
<
OrderItemDO
>
orderItemDOList
=
orderItemService
.
list
(
new
LambdaQueryWrapper
<
OrderItemDO
>()
//订单明细
List
<
OrderItemDO
>
orderItemDOList
=
orderItemService
.
list
(
new
LambdaQueryWrapper
<
OrderItemDO
>()
.
eq
(
OrderItemDO:
:
getOrderId
,
orderId
).
orderByAsc
(
OrderItemDO:
:
getOrderItemId
));
.
eq
(
OrderItemDO:
:
getOrderId
,
orderId
).
orderByAsc
(
OrderItemDO:
:
getOrderItemId
));
List
<
OrderWarehouseInDO
>
orderWarehouseInDOList
=
orderWarehouseInMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderWarehouseInDO
>()
//ecw_order_warehouse_in 入仓货物详情表
List
<
OrderWarehouseInDO
>
orderWarehouseInDOList
=
orderWarehouseInMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderWarehouseInDO
>()
.
eq
(
OrderWarehouseInDO:
:
getOrderId
,
orderId
).
orderByAsc
(
OrderWarehouseInDO:
:
getId
));
.
eq
(
OrderWarehouseInDO:
:
getOrderId
,
orderId
).
orderByAsc
(
OrderWarehouseInDO:
:
getId
));
if
(
excludeOrderWarehouseInId
!=
null
)
{
if
(
excludeOrderWarehouseInId
!=
null
)
{
orderWarehouseInDOList
=
orderWarehouseInDOList
.
stream
().
filter
(
t
->
!
t
.
getId
().
equals
(
excludeOrderWarehouseInId
)).
collect
(
Collectors
.
toList
());
orderWarehouseInDOList
=
orderWarehouseInDOList
.
stream
().
filter
(
t
->
!
t
.
getId
().
equals
(
excludeOrderWarehouseInId
)).
collect
(
Collectors
.
toList
());
}
}
List
<
OrderWarehouseInWithAttrVO
>
resultList
=
new
ArrayList
<>();
List
<
OrderWarehouseInWithAttrVO
>
resultList
=
new
ArrayList
<>();
...
...
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/component/ProdCostCalculation.java
View file @
eaf0b25b
This diff is collapsed.
Click to expand it.
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceStepServiceImpl.java
View file @
eaf0b25b
...
@@ -64,7 +64,6 @@ public class ProductPriceStepServiceImpl extends AbstractService<ProductPriceSte
...
@@ -64,7 +64,6 @@ public class ProductPriceStepServiceImpl extends AbstractService<ProductPriceSte
BigDecimal
num
,
BigDecimal
num
,
Integer
priceType
)
{
Integer
priceType
)
{
//0-运费,1-全包价, 2-清关费
//0-运费,1-全包价, 2-清关费
List
<
ProductPriceStepDO
>
list
=
this
.
list
(
List
<
ProductPriceStepDO
>
list
=
this
.
list
(
new
LambdaQueryWrapperX
<
ProductPriceStepDO
>()
new
LambdaQueryWrapperX
<
ProductPriceStepDO
>()
.
eq
(
ProductPriceStepDO:
:
getProductPriceId
,
productPriceId
)
.
eq
(
ProductPriceStepDO:
:
getProductPriceId
,
productPriceId
)
...
...
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