Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
travel-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cloud
travel-cloud
Commits
2f520261
提交
2f520261
authored
6月 13, 2025
作者:
钟阳林
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
开票策略实现
上级
9a096a6b
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
180 行增加
和
32 行删除
+180
-32
OrderInvoicingBo.java
...n/java/org/dromara/server/domain/bo/OrderInvoicingBo.java
+3
-0
OrderAirportVo.java
...ain/java/org/dromara/server/domain/vo/OrderAirportVo.java
+2
-0
OrderHotelVo.java
.../main/java/org/dromara/server/domain/vo/OrderHotelVo.java
+1
-0
OrderTrainVo.java
.../main/java/org/dromara/server/domain/vo/OrderTrainVo.java
+1
-0
OrderVehiclesVo.java
...in/java/org/dromara/server/domain/vo/OrderVehiclesVo.java
+1
-0
OrderTypeEnum.java
...src/main/java/org/dromara/server/enums/OrderTypeEnum.java
+45
-0
IOrderInvoicingService.java
...va/org/dromara/server/service/IOrderInvoicingService.java
+4
-6
OrderAirportServiceImpl.java
.../dromara/server/service/impl/OrderAirportServiceImpl.java
+5
-0
OrderHotelServiceImpl.java
...rg/dromara/server/service/impl/OrderHotelServiceImpl.java
+16
-0
OrderInvoicingServiceImpl.java
...romara/server/service/impl/OrderInvoicingServiceImpl.java
+28
-11
OrderInvoicingStrategyServiceImpl.java
...erver/service/impl/OrderInvoicingStrategyServiceImpl.java
+26
-11
OrderTrainServiceImpl.java
...rg/dromara/server/service/impl/OrderTrainServiceImpl.java
+5
-0
OrderVehiclesServiceImpl.java
...dromara/server/service/impl/OrderVehiclesServiceImpl.java
+6
-4
server_update_20250611.sql
sql/update/server_update_20250611.sql
+37
-0
没有找到文件。
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderInvoicingBo.java
浏览文件 @
2f520261
...
...
@@ -9,6 +9,8 @@ import lombok.Data;
import
lombok.EqualsAndHashCode
;
import
jakarta.validation.constraints.*
;
import
java.util.Date
;
import
java.util.List
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
...
...
@@ -39,6 +41,7 @@ public class OrderInvoicingBo extends BaseEntity {
*/
@NotNull
(
message
=
"订单id不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
Long
orderId
;
private
List
<
Long
>
orderIds
;
/**
* 人员code
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderAirportVo.java
浏览文件 @
2f520261
...
...
@@ -237,4 +237,6 @@ public class OrderAirportVo implements Serializable {
* 航程集合
*/
private
List
<
OrderAirportRangeVo
>
rangeList
;
private
OrderInvoicingVo
invoicingInfo
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderHotelVo.java
浏览文件 @
2f520261
...
...
@@ -210,4 +210,5 @@ public class OrderHotelVo implements Serializable {
private
String
checkInDate
;
private
OrderInvoicingVo
invoicingInfo
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderTrainVo.java
浏览文件 @
2f520261
...
...
@@ -184,4 +184,5 @@ public class OrderTrainVo implements Serializable {
*/
private
List
<
OrderTrainTicketVo
>
tickerList
;
private
OrderInvoicingVo
invoicingInfo
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderVehiclesVo.java
浏览文件 @
2f520261
...
...
@@ -458,5 +458,6 @@ public class OrderVehiclesVo implements Serializable {
* 差旅信息
*/
private
OrderVehiclesBusinessVo
business
;
private
OrderInvoicingVo
invoicingInfo
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/enums/OrderTypeEnum.java
0 → 100644
浏览文件 @
2f520261
package
org
.
dromara
.
server
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
/**
* 订单类型
* @author lim
* @since 2025/6/11 18:25
*/
@Getter
@AllArgsConstructor
public
enum
OrderTypeEnum
{
/**
* 机票
*/
AIRPORT
(
"airport"
,
"机票"
),
/**
* 酒店
*/
HOTEL
(
"hotel"
,
"酒店"
),
/**
* 火车
*/
TRAIN
(
"train"
,
"火车"
),
/**
* 用车
*/
VEHICLES
(
"vehicles"
,
"用车"
);
/**
* 类型
*/
private
final
String
type
;
/**
* 描述
*/
private
final
String
desc
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderInvoicingService.java
浏览文件 @
2f520261
package
org
.
dromara
.
server
.
service
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
org.dromara.server.domain.OrderInvoicing
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
import
org.dromara.server.domain.bo.OrderInvoicingBo
;
import
org.dromara.server.domain.OrderInvoicing
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
/**
* 开票订单关联Service接口
...
...
@@ -18,4 +14,6 @@ import java.util.List;
public
interface
IOrderInvoicingService
extends
IBaseService
<
OrderInvoicingVo
,
OrderInvoicingBo
,
OrderInvoicing
>{
void
save
(
OrderInvoicingBo
bo
);
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportServiceImpl.java
浏览文件 @
2f520261
...
...
@@ -16,6 +16,8 @@ import org.dromara.server.domain.*;
import
org.dromara.server.domain.bo.OrderAirportBo
;
import
org.dromara.server.domain.vo.OrderAirportRangeVo
;
import
org.dromara.server.domain.vo.OrderAirportVo
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
import
org.dromara.server.enums.OrderTypeEnum
;
import
org.dromara.server.mapper.*
;
import
org.dromara.server.service.IBizUserService
;
import
org.dromara.server.service.IOrderAirportService
;
...
...
@@ -36,6 +38,7 @@ import java.util.concurrent.ScheduledExecutorService;
@Service
public
class
OrderAirportServiceImpl
extends
AbstractBaseService
<
OrderAirportVo
,
OrderAirportBo
,
OrderAirport
>
implements
IOrderAirportService
{
private
final
OrderInvoicingMapper
invoicingMapper
;
private
final
OrderAirportMapper
baseMapper
;
private
final
OrderAirportPsgMapper
psgMapper
;
private
final
OrderAirportPayMapper
payMapper
;
...
...
@@ -59,8 +62,10 @@ public class OrderAirportServiceImpl extends AbstractBaseService<OrderAirportVo,
List
<
Long
>
orderIds
=
StreamUtils
.
toList
(
list
,
OrderAirportVo:
:
getId
);
orderIds
=
CollectionUtils
.
isEmpty
(
orderIds
)
?
List
.
of
(-
1L
)
:
orderIds
;
List
<
OrderAirportRangeVo
>
rangeList
=
rangeMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderAirportRange
>().
in
(
OrderAirportRange:
:
getOrderId
,
orderIds
));
List
<
OrderInvoicingVo
>
invoicingList
=
invoicingMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderInvoicing
>().
eq
(
OrderInvoicing:
:
getType
,
OrderTypeEnum
.
AIRPORT
.
getType
()).
in
(
OrderInvoicing:
:
getOrderId
,
orderIds
));
list
.
forEach
(
item
->
{
item
.
setRangeList
(
StreamUtils
.
filter
(
rangeList
,
r
->
Objects
.
equals
(
r
.
getOrderId
(),
item
.
getId
())));
item
.
setInvoicingInfo
(
StreamUtils
.
findFirst
(
invoicingList
,
o
->
Objects
.
equals
(
o
.
getOrderId
(),
item
.
getId
())));
});
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderHotelServiceImpl.java
浏览文件 @
2f520261
...
...
@@ -18,11 +18,15 @@ import org.dromara.common.ys.service.IHotelService;
import
org.dromara.server.domain.*
;
import
org.dromara.server.domain.bo.OrderHotelBo
;
import
org.dromara.server.domain.vo.OrderHotelVo
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
import
org.dromara.server.domain.vo.OrderTrainVo
;
import
org.dromara.server.enums.OrderTypeEnum
;
import
org.dromara.server.mapper.*
;
import
org.dromara.server.service.IBizUserService
;
import
org.dromara.server.service.IOrderHotelService
;
import
org.springframework.stereotype.Service
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
...
...
@@ -38,6 +42,7 @@ import java.util.concurrent.ScheduledExecutorService;
@Service
public
class
OrderHotelServiceImpl
extends
AbstractBaseService
<
OrderHotelVo
,
OrderHotelBo
,
OrderHotel
>
implements
IOrderHotelService
{
private
final
OrderInvoicingMapper
invoicingMapper
;
private
final
OrderHotelMapper
baseMapper
;
private
final
OrderHotelBusinessMapper
businessMapper
;
private
final
OrderHotelPriceInfoMapper
priceInfoMapper
;
...
...
@@ -53,6 +58,17 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
return
baseMapper
;
}
@Override
public
void
processData
(
List
<
OrderHotelVo
>
list
)
{
super
.
processData
(
list
);
List
<
Long
>
orderIds
=
StreamUtils
.
toList
(
list
,
OrderHotelVo:
:
getId
);
orderIds
=
CollectionUtils
.
isEmpty
(
orderIds
)
?
Arrays
.
asList
(-
1L
)
:
orderIds
;
List
<
OrderInvoicingVo
>
invoicingList
=
invoicingMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderInvoicing
>().
eq
(
OrderInvoicing:
:
getType
,
OrderTypeEnum
.
HOTEL
.
getType
()).
in
(
OrderInvoicing:
:
getOrderId
,
orderIds
));
list
.
forEach
(
item
->
{
item
.
setInvoicingInfo
(
StreamUtils
.
findFirst
(
invoicingList
,
o
->
Objects
.
equals
(
o
.
getOrderId
(),
item
.
getId
())));
});
}
@Override
public
LambdaQueryWrapper
<
OrderHotel
>
buildQueryWrapper
(
OrderHotelBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderInvoicingServiceImpl.java
浏览文件 @
2f520261
package
org
.
dromara
.
server
.
service
.
impl
;
import
org.dromara.common.core.utils.MapstructUtils
;
import
org.dromara.common.core.utils.StringUtils
;
import
org.dromara.common.mybatis.core.page.TableDataInfo
;
import
org.dromara.common.mybatis.core.page.PageQuery
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.CollectionUtils
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Service
;
import
org.dromara.common.core.exception.ServiceException
;
import
org.dromara.common.core.utils.StringUtils
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.server.domain.OrderInvoicing
;
import
org.dromara.server.domain.OrderInvoicingStrategy
;
import
org.dromara.server.domain.bo.OrderInvoicingBo
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
import
org.dromara.server.domain.OrderInvoicing
;
import
org.dromara.server.mapper.OrderInvoicingMapper
;
import
org.dromara.server.mapper.OrderInvoicingStrategyMapper
;
import
org.dromara.server.service.IOrderInvoicingService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 开票订单关联Service业务层处理
...
...
@@ -32,12 +30,30 @@ import java.util.Collection;
public
class
OrderInvoicingServiceImpl
extends
AbstractBaseService
<
OrderInvoicingVo
,
OrderInvoicingBo
,
OrderInvoicing
>
implements
IOrderInvoicingService
{
private
final
OrderInvoicingMapper
baseMapper
;
private
final
OrderInvoicingStrategyMapper
strategyMapper
;
@Override
public
BaseMapperPlus
<
OrderInvoicing
,
OrderInvoicingVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
void
save
(
OrderInvoicingBo
bo
)
{
OrderInvoicingStrategy
strategy
=
strategyMapper
.
selectOne
(
OrderInvoicingStrategy:
:
getType
,
bo
.
getType
());
if
(
strategy
==
null
)
throw
new
ServiceException
(
"请配置对应开票策略"
);
OrderInvoicing
invoicing
=
baseMapper
.
selectOne
(
OrderInvoicing:
:
getOrderId
,
bo
.
getOrderId
(),
OrderInvoicing:
:
getType
,
bo
.
getType
());
bo
.
setStrategy
(
strategy
.
getStrategy
());
if
(
null
==
invoicing
)
{
insertByBo
(
bo
);
}
else
{
invoicing
.
setPersonCode
(
bo
.
getPersonCode
());
invoicing
.
setUseName
(
bo
.
getUseName
());
invoicing
.
setAuthName
(
bo
.
getAuthName
());
invoicing
.
setUseTime
(
bo
.
getUseTime
());
baseMapper
.
updateById
(
invoicing
);
}
}
@Override
public
LambdaQueryWrapper
<
OrderInvoicing
>
buildQueryWrapper
(
OrderInvoicingBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
...
...
@@ -50,6 +66,7 @@ public class OrderInvoicingServiceImpl extends AbstractBaseService<OrderInvoicin
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getAuthName
()),
OrderInvoicing:
:
getAuthName
,
bo
.
getAuthName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getStrategy
()),
OrderInvoicing:
:
getStrategy
,
bo
.
getStrategy
());
lqw
.
eq
(
bo
.
getUseTime
()
!=
null
,
OrderInvoicing:
:
getUseTime
,
bo
.
getUseTime
());
lqw
.
in
(
CollectionUtils
.
isNotEmpty
(
bo
.
getOrderIds
()),
OrderInvoicing:
:
getOrderId
,
bo
.
getOrderIds
());
return
lqw
;
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderInvoicingStrategyServiceImpl.java
浏览文件 @
2f520261
package
org
.
dromara
.
server
.
service
.
impl
;
import
org.dromara.common.core.utils.MapstructUtils
;
import
org.dromara.common.core.utils.StringUtils
;
import
org.dromara.common.mybatis.core.page.TableDataInfo
;
import
org.dromara.common.mybatis.core.page.PageQuery
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Service
;
import
org.dromara.common.core.exception.ServiceException
;
import
org.dromara.common.core.utils.StringUtils
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.server.domain.OrderInvoicingStrategy
;
import
org.dromara.server.domain.bo.OrderInvoicingStrategyBo
;
import
org.dromara.server.domain.vo.OrderInvoicingStrategyVo
;
import
org.dromara.server.domain.OrderInvoicingStrategy
;
import
org.dromara.server.mapper.OrderInvoicingStrategyMapper
;
import
org.dromara.server.service.IOrderInvoicingStrategyService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.
Collection
;
import
java.util.
Objects
;
/**
* 开票策略Service业务层处理
...
...
@@ -38,6 +34,25 @@ public class OrderInvoicingStrategyServiceImpl extends AbstractBaseService<Order
return
baseMapper
;
}
@Override
public
Boolean
insertByBo
(
OrderInvoicingStrategyBo
bo
)
{
if
(
null
!=
baseMapper
.
selectOne
(
OrderInvoicingStrategy:
:
getCode
,
bo
.
getCode
()))
throw
new
ServiceException
(
"开盘策略编号重复"
);
if
(
null
!=
baseMapper
.
selectOne
(
OrderInvoicingStrategy:
:
getType
,
bo
.
getType
()))
throw
new
ServiceException
(
bo
.
getType
()
+
"请勿重复配置"
);
return
super
.
insertByBo
(
bo
);
}
@Override
public
Boolean
updateByBo
(
OrderInvoicingStrategyBo
bo
)
{
OrderInvoicingStrategyVo
vo
=
queryById
(
bo
.
getId
());
if
(!
Objects
.
equals
(
bo
.
getCode
(),
vo
.
getCode
()))
{
if
(
null
!=
baseMapper
.
selectOne
(
OrderInvoicingStrategy:
:
getCode
,
bo
.
getCode
()))
throw
new
ServiceException
(
"开盘策略编号重复"
);
}
if
(!
Objects
.
equals
(
bo
.
getType
(),
vo
.
getType
()))
{
if
(
null
!=
baseMapper
.
selectOne
(
OrderInvoicingStrategy:
:
getType
,
bo
.
getType
()))
throw
new
ServiceException
(
bo
.
getType
()
+
"请勿重复配置"
);
}
return
super
.
updateByBo
(
bo
);
}
@Override
public
LambdaQueryWrapper
<
OrderInvoicingStrategy
>
buildQueryWrapper
(
OrderInvoicingStrategyBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainServiceImpl.java
浏览文件 @
2f520261
...
...
@@ -19,9 +19,11 @@ import org.dromara.common.ys.model.res.train.bean.TicketInfo;
import
org.dromara.common.ys.service.ITrainService
;
import
org.dromara.server.domain.*
;
import
org.dromara.server.domain.bo.OrderTrainBo
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
import
org.dromara.server.domain.vo.OrderTrainRangeVo
;
import
org.dromara.server.domain.vo.OrderTrainTicketVo
;
import
org.dromara.server.domain.vo.OrderTrainVo
;
import
org.dromara.server.enums.OrderTypeEnum
;
import
org.dromara.server.mapper.*
;
import
org.dromara.server.service.IBizUserService
;
import
org.dromara.server.service.IOrderTrainService
;
...
...
@@ -43,6 +45,7 @@ import java.util.concurrent.ScheduledExecutorService;
@Service
public
class
OrderTrainServiceImpl
extends
AbstractBaseService
<
OrderTrainVo
,
OrderTrainBo
,
OrderTrain
>
implements
IOrderTrainService
{
private
final
OrderInvoicingMapper
invoicingMapper
;
private
final
OrderTrainMapper
baseMapper
;
private
final
OrderTrainBusinessMapper
businessMapper
;
private
final
OrderTrainPayMapper
payMapper
;
...
...
@@ -67,9 +70,11 @@ public class OrderTrainServiceImpl extends AbstractBaseService<OrderTrainVo, Ord
orderIds
=
CollectionUtils
.
isEmpty
(
orderIds
)
?
Arrays
.
asList
(-
1L
)
:
orderIds
;
List
<
OrderTrainRangeVo
>
rangeList
=
rangeMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderTrainRange
>().
in
(
OrderTrainRange:
:
getOrderId
,
orderIds
));
List
<
OrderTrainTicketVo
>
ticketList
=
ticketMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderTrainTicket
>().
in
(
OrderTrainTicket:
:
getOrderId
,
orderIds
));
List
<
OrderInvoicingVo
>
invoicingList
=
invoicingMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderInvoicing
>().
eq
(
OrderInvoicing:
:
getType
,
OrderTypeEnum
.
TRAIN
.
getType
()).
in
(
OrderInvoicing:
:
getOrderId
,
orderIds
));
list
.
forEach
(
item
->
{
item
.
setRange
(
StreamUtils
.
findFirst
(
rangeList
,
r
->
Objects
.
equals
(
r
.
getOrderId
(),
item
.
getId
())));
item
.
setTickerList
(
StreamUtils
.
filter
(
ticketList
,
r
->
Objects
.
equals
(
r
.
getOrderId
(),
item
.
getId
())));
item
.
setInvoicingInfo
(
StreamUtils
.
findFirst
(
invoicingList
,
o
->
Objects
.
equals
(
o
.
getOrderId
(),
item
.
getId
())));
});
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderVehiclesServiceImpl.java
浏览文件 @
2f520261
...
...
@@ -15,12 +15,11 @@ import org.dromara.common.ys.model.res.vehicles.OrderDetailModel;
import
org.dromara.common.ys.service.IVehiclesService
;
import
org.dromara.server.domain.*
;
import
org.dromara.server.domain.bo.OrderVehiclesBo
;
import
org.dromara.server.domain.vo.OrderInvoicingVo
;
import
org.dromara.server.domain.vo.OrderVehiclesBusinessVo
;
import
org.dromara.server.domain.vo.OrderVehiclesVo
;
import
org.dromara.server.mapper.BizUserMapper
;
import
org.dromara.server.mapper.OrderVehiclesBusinessMapper
;
import
org.dromara.server.mapper.OrderVehiclesMapper
;
import
org.dromara.server.mapper.OrderVehiclesPayInfoMapper
;
import
org.dromara.server.enums.OrderTypeEnum
;
import
org.dromara.server.mapper.*
;
import
org.dromara.server.service.IBizUserService
;
import
org.dromara.server.service.IOrderVehiclesService
;
import
org.springframework.stereotype.Service
;
...
...
@@ -41,6 +40,7 @@ import java.util.concurrent.ScheduledExecutorService;
@Service
public
class
OrderVehiclesServiceImpl
extends
AbstractBaseService
<
OrderVehiclesVo
,
OrderVehiclesBo
,
OrderVehicles
>
implements
IOrderVehiclesService
{
private
final
OrderInvoicingMapper
invoicingMapper
;
private
final
OrderVehiclesMapper
baseMapper
;
private
final
OrderVehiclesBusinessMapper
businessMapper
;
private
final
OrderVehiclesPayInfoMapper
payInfoMapper
;
...
...
@@ -151,8 +151,10 @@ public class OrderVehiclesServiceImpl extends AbstractBaseService<OrderVehiclesV
List
<
Long
>
orderIds
=
StreamUtils
.
toList
(
list
,
OrderVehiclesVo:
:
getId
);
orderIds
=
CollectionUtils
.
isEmpty
(
orderIds
)
?
Arrays
.
asList
(-
1L
)
:
orderIds
;
List
<
OrderVehiclesBusinessVo
>
businessList
=
businessMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderVehiclesBusiness
>().
in
(
OrderVehiclesBusiness:
:
getOrderId
,
orderIds
));
List
<
OrderInvoicingVo
>
invoicingList
=
invoicingMapper
.
selectVoList
(
new
LambdaQueryWrapper
<
OrderInvoicing
>().
eq
(
OrderInvoicing:
:
getType
,
OrderTypeEnum
.
VEHICLES
.
getType
()).
in
(
OrderInvoicing:
:
getOrderId
,
orderIds
));
list
.
forEach
(
item
->
{
item
.
setBusiness
(
StreamUtils
.
findFirst
(
businessList
,
r
->
Objects
.
equals
(
r
.
getOrderId
(),
item
.
getId
())));
item
.
setInvoicingInfo
(
StreamUtils
.
findFirst
(
invoicingList
,
o
->
Objects
.
equals
(
o
.
getOrderId
(),
item
.
getId
())));
});
}
...
...
sql/update/server_update_20250611.sql
0 → 100644
浏览文件 @
2f520261
CREATE
TABLE
`biz_order_invoicing_strategy`
(
`id`
bigint
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`tenant_id`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户编号'
,
`code`
varchar
(
64
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'唯一编号'
,
`supplier_name`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'供应商名称'
,
`type`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'类型'
,
`product_type`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'产品类型'
,
`strategy`
varchar
(
100
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'开票策略'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建时间'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
`create_by`
bigint
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
bigint
DEFAULT
NULL
COMMENT
'更新者'
,
`create_dept`
bigint
DEFAULT
NULL
COMMENT
'创建部门'
,
`del_flag`
char
(
1
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
'0'
COMMENT
'删除标志(0代表存在 2代表删除)'
,
PRIMARY
KEY
(
`id`
)
USING
BTREE
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_general_ci
COMMENT
=
'开票策略'
;
CREATE
TABLE
`biz_order_invoicing`
(
`id`
bigint
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`tenant_id`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户编号'
,
`type`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'订单类型'
,
`order_id`
bigint
NOT
NULL
COMMENT
'订单id'
,
`person_code`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
NULL
COMMENT
'人员code'
,
`order_no`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
NULL
COMMENT
'订单编号'
,
`use_name`
varchar
(
100
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'使用人'
,
`auth_name`
varchar
(
100
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'授权人'
,
`strategy`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
''
COMMENT
'开票策略'
,
`use_time`
datetime
DEFAULT
NULL
COMMENT
'使用时间'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建时间'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
`create_by`
bigint
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
bigint
DEFAULT
NULL
COMMENT
'更新者'
,
`create_dept`
bigint
DEFAULT
NULL
COMMENT
'创建部门'
,
`del_flag`
char
(
1
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
DEFAULT
'0'
COMMENT
'删除标志(0代表存在 2代表删除)'
,
PRIMARY
KEY
(
`id`
)
USING
BTREE
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_general_ci
COMMENT
=
'开票订单关联'
;
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论