diff --git a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyService.java b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyService.java index de6dcd2821096333056ef0e8187235783bd1634c..e3d99936dce17eda0b700dbac229f2b7d86f5097 100644 --- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyService.java +++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyService.java @@ -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<OrderBackVO> getOrderListByIds(List<Long> orderIds); + List<OrderBackInfoDto> getOrderListByIds(List<Long> orderIds); /** * �拷�顒√��茣合���活���莪� diff --git a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java index 107fede9e5cfb722054aaef251b1224d54529720..cd307748c36cfeaf14754b5ba955f3aa496633ec 100644 --- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java +++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/batchOrderFeeApply/BatchOrderFeeApplyServiceImpl.java @@ -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.dal.dataobject.orderFeeApplication.OrderFeeApplicationDO; +import cn.iocoder.yudao.module.order.dto.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()) { - OrderBackVO orderBackVO = orderQueryService.getOrder(batchOrderFeeDetailsVO.getOrderId()); + OrderBackInfoDto 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()) { - OrderBackVO orderBackVO = orderQueryService.getOrder(batchOrderFeeDetailsVO.getOrderId()); + OrderBackInfoDto orderBackVO = orderQueryService.info(batchOrderFeeDetailsVO.getOrderId()); batchOrderFeeDetailsVO.setOrderBackVO(orderBackVO); } } @@ -200,8 +196,8 @@ public class BatchOrderFeeApplyServiceImpl extends AbstractService<BatchOrderFee } @Override - public List<OrderBackVO> getOrderListByIds(List<Long> orderIds) { - return orderIds.stream().map(orderId -> orderQueryService.getOrder(orderId)).collect(Collectors.toList()); + public List<OrderBackInfoDto> getOrderListByIds(List<Long> orderIds) { + return orderIds.stream().map(orderId -> orderQueryService.info(orderId)).collect(Collectors.toList()); } @Override diff --git a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeDetailsVO.java b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeDetailsVO.java index 61dd46b5986752aa4cab71503f9871287d1ee3e4..11d39c7707a1a4b6e605b8add40651206fa13e16 100644 --- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeDetailsVO.java +++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeDetailsVO.java @@ -1,5 +1,6 @@ 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 OrderBackVO orderBackVO; + private OrderBackInfoDto orderBackVO; @ApiModelProperty("莅√��茣合���活�莚���(�井���弱���罩ュ���莅√��茣合���活����初ゝ��)") private List<OrderFeeApplicationCreateReqVO> orderFeeApplicationBaseVOList; diff --git a/yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/batchOrderFeeApply/BatchOrderFeeApplyController.java b/yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/batchOrderFeeApply/BatchOrderFeeApplyController.java index eac75bed68dc06e043940a6e37a382b1e79c03af..5424095a0323e7d9039c110730be47abfcae915a 100644 --- a/yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/batchOrderFeeApply/BatchOrderFeeApplyController.java +++ b/yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/batchOrderFeeApply/BatchOrderFeeApplyController.java @@ -1,6 +1,7 @@ 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<OrderBackVO>> getOrderListByIds(@RequestParam("orderIds")String orderIds) { + public CommonResult<List<OrderBackInfoDto>> getOrderListByIds(@RequestParam("orderIds")String orderIds) { return success(batchOrderFeeApplyService.getOrderListByIds(Arrays.stream(orderIds.split(",")).map(Long::parseLong).collect(Collectors.toList()))); }