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
f8ca9619
Commit
f8ca9619
authored
Mar 05, 2025
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量订单费用申请的订单信息数据源修改
parent
41354252
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
12 deletions
+11
-12
BatchOrderFeeApplyService.java
...service/batchOrderFeeApply/BatchOrderFeeApplyService.java
+2
-1
BatchOrderFeeApplyServiceImpl.java
...ice/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java
+5
-9
BatchOrderFeeDetailsVO.java
...e/order/vo/batchOrderFeeApply/BatchOrderFeeDetailsVO.java
+2
-1
BatchOrderFeeApplyController.java
...dmin/batchOrderFeeApply/BatchOrderFeeApplyController.java
+2
-1
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyService.java
View file @
f8ca9619
...
...
@@ -4,6 +4,7 @@ import java.util.*;
import
javax.validation.*
;
import
cn.iocoder.yudao.framework.mybatis.core.vo.PageVO
;
import
cn.iocoder.yudao.framework.mybatis.core.service.IService
;
import
cn.iocoder.yudao.module.order.dto.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.vo.batchOrderFeeApply.*
;
import
cn.iocoder.yudao.module.order.dal.dataobject.batchOrderFeeApply.BatchOrderFeeApplyDO
;
import
cn.iocoder.yudao.framework.common.pojo.PageResult
;
...
...
@@ -55,7 +56,7 @@ public interface BatchOrderFeeApplyService extends IService<BatchOrderFeeApplyDO
BatchOrderFeeApplyBackVO
getInfoByFormId
(
Long
formId
);
List
<
OrderBack
VO
>
getOrderListByIds
(
List
<
Long
>
orderIds
);
List
<
OrderBack
InfoDto
>
getOrderListByIds
(
List
<
Long
>
orderIds
);
/**
* 批量订单费用申请回调
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java
View file @
f8ca9619
...
...
@@ -18,17 +18,15 @@ import cn.iocoder.yudao.module.bpm.api.BpmCreateServiceFactory;
import
cn.iocoder.yudao.module.bpm.enums.WorkFlowEmus
;
import
cn.iocoder.yudao.module.ecw.dal.dataobject.currency.CurrencyDO
;
import
cn.iocoder.yudao.module.ecw.service.currency.CurrencyService
;
import
cn.iocoder.yudao.module.order.d
al.dataobject.orderFeeApplication.OrderFeeApplicationDO
;
import
cn.iocoder.yudao.module.order.d
to.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.enums.OrderApprovalTypeResultEnum
;
import
cn.iocoder.yudao.module.order.service.order.OrderBusinessService
;
import
cn.iocoder.yudao.module.order.service.order.OrderFeeApplicationService
;
import
cn.iocoder.yudao.module.order.service.order.OrderQueryService
;
import
cn.iocoder.yudao.module.order.service.order.OrderService
;
import
cn.iocoder.yudao.module.order.vo.order.ApplyInfoVO
;
import
cn.iocoder.yudao.module.order.vo.order.OrderBackVO
;
import
cn.iocoder.yudao.module.order.vo.orderFeeApplication.OrderFeeApplicationCreateReqVO
;
import
cn.iocoder.yudao.module.system.enums.DictTypeConstants
;
import
cn.iocoder.yudao.module.wealth.dal.dataobject.receipt.ReceiptDO
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.annotation.Lazy
;
...
...
@@ -61,8 +59,6 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
@Resource
private
OrderQueryService
orderQueryService
;
@Resource
private
SnowflakeGenerator
snowflakeGenerator
;
@Resource
private
OrderFeeApplicationService
orderFeeApplicationService
;
@Resource
private
ApplicationContext
applicationContext
;
...
...
@@ -154,7 +150,7 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
BatchApplyDetailsInfoVO
batchApplyDetailsInfoVO
=
JsonUtils
.
parseObject
(
batchOrderFeeApply
.
getDetails
(),
BatchApplyDetailsInfoVO
.
class
);
if
(
batchApplyDetailsInfoVO
!=
null
&&
CollectionUtil
.
isNotEmpty
(
batchApplyDetailsInfoVO
.
getOrderFeeDetailsVOList
()))
{
for
(
BatchOrderFeeDetailsVO
batchOrderFeeDetailsVO
:
batchApplyDetailsInfoVO
.
getOrderFeeDetailsVOList
())
{
OrderBack
VO
orderBackVO
=
orderQueryService
.
getOrder
(
batchOrderFeeDetailsVO
.
getOrderId
());
OrderBack
InfoDto
orderBackVO
=
orderQueryService
.
info
(
batchOrderFeeDetailsVO
.
getOrderId
());
batchOrderFeeDetailsVO
.
setOrderBackVO
(
orderBackVO
);
}
}
...
...
@@ -190,7 +186,7 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
BatchApplyDetailsInfoVO
batchApplyDetailsInfoVO
=
JsonUtils
.
parseObject
(
batchOrderFeeApply
.
getDetails
(),
BatchApplyDetailsInfoVO
.
class
);
if
(
batchApplyDetailsInfoVO
!=
null
&&
CollectionUtil
.
isNotEmpty
(
batchApplyDetailsInfoVO
.
getOrderFeeDetailsVOList
()))
{
for
(
BatchOrderFeeDetailsVO
batchOrderFeeDetailsVO
:
batchApplyDetailsInfoVO
.
getOrderFeeDetailsVOList
())
{
OrderBack
VO
orderBackVO
=
orderQueryService
.
getOrder
(
batchOrderFeeDetailsVO
.
getOrderId
());
OrderBack
InfoDto
orderBackVO
=
orderQueryService
.
info
(
batchOrderFeeDetailsVO
.
getOrderId
());
batchOrderFeeDetailsVO
.
setOrderBackVO
(
orderBackVO
);
}
}
...
...
@@ -200,8 +196,8 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee
}
@Override
public
List
<
OrderBack
VO
>
getOrderListByIds
(
List
<
Long
>
orderIds
)
{
return
orderIds
.
stream
().
map
(
orderId
->
orderQueryService
.
getOrder
(
orderId
)).
collect
(
Collectors
.
toList
());
public
List
<
OrderBack
InfoDto
>
getOrderListByIds
(
List
<
Long
>
orderIds
)
{
return
orderIds
.
stream
().
map
(
orderId
->
orderQueryService
.
info
(
orderId
)).
collect
(
Collectors
.
toList
());
}
@Override
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeDetailsVO.java
View file @
f8ca9619
package
cn
.
iocoder
.
yudao
.
module
.
order
.
vo
.
batchOrderFeeApply
;
import
cn.iocoder.yudao.module.order.dto.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.vo.order.OrderBackVO
;
import
cn.iocoder.yudao.module.order.vo.orderFeeApplication.OrderFeeApplicationCreateReqVO
;
import
io.swagger.annotations.ApiModel
;
...
...
@@ -16,7 +17,7 @@ public class BatchOrderFeeDetailsVO {
private
Long
orderId
;
@ApiModelProperty
(
"订单详情"
)
private
OrderBack
VO
orderBackVO
;
private
OrderBack
InfoDto
orderBackVO
;
@ApiModelProperty
(
"订单费用申请详情(数据格式同步参考订单费用申请功能页面)"
)
private
List
<
OrderFeeApplicationCreateReqVO
>
orderFeeApplicationBaseVOList
;
...
...
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/batchOrderFeeApply/BatchOrderFeeApplyController.java
View file @
f8ca9619
package
cn
.
iocoder
.
yudao
.
module
.
order
.
controller
.
admin
.
batchOrderFeeApply
;
import
cn.iocoder.yudao.framework.mybatis.core.vo.PageVO
;
import
cn.iocoder.yudao.module.order.dto.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.vo.order.OrderBackVO
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
...
...
@@ -45,7 +46,7 @@ public class BatchOrderFeeApplyController {
@ApiOperation
(
"批量获取需要申请费用的订单详情"
)
@ApiImplicitParam
(
name
=
"orderIds"
,
value
=
"订单ids"
,
required
=
true
,
example
=
"1024,2048,3072,4096"
,
dataTypeClass
=
String
.
class
)
@PreAuthorize
(
"@ss.hasPermission('ecw:batch-order-fee-apply:query')"
)
public
CommonResult
<
List
<
OrderBack
VO
>>
getOrderListByIds
(
@RequestParam
(
"orderIds"
)
String
orderIds
)
{
public
CommonResult
<
List
<
OrderBack
InfoDto
>>
getOrderListByIds
(
@RequestParam
(
"orderIds"
)
String
orderIds
)
{
return
success
(
batchOrderFeeApplyService
.
getOrderListByIds
(
Arrays
.
stream
(
orderIds
.
split
(
","
)).
map
(
Long:
:
parseLong
).
collect
(
Collectors
.
toList
())));
}
...
...
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