Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
travel-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cloud
travel-cloud
Commits
7c3ac6ae
提交
7c3ac6ae
authored
4月 17, 2025
作者:
hzh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
飞机票改签部分功能实现
上级
1ed66f26
显示空白字符变更
内嵌
并排
正在显示
19 个修改的文件
包含
157 行增加
和
564 行删除
+157
-564
OrderAirportChange.java
...in/java/org/dromara/server/domain/OrderAirportChange.java
+2
-2
OrderAirportChangeBusinessInfo.java
...dromara/server/domain/OrderAirportChangeBusinessInfo.java
+2
-0
OrderAirportChangePayInfo.java
.../org/dromara/server/domain/OrderAirportChangePayInfo.java
+2
-0
OrderAirportChangeRangeInfo.java
...rg/dromara/server/domain/OrderAirportChangeRangeInfo.java
+2
-0
OrderAirportChangeBo.java
...va/org/dromara/server/domain/bo/OrderAirportChangeBo.java
+2
-3
IOrderAirportChangeBusinessInfoService.java
...erver/service/IOrderAirportChangeBusinessInfoService.java
+0
-21
IOrderAirportChangePayInfoService.java
...ara/server/service/IOrderAirportChangePayInfoService.java
+0
-21
IOrderAirportChangeRangeInfoService.java
...a/server/service/IOrderAirportChangeRangeInfoService.java
+0
-21
IOrderAirportChangeService.java
...rg/dromara/server/service/IOrderAirportChangeService.java
+17
-4
IOrderTrainChangeBusinessInfoService.java
.../server/service/IOrderTrainChangeBusinessInfoService.java
+0
-21
IOrderTrainChangePayInfoService.java
...omara/server/service/IOrderTrainChangePayInfoService.java
+0
-21
IOrderTrainChangeTicketInfoService.java
...ra/server/service/IOrderTrainChangeTicketInfoService.java
+0
-21
OrderAirportChangeBusinessInfoServiceImpl.java
...rvice/impl/OrderAirportChangeBusinessInfoServiceImpl.java
+0
-70
OrderAirportChangePayInfoServiceImpl.java
...er/service/impl/OrderAirportChangePayInfoServiceImpl.java
+0
-58
OrderAirportChangeRangeInfoServiceImpl.java
.../service/impl/OrderAirportChangeRangeInfoServiceImpl.java
+0
-82
OrderAirportChangeServiceImpl.java
...ra/server/service/impl/OrderAirportChangeServiceImpl.java
+130
-12
OrderTrainChangeBusinessInfoServiceImpl.java
...service/impl/OrderTrainChangeBusinessInfoServiceImpl.java
+0
-74
OrderTrainChangePayInfoServiceImpl.java
...rver/service/impl/OrderTrainChangePayInfoServiceImpl.java
+0
-60
OrderTrainChangeTicketInfoServiceImpl.java
...r/service/impl/OrderTrainChangeTicketInfoServiceImpl.java
+0
-73
没有找到文件。
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderAirportChange.java
浏览文件 @
7c3ac6ae
...
@@ -29,9 +29,9 @@ public class OrderAirportChange extends TenantEntity {
...
@@ -29,9 +29,9 @@ public class OrderAirportChange extends TenantEntity {
private
Long
id
;
private
Long
id
;
/**
/**
*
订单id
*
人员code
*/
*/
private
Long
orderId
;
private
String
personCode
;
/**
/**
* 改签编号
* 改签编号
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderAirportChangeBusinessInfo.java
浏览文件 @
7c3ac6ae
package
org
.
dromara
.
server
.
domain
;
package
org
.
dromara
.
server
.
domain
;
import
lombok.experimental.Accessors
;
import
org.dromara.common.tenant.core.TenantEntity
;
import
org.dromara.common.tenant.core.TenantEntity
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.*
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -14,6 +15,7 @@ import java.io.Serial;
...
@@ -14,6 +15,7 @@ import java.io.Serial;
* @date 2025-04-16
* @date 2025-04-16
*/
*/
@Data
@Data
@Accessors
(
chain
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@TableName
(
"biz_order_airport_change_business_info"
)
@TableName
(
"biz_order_airport_change_business_info"
)
public
class
OrderAirportChangeBusinessInfo
extends
TenantEntity
{
public
class
OrderAirportChangeBusinessInfo
extends
TenantEntity
{
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderAirportChangePayInfo.java
浏览文件 @
7c3ac6ae
package
org
.
dromara
.
server
.
domain
;
package
org
.
dromara
.
server
.
domain
;
import
lombok.experimental.Accessors
;
import
org.dromara.common.tenant.core.TenantEntity
;
import
org.dromara.common.tenant.core.TenantEntity
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.*
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -15,6 +16,7 @@ import java.io.Serial;
...
@@ -15,6 +16,7 @@ import java.io.Serial;
* @date 2025-04-16
* @date 2025-04-16
*/
*/
@Data
@Data
@Accessors
(
chain
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@TableName
(
"biz_order_airport_change_pay_info"
)
@TableName
(
"biz_order_airport_change_pay_info"
)
public
class
OrderAirportChangePayInfo
extends
TenantEntity
{
public
class
OrderAirportChangePayInfo
extends
TenantEntity
{
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderAirportChangeRangeInfo.java
浏览文件 @
7c3ac6ae
package
org
.
dromara
.
server
.
domain
;
package
org
.
dromara
.
server
.
domain
;
import
lombok.experimental.Accessors
;
import
org.dromara.common.tenant.core.TenantEntity
;
import
org.dromara.common.tenant.core.TenantEntity
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.*
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -14,6 +15,7 @@ import java.io.Serial;
...
@@ -14,6 +15,7 @@ import java.io.Serial;
* @date 2025-04-16
* @date 2025-04-16
*/
*/
@Data
@Data
@Accessors
(
chain
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@TableName
(
"biz_order_airport_change_range_info"
)
@TableName
(
"biz_order_airport_change_range_info"
)
public
class
OrderAirportChangeRangeInfo
extends
TenantEntity
{
public
class
OrderAirportChangeRangeInfo
extends
TenantEntity
{
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderAirportChangeBo.java
浏览文件 @
7c3ac6ae
...
@@ -28,10 +28,9 @@ public class OrderAirportChangeBo extends BaseEntity {
...
@@ -28,10 +28,9 @@ public class OrderAirportChangeBo extends BaseEntity {
private
Long
id
;
private
Long
id
;
/**
/**
*
订单id
*
人员code
*/
*/
@NotNull
(
message
=
"订单id不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
String
personCode
;
private
Long
orderId
;
/**
/**
* 改签编号
* 改签编号
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderAirportChangeBusinessInfoService.java
deleted
100644 → 0
浏览文件 @
1ed66f26
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderAirportChangeBusinessInfo
;
import
org.dromara.server.domain.vo.OrderAirportChangeBusinessInfoVo
;
import
org.dromara.server.domain.bo.OrderAirportChangeBusinessInfoBo
;
import
org.dromara.server.domain.OrderAirportChangeBusinessInfo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 机票改签差旅信息Service接口
*
* @author hzh
* @date 2025-04-16
*/
public
interface
IOrderAirportChangeBusinessInfoService
extends
IBaseService
<
OrderAirportChangeBusinessInfoVo
,
OrderAirportChangeBusinessInfoBo
,
OrderAirportChangeBusinessInfo
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderAirportChangePayInfoService.java
deleted
100644 → 0
浏览文件 @
1ed66f26
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderAirportChangePayInfo
;
import
org.dromara.server.domain.vo.OrderAirportChangePayInfoVo
;
import
org.dromara.server.domain.bo.OrderAirportChangePayInfoBo
;
import
org.dromara.server.domain.OrderAirportChangePayInfo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 机票改签支付信息Service接口
*
* @author hzh
* @date 2025-04-16
*/
public
interface
IOrderAirportChangePayInfoService
extends
IBaseService
<
OrderAirportChangePayInfoVo
,
OrderAirportChangePayInfoBo
,
OrderAirportChangePayInfo
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderAirportChangeRangeInfoService.java
deleted
100644 → 0
浏览文件 @
1ed66f26
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderAirportChangeRangeInfo
;
import
org.dromara.server.domain.vo.OrderAirportChangeRangeInfoVo
;
import
org.dromara.server.domain.bo.OrderAirportChangeRangeInfoBo
;
import
org.dromara.server.domain.OrderAirportChangeRangeInfo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 机票改签航段信息Service接口
*
* @author hzh
* @date 2025-04-16
*/
public
interface
IOrderAirportChangeRangeInfoService
extends
IBaseService
<
OrderAirportChangeRangeInfoVo
,
OrderAirportChangeRangeInfoBo
,
OrderAirportChangeRangeInfo
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderAirportChangeService.java
浏览文件 @
7c3ac6ae
package
org
.
dromara
.
server
.
service
;
package
org
.
dromara
.
server
.
service
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
org.dromara.server.domain.OrderAirportChange
;
import
org.dromara.server.domain.OrderAirportChange
;
import
org.dromara.server.domain.vo.OrderAirportChangeVo
;
import
org.dromara.server.domain.bo.OrderAirportChangeBo
;
import
org.dromara.server.domain.bo.OrderAirportChangeBo
;
import
org.dromara.server.domain.OrderAirportChange
;
import
org.dromara.server.domain.vo.OrderAirportChangeVo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -17,5 +15,20 @@ import java.util.List;
...
@@ -17,5 +15,20 @@ import java.util.List;
*/
*/
public
interface
IOrderAirportChangeService
extends
IBaseService
<
OrderAirportChangeVo
,
OrderAirportChangeBo
,
OrderAirportChange
>{
public
interface
IOrderAirportChangeService
extends
IBaseService
<
OrderAirportChangeVo
,
OrderAirportChangeBo
,
OrderAirportChange
>{
/**
* 批量保存订单
*
* @param userId 用户id
* @param orderNo 订单编号
* @param changeNoList 订单号列表
*/
void
batchSaveOrder
(
String
userId
,
String
orderNo
,
List
<
String
>
changeNoList
);
/**
* 更新火车票改签信息
*
* @param changeNoList 订单号列表
*/
void
updateOrderInfo
(
List
<
String
>
changeNoList
);
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderTrainChangeBusinessInfoService.java
deleted
100644 → 0
浏览文件 @
1ed66f26
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderTrainChangeBusinessInfo
;
import
org.dromara.server.domain.vo.OrderTrainChangeBusinessInfoVo
;
import
org.dromara.server.domain.bo.OrderTrainChangeBusinessInfoBo
;
import
org.dromara.server.domain.OrderTrainChangeBusinessInfo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 火车票改签差旅信息Service接口
*
* @author hzh
* @date 2025-04-16
*/
public
interface
IOrderTrainChangeBusinessInfoService
extends
IBaseService
<
OrderTrainChangeBusinessInfoVo
,
OrderTrainChangeBusinessInfoBo
,
OrderTrainChangeBusinessInfo
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderTrainChangePayInfoService.java
deleted
100644 → 0
浏览文件 @
1ed66f26
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderTrainChangePayInfo
;
import
org.dromara.server.domain.vo.OrderTrainChangePayInfoVo
;
import
org.dromara.server.domain.bo.OrderTrainChangePayInfoBo
;
import
org.dromara.server.domain.OrderTrainChangePayInfo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 火车票改签支付信息Service接口
*
* @author hzh
* @date 2025-04-16
*/
public
interface
IOrderTrainChangePayInfoService
extends
IBaseService
<
OrderTrainChangePayInfoVo
,
OrderTrainChangePayInfoBo
,
OrderTrainChangePayInfo
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderTrainChangeTicketInfoService.java
deleted
100644 → 0
浏览文件 @
1ed66f26
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderTrainChangeTicketInfo
;
import
org.dromara.server.domain.vo.OrderTrainChangeTicketInfoVo
;
import
org.dromara.server.domain.bo.OrderTrainChangeTicketInfoBo
;
import
org.dromara.server.domain.OrderTrainChangeTicketInfo
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 火车票改签乘机人信息Service接口
*
* @author hzh
* @date 2025-04-16
*/
public
interface
IOrderTrainChangeTicketInfoService
extends
IBaseService
<
OrderTrainChangeTicketInfoVo
,
OrderTrainChangeTicketInfoBo
,
OrderTrainChangeTicketInfo
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportChangeBusinessInfoServiceImpl.java
deleted
100644 → 0
浏览文件 @
1ed66f26
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.server.domain.bo.OrderAirportChangeBusinessInfoBo
;
import
org.dromara.server.domain.vo.OrderAirportChangeBusinessInfoVo
;
import
org.dromara.server.domain.OrderAirportChangeBusinessInfo
;
import
org.dromara.server.mapper.OrderAirportChangeBusinessInfoMapper
;
import
org.dromara.server.service.IOrderAirportChangeBusinessInfoService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 机票改签差旅信息Service业务层处理
*
* @author hzh
* @date 2025-04-16
*/
@RequiredArgsConstructor
@Service
public
class
OrderAirportChangeBusinessInfoServiceImpl
extends
AbstractBaseService
<
OrderAirportChangeBusinessInfoVo
,
OrderAirportChangeBusinessInfoBo
,
OrderAirportChangeBusinessInfo
>
implements
IOrderAirportChangeBusinessInfoService
{
private
final
OrderAirportChangeBusinessInfoMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderAirportChangeBusinessInfo
,
OrderAirportChangeBusinessInfoVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderAirportChangeBusinessInfo
>
buildQueryWrapper
(
OrderAirportChangeBusinessInfoBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderAirportChangeBusinessInfo
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
getOrderId
()
!=
null
,
OrderAirportChangeBusinessInfo:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeOrderNo
()),
OrderAirportChangeBusinessInfo:
:
getChangeOrderNo
,
bo
.
getChangeOrderNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getTravelNo
()),
OrderAirportChangeBusinessInfo:
:
getTravelNo
,
bo
.
getTravelNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLinkMan
()),
OrderAirportChangeBusinessInfo:
:
getLinkMan
,
bo
.
getLinkMan
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getAppUserName
()),
OrderAirportChangeBusinessInfo:
:
getAppUserName
,
bo
.
getAppUserName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getAppRuleName
()),
OrderAirportChangeBusinessInfo:
:
getAppRuleName
,
bo
.
getAppRuleName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getBookerNo
()),
OrderAirportChangeBusinessInfo:
:
getBookerNo
,
bo
.
getBookerNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getIsViolate
()),
OrderAirportChangeBusinessInfo:
:
getIsViolate
,
bo
.
getIsViolate
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getCostCenterNo
()),
OrderAirportChangeBusinessInfo:
:
getCostCenterNo
,
bo
.
getCostCenterNo
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getProjectName
()),
OrderAirportChangeBusinessInfo:
:
getProjectName
,
bo
.
getProjectName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getBookerName
()),
OrderAirportChangeBusinessInfo:
:
getBookerName
,
bo
.
getBookerName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getTravelRemark
()),
OrderAirportChangeBusinessInfo:
:
getTravelRemark
,
bo
.
getTravelRemark
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getReasonCode
()),
OrderAirportChangeBusinessInfo:
:
getReasonCode
,
bo
.
getReasonCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLinkEmail
()),
OrderAirportChangeBusinessInfo:
:
getLinkEmail
,
bo
.
getLinkEmail
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getViolateitem
()),
OrderAirportChangeBusinessInfo:
:
getViolateitem
,
bo
.
getViolateitem
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getProjectNo
()),
OrderAirportChangeBusinessInfo:
:
getProjectNo
,
bo
.
getProjectNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getAppUserNo
()),
OrderAirportChangeBusinessInfo:
:
getAppUserNo
,
bo
.
getAppUserNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getReasonDesc
()),
OrderAirportChangeBusinessInfo:
:
getReasonDesc
,
bo
.
getReasonDesc
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getAppDatetime
()),
OrderAirportChangeBusinessInfo:
:
getAppDatetime
,
bo
.
getAppDatetime
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getViolateitemCode
()),
OrderAirportChangeBusinessInfo:
:
getViolateitemCode
,
bo
.
getViolateitemCode
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getCostCenterName
()),
OrderAirportChangeBusinessInfo:
:
getCostCenterName
,
bo
.
getCostCenterName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLinkMobile
()),
OrderAirportChangeBusinessInfo:
:
getLinkMobile
,
bo
.
getLinkMobile
());
return
lqw
;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportChangePayInfoServiceImpl.java
deleted
100644 → 0
浏览文件 @
1ed66f26
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.server.domain.bo.OrderAirportChangePayInfoBo
;
import
org.dromara.server.domain.vo.OrderAirportChangePayInfoVo
;
import
org.dromara.server.domain.OrderAirportChangePayInfo
;
import
org.dromara.server.mapper.OrderAirportChangePayInfoMapper
;
import
org.dromara.server.service.IOrderAirportChangePayInfoService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 机票改签支付信息Service业务层处理
*
* @author hzh
* @date 2025-04-16
*/
@RequiredArgsConstructor
@Service
public
class
OrderAirportChangePayInfoServiceImpl
extends
AbstractBaseService
<
OrderAirportChangePayInfoVo
,
OrderAirportChangePayInfoBo
,
OrderAirportChangePayInfo
>
implements
IOrderAirportChangePayInfoService
{
private
final
OrderAirportChangePayInfoMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderAirportChangePayInfo
,
OrderAirportChangePayInfoVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderAirportChangePayInfo
>
buildQueryWrapper
(
OrderAirportChangePayInfoBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderAirportChangePayInfo
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
getOrderId
()
!=
null
,
OrderAirportChangePayInfo:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeOrderNo
()),
OrderAirportChangePayInfo:
:
getChangeOrderNo
,
bo
.
getChangeOrderNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPaySubject
()),
OrderAirportChangePayInfo:
:
getPaySubject
,
bo
.
getPaySubject
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getPayMothedName
()),
OrderAirportChangePayInfo:
:
getPayMothedName
,
bo
.
getPayMothedName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayBankCard
()),
OrderAirportChangePayInfo:
:
getPayBankCard
,
bo
.
getPayBankCard
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayDate
()),
OrderAirportChangePayInfo:
:
getPayDate
,
bo
.
getPayDate
());
lqw
.
eq
(
bo
.
getPayAmount
()
!=
null
,
OrderAirportChangePayInfo:
:
getPayAmount
,
bo
.
getPayAmount
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getPaySubjectName
()),
OrderAirportChangePayInfo:
:
getPaySubjectName
,
bo
.
getPaySubjectName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayBillno
()),
OrderAirportChangePayInfo:
:
getPayBillno
,
bo
.
getPayBillno
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayRemark
()),
OrderAirportChangePayInfo:
:
getPayRemark
,
bo
.
getPayRemark
());
return
lqw
;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportChangeRangeInfoServiceImpl.java
deleted
100644 → 0
浏览文件 @
1ed66f26
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.server.domain.bo.OrderAirportChangeRangeInfoBo
;
import
org.dromara.server.domain.vo.OrderAirportChangeRangeInfoVo
;
import
org.dromara.server.domain.OrderAirportChangeRangeInfo
;
import
org.dromara.server.mapper.OrderAirportChangeRangeInfoMapper
;
import
org.dromara.server.service.IOrderAirportChangeRangeInfoService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 机票改签航段信息Service业务层处理
*
* @author hzh
* @date 2025-04-16
*/
@RequiredArgsConstructor
@Service
public
class
OrderAirportChangeRangeInfoServiceImpl
extends
AbstractBaseService
<
OrderAirportChangeRangeInfoVo
,
OrderAirportChangeRangeInfoBo
,
OrderAirportChangeRangeInfo
>
implements
IOrderAirportChangeRangeInfoService
{
private
final
OrderAirportChangeRangeInfoMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderAirportChangeRangeInfo
,
OrderAirportChangeRangeInfoVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderAirportChangeRangeInfo
>
buildQueryWrapper
(
OrderAirportChangeRangeInfoBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderAirportChangeRangeInfo
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
getOrderId
()
!=
null
,
OrderAirportChangeRangeInfo:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeOrderNo
()),
OrderAirportChangeRangeInfo:
:
getChangeOrderNo
,
bo
.
getChangeOrderNo
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getNdepartCityName
()),
OrderAirportChangeRangeInfo:
:
getNdepartCityName
,
bo
.
getNdepartCityName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOstopFlag
()),
OrderAirportChangeRangeInfo:
:
getOstopFlag
,
bo
.
getOstopFlag
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getNarriveCityName
()),
OrderAirportChangeRangeInfo:
:
getNarriveCityName
,
bo
.
getNarriveCityName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOmodel
()),
OrderAirportChangeRangeInfo:
:
getOmodel
,
bo
.
getOmodel
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOarriveTime
()),
OrderAirportChangeRangeInfo:
:
getOarriveTime
,
bo
.
getOarriveTime
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNdepartAirport
()),
OrderAirportChangeRangeInfo:
:
getNdepartAirport
,
bo
.
getNdepartAirport
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOcabin
()),
OrderAirportChangeRangeInfo:
:
getOcabin
,
bo
.
getOcabin
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getNcabinName
()),
OrderAirportChangeRangeInfo:
:
getNcabinName
,
bo
.
getNcabinName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNmodel
()),
OrderAirportChangeRangeInfo:
:
getNmodel
,
bo
.
getNmodel
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getOcabinName
()),
OrderAirportChangeRangeInfo:
:
getOcabinName
,
bo
.
getOcabinName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNdepartTerminal
()),
OrderAirportChangeRangeInfo:
:
getNdepartTerminal
,
bo
.
getNdepartTerminal
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNdepartTime
()),
OrderAirportChangeRangeInfo:
:
getNdepartTime
,
bo
.
getNdepartTime
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getAirline
()),
OrderAirportChangeRangeInfo:
:
getAirline
,
bo
.
getAirline
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNarriveTerminal
()),
OrderAirportChangeRangeInfo:
:
getNarriveTerminal
,
bo
.
getNarriveTerminal
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOflightNo
()),
OrderAirportChangeRangeInfo:
:
getOflightNo
,
bo
.
getOflightNo
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getOarriveAirportName
()),
OrderAirportChangeRangeInfo:
:
getOarriveAirportName
,
bo
.
getOarriveAirportName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getOdepartAirportName
()),
OrderAirportChangeRangeInfo:
:
getOdepartAirportName
,
bo
.
getOdepartAirportName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getNdepartAirportName
()),
OrderAirportChangeRangeInfo:
:
getNdepartAirportName
,
bo
.
getNdepartAirportName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getOarriveCityName
()),
OrderAirportChangeRangeInfo:
:
getOarriveCityName
,
bo
.
getOarriveCityName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNarriveTime
()),
OrderAirportChangeRangeInfo:
:
getNarriveTime
,
bo
.
getNarriveTime
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getOdepartCityName
()),
OrderAirportChangeRangeInfo:
:
getOdepartCityName
,
bo
.
getOdepartCityName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getOarriveTerminalName
()),
OrderAirportChangeRangeInfo:
:
getOarriveTerminalName
,
bo
.
getOarriveTerminalName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNstopFlag
()),
OrderAirportChangeRangeInfo:
:
getNstopFlag
,
bo
.
getNstopFlag
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOdepartTime
()),
OrderAirportChangeRangeInfo:
:
getOdepartTime
,
bo
.
getOdepartTime
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOdepartTerminal
()),
OrderAirportChangeRangeInfo:
:
getOdepartTerminal
,
bo
.
getOdepartTerminal
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getAirlineName
()),
OrderAirportChangeRangeInfo:
:
getAirlineName
,
bo
.
getAirlineName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOdepartAirport
()),
OrderAirportChangeRangeInfo:
:
getOdepartAirport
,
bo
.
getOdepartAirport
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOarriveAirport
()),
OrderAirportChangeRangeInfo:
:
getOarriveAirport
,
bo
.
getOarriveAirport
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNcabin
()),
OrderAirportChangeRangeInfo:
:
getNcabin
,
bo
.
getNcabin
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getNarriveAirportName
()),
OrderAirportChangeRangeInfo:
:
getNarriveAirportName
,
bo
.
getNarriveAirportName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNflightNo
()),
OrderAirportChangeRangeInfo:
:
getNflightNo
,
bo
.
getNflightNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNarriveAirport
()),
OrderAirportChangeRangeInfo:
:
getNarriveAirport
,
bo
.
getNarriveAirport
());
return
lqw
;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderAirportChangeServiceImpl.java
浏览文件 @
7c3ac6ae
package
org
.
dromara
.
server
.
service
.
impl
;
package
org
.
dromara
.
server
.
service
.
impl
;
import
org.dromara.common.core.utils.MapstructUtils
;
import
cn.hutool.core.bean.BeanUtil
;
import
org.dromara.common.core.utils.StringUtils
;
import
com.alibaba.nacos.common.utils.CollectionUtils
;
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.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Service
;
import
org.dromara.common.core.utils.StreamUtils
;
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.common.ys.model.res.airport.other.ChengeRangeInfoBean
;
import
org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean
;
import
org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean
;
import
org.dromara.common.ys.model.res.airport.other.TkChangeOrderInfoBean
;
import
org.dromara.common.ys.service.IAirportService
;
import
org.dromara.server.domain.*
;
import
org.dromara.server.domain.bo.OrderAirportChangeBo
;
import
org.dromara.server.domain.bo.OrderAirportChangeBo
;
import
org.dromara.server.domain.vo.OrderAirportChangeVo
;
import
org.dromara.server.domain.vo.OrderAirportChangeVo
;
import
org.dromara.server.domain.OrderAirportChange
;
import
org.dromara.server.mapper.*
;
import
org.dromara.server.mapper.OrderAirportChangeMapper
;
import
org.dromara.server.service.IOrderAirportChangeService
;
import
org.dromara.server.service.IOrderAirportChangeService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.springframework.stereotype.Service
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Collection
;
import
java.util.Objects
;
import
java.util.concurrent.ScheduledExecutorService
;
/**
/**
* 机票改签订单Service业务层处理
* 机票改签订单Service业务层处理
...
@@ -32,6 +37,12 @@ import java.util.Collection;
...
@@ -32,6 +37,12 @@ import java.util.Collection;
public
class
OrderAirportChangeServiceImpl
extends
AbstractBaseService
<
OrderAirportChangeVo
,
OrderAirportChangeBo
,
OrderAirportChange
>
implements
IOrderAirportChangeService
{
public
class
OrderAirportChangeServiceImpl
extends
AbstractBaseService
<
OrderAirportChangeVo
,
OrderAirportChangeBo
,
OrderAirportChange
>
implements
IOrderAirportChangeService
{
private
final
OrderAirportChangeMapper
baseMapper
;
private
final
OrderAirportChangeMapper
baseMapper
;
private
final
OrderAirportChangeBusinessInfoMapper
businessInfoMapper
;
private
final
OrderAirportChangeRangeInfoMapper
rangeInfoMapper
;
private
final
OrderAirportChangePayInfoMapper
payInfoMapper
;
private
final
IAirportService
airportService
;
private
final
BizUserMapper
userMapper
;
private
final
ScheduledExecutorService
scheduledExecutorService
;
@Override
@Override
public
BaseMapperPlus
<
OrderAirportChange
,
OrderAirportChangeVo
>
mapper
()
{
public
BaseMapperPlus
<
OrderAirportChange
,
OrderAirportChangeVo
>
mapper
()
{
...
@@ -42,7 +53,7 @@ public class OrderAirportChangeServiceImpl extends AbstractBaseService<OrderAirp
...
@@ -42,7 +53,7 @@ public class OrderAirportChangeServiceImpl extends AbstractBaseService<OrderAirp
public
LambdaQueryWrapper
<
OrderAirportChange
>
buildQueryWrapper
(
OrderAirportChangeBo
bo
)
{
public
LambdaQueryWrapper
<
OrderAirportChange
>
buildQueryWrapper
(
OrderAirportChangeBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderAirportChange
>
lqw
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
OrderAirportChange
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
get
OrderId
()
!=
null
,
OrderAirportChange:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
bo
.
get
PersonCode
()
!=
null
,
OrderAirportChange:
:
getPersonCode
,
bo
.
getPersonCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeOrderNo
()),
OrderAirportChange:
:
getChangeOrderNo
,
bo
.
getChangeOrderNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeOrderNo
()),
OrderAirportChange:
:
getChangeOrderNo
,
bo
.
getChangeOrderNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeProveUrl
()),
OrderAirportChange:
:
getChangeProveUrl
,
bo
.
getChangeProveUrl
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeProveUrl
()),
OrderAirportChange:
:
getChangeProveUrl
,
bo
.
getChangeProveUrl
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getEmpDepName
()),
OrderAirportChange:
:
getEmpDepName
,
bo
.
getEmpDepName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getEmpDepName
()),
OrderAirportChange:
:
getEmpDepName
,
bo
.
getEmpDepName
());
...
@@ -86,4 +97,111 @@ public class OrderAirportChangeServiceImpl extends AbstractBaseService<OrderAirp
...
@@ -86,4 +97,111 @@ public class OrderAirportChangeServiceImpl extends AbstractBaseService<OrderAirp
return
lqw
;
return
lqw
;
}
}
@Override
public
void
batchSaveOrder
(
String
userId
,
String
orderNo
,
List
<
String
>
changeNoList
)
{
BizUser
user
=
userMapper
.
selectOne
(
new
LambdaQueryWrapper
<
BizUser
>().
eq
(
BizUser:
:
getUserNo
,
userId
));
if
(
Objects
.
isNull
(
user
))
{
throw
new
RuntimeException
(
"用户不存在"
);
}
List
<
OrderAirportChange
>
orderList
=
changeNoList
.
stream
().
map
(
changeNo
->
{
OrderAirportChange
order
=
new
OrderAirportChange
();
order
.
setPersonCode
(
userId
);
order
.
setOrderNo
(
orderNo
);
order
.
setChangeOrderNo
(
changeNo
);
order
.
setTenantId
(
user
.
getTenantId
());
return
order
;
}).
toList
();
for
(
OrderAirportChange
bo
:
orderList
)
{
baseMapper
.
insert
(
bo
);
}
updateOrderInfo
(
changeNoList
);
}
@Override
public
void
updateOrderInfo
(
List
<
String
>
changeNoList
)
{
if
(
CollectionUtils
.
isEmpty
(
changeNoList
))
{
return
;
}
List
<
OrderAirportChange
>
orderList
=
baseMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderAirportChange
>().
in
(
OrderAirportChange:
:
getChangeOrderNo
,
changeNoList
));
List
<
Long
>
orderIds
=
StreamUtils
.
toList
(
orderList
,
OrderAirportChange:
:
getId
);
if
(
CollectionUtils
.
isEmpty
(
orderIds
))
{
return
;
}
List
<
OrderAirportChangeBusinessInfo
>
orderBusinessList
=
businessInfoMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderAirportChangeBusinessInfo
>().
in
(
OrderAirportChangeBusinessInfo:
:
getOrderId
,
orderIds
));
List
<
OrderAirportChangePayInfo
>
orderPayInfoList
=
payInfoMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderAirportChangePayInfo
>().
in
(
OrderAirportChangePayInfo:
:
getOrderId
,
orderIds
));
List
<
OrderAirportChangeRangeInfo
>
orderRangeList
=
rangeInfoMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderAirportChangeRangeInfo
>().
in
(
OrderAirportChangeRangeInfo:
:
getOrderId
,
orderIds
));
//更新数据
orderList
.
forEach
(
order
->
{
scheduledExecutorService
.
execute
(()
->
{
TkChangeOrderInfoBean
orderModel
=
airportService
.
queryChangeOrder
(
order
.
getPersonCode
(),
new
org
.
dromara
.
common
.
ys
.
model
.
req
.
airport
.
QueryChangeOrderModel
().
setChangeNo
(
order
.
getChangeOrderNo
())).
getChangeOrderList
().
get
(
0
);
//跟新订单数据
BeanUtil
.
copyProperties
(
orderModel
,
order
,
"id"
,
"personCode"
,
"tenantId"
,
"orderNo"
,
"changeOrderNo"
);
baseMapper
.
updateById
(
order
);
//跟新差旅信息
OrderBusinessInfoBean
business
=
orderModel
.
getBusinessInfo
();
if
(
Objects
.
nonNull
(
business
))
{
OrderAirportChangeBusinessInfo
orderBusiness
=
orderBusinessList
.
stream
().
filter
(
item
->
Objects
.
equals
(
item
.
getOrderId
(),
order
.
getId
())).
findFirst
().
orElseGet
(
()
->
{
OrderAirportChangeBusinessInfo
entity
=
new
OrderAirportChangeBusinessInfo
()
.
setOrderId
(
order
.
getId
())
.
setChangeOrderNo
(
order
.
getChangeOrderNo
());
entity
.
setTenantId
(
order
.
getTenantId
());
return
entity
;
});
BeanUtil
.
copyProperties
(
business
,
orderBusiness
,
"id"
,
"orderId"
,
"changeOrderNo"
);
if
(
Objects
.
isNull
(
orderBusiness
.
getId
()))
{
businessInfoMapper
.
insert
(
orderBusiness
);
}
else
{
businessInfoMapper
.
updateById
(
orderBusiness
);
}
}
//跟新支付信息集合
List
<
OrderPayInfoBean
>
payInfoList
=
orderModel
.
getPayInfoList
();
if
(
CollectionUtils
.
isNotEmpty
(
payInfoList
))
{
for
(
OrderPayInfoBean
payInfo
:
payInfoList
)
{
OrderAirportChangePayInfo
orderPayInfo
=
orderPayInfoList
.
stream
().
filter
(
item
->
Objects
.
equals
(
item
.
getOrderId
(),
order
.
getId
())
&&
org
.
apache
.
commons
.
lang3
.
StringUtils
.
equals
(
item
.
getPayBillno
(),
payInfo
.
getPayBillno
())).
findFirst
().
orElseGet
(
()
->
{
OrderAirportChangePayInfo
entity
=
new
OrderAirportChangePayInfo
()
.
setOrderId
(
order
.
getId
())
.
setChangeOrderNo
(
order
.
getChangeOrderNo
());
entity
.
setTenantId
(
order
.
getTenantId
());
return
entity
;
});
BeanUtil
.
copyProperties
(
payInfo
,
orderPayInfo
,
"id"
,
"orderId"
,
"changeOrderNo"
);
if
(
Objects
.
isNull
(
orderPayInfo
.
getId
()))
{
payInfoMapper
.
insert
(
orderPayInfo
);
}
else
{
payInfoMapper
.
updateById
(
orderPayInfo
);
}
}
}
//更新航段信息
List
<
ChengeRangeInfoBean
>
rangeInfoList
=
orderModel
.
getOrderRangeList
();
if
(
CollectionUtils
.
isNotEmpty
(
rangeInfoList
))
{
for
(
ChengeRangeInfoBean
rangeInfo
:
rangeInfoList
)
{
OrderAirportChangeRangeInfo
orderRangeInfo
=
orderRangeList
.
stream
().
filter
(
item
->
Objects
.
equals
(
item
.
getOrderId
(),
order
.
getId
())).
findFirst
().
orElseGet
(
()
->
{
OrderAirportChangeRangeInfo
entity
=
new
OrderAirportChangeRangeInfo
()
.
setOrderId
(
order
.
getId
())
.
setChangeOrderNo
(
order
.
getChangeOrderNo
());
entity
.
setTenantId
(
order
.
getTenantId
());
return
entity
;
});
BeanUtil
.
copyProperties
(
rangeInfo
,
orderRangeInfo
,
"id"
,
"orderId"
,
"changeOrderNo"
);
if
(
Objects
.
isNull
(
orderRangeInfo
.
getId
()))
{
rangeInfoMapper
.
insert
(
orderRangeInfo
);
}
else
{
rangeInfoMapper
.
updateById
(
orderRangeInfo
);
}
}
}
});
});
}
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainChangeBusinessInfoServiceImpl.java
deleted
100644 → 0
浏览文件 @
1ed66f26
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.server.domain.bo.OrderTrainChangeBusinessInfoBo
;
import
org.dromara.server.domain.vo.OrderTrainChangeBusinessInfoVo
;
import
org.dromara.server.domain.OrderTrainChangeBusinessInfo
;
import
org.dromara.server.mapper.OrderTrainChangeBusinessInfoMapper
;
import
org.dromara.server.service.IOrderTrainChangeBusinessInfoService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 火车票改签差旅信息Service业务层处理
*
* @author hzh
* @date 2025-04-16
*/
@RequiredArgsConstructor
@Service
public
class
OrderTrainChangeBusinessInfoServiceImpl
extends
AbstractBaseService
<
OrderTrainChangeBusinessInfoVo
,
OrderTrainChangeBusinessInfoBo
,
OrderTrainChangeBusinessInfo
>
implements
IOrderTrainChangeBusinessInfoService
{
private
final
OrderTrainChangeBusinessInfoMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderTrainChangeBusinessInfo
,
OrderTrainChangeBusinessInfoVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderTrainChangeBusinessInfo
>
buildQueryWrapper
(
OrderTrainChangeBusinessInfoBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderTrainChangeBusinessInfo
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
getOrderId
()
!=
null
,
OrderTrainChangeBusinessInfo:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeNo
()),
OrderTrainChangeBusinessInfo:
:
getChangeNo
,
bo
.
getChangeNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getCorpCode
()),
OrderTrainChangeBusinessInfo:
:
getCorpCode
,
bo
.
getCorpCode
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getAppUserName
()),
OrderTrainChangeBusinessInfo:
:
getAppUserName
,
bo
.
getAppUserName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getBookerNo
()),
OrderTrainChangeBusinessInfo:
:
getBookerNo
,
bo
.
getBookerNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLowFlightInfo
()),
OrderTrainChangeBusinessInfo:
:
getLowFlightInfo
,
bo
.
getLowFlightInfo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getCostCenterNo
()),
OrderTrainChangeBusinessInfo:
:
getCostCenterNo
,
bo
.
getCostCenterNo
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getProjectName
()),
OrderTrainChangeBusinessInfo:
:
getProjectName
,
bo
.
getProjectName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getReasonCode
()),
OrderTrainChangeBusinessInfo:
:
getReasonCode
,
bo
.
getReasonCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getAppUserNo
()),
OrderTrainChangeBusinessInfo:
:
getAppUserNo
,
bo
.
getAppUserNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getAppStatus
()),
OrderTrainChangeBusinessInfo:
:
getAppStatus
,
bo
.
getAppStatus
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getAppDatetime
()),
OrderTrainChangeBusinessInfo:
:
getAppDatetime
,
bo
.
getAppDatetime
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getCostCenterName
()),
OrderTrainChangeBusinessInfo:
:
getCostCenterName
,
bo
.
getCostCenterName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLinkMobile
()),
OrderTrainChangeBusinessInfo:
:
getLinkMobile
,
bo
.
getLinkMobile
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLinkMan
()),
OrderTrainChangeBusinessInfo:
:
getLinkMan
,
bo
.
getLinkMan
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getAppRuleName
()),
OrderTrainChangeBusinessInfo:
:
getAppRuleName
,
bo
.
getAppRuleName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getIsViolate
()),
OrderTrainChangeBusinessInfo:
:
getIsViolate
,
bo
.
getIsViolate
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getCorpName
()),
OrderTrainChangeBusinessInfo:
:
getCorpName
,
bo
.
getCorpName
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getBookerName
()),
OrderTrainChangeBusinessInfo:
:
getBookerName
,
bo
.
getBookerName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getTravelRemark
()),
OrderTrainChangeBusinessInfo:
:
getTravelRemark
,
bo
.
getTravelRemark
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLinkEmail
()),
OrderTrainChangeBusinessInfo:
:
getLinkEmail
,
bo
.
getLinkEmail
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getViolateitem
()),
OrderTrainChangeBusinessInfo:
:
getViolateitem
,
bo
.
getViolateitem
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getProjectNo
()),
OrderTrainChangeBusinessInfo:
:
getProjectNo
,
bo
.
getProjectNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getReasonDesc
()),
OrderTrainChangeBusinessInfo:
:
getReasonDesc
,
bo
.
getReasonDesc
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getViolateitemCode
()),
OrderTrainChangeBusinessInfo:
:
getViolateitemCode
,
bo
.
getViolateitemCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getCcsqdNo
()),
OrderTrainChangeBusinessInfo:
:
getCcsqdNo
,
bo
.
getCcsqdNo
());
return
lqw
;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainChangePayInfoServiceImpl.java
deleted
100644 → 0
浏览文件 @
1ed66f26
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.server.domain.bo.OrderTrainChangePayInfoBo
;
import
org.dromara.server.domain.vo.OrderTrainChangePayInfoVo
;
import
org.dromara.server.domain.OrderTrainChangePayInfo
;
import
org.dromara.server.mapper.OrderTrainChangePayInfoMapper
;
import
org.dromara.server.service.IOrderTrainChangePayInfoService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 火车票改签支付信息Service业务层处理
*
* @author hzh
* @date 2025-04-16
*/
@RequiredArgsConstructor
@Service
public
class
OrderTrainChangePayInfoServiceImpl
extends
AbstractBaseService
<
OrderTrainChangePayInfoVo
,
OrderTrainChangePayInfoBo
,
OrderTrainChangePayInfo
>
implements
IOrderTrainChangePayInfoService
{
private
final
OrderTrainChangePayInfoMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderTrainChangePayInfo
,
OrderTrainChangePayInfoVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderTrainChangePayInfo
>
buildQueryWrapper
(
OrderTrainChangePayInfoBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderTrainChangePayInfo
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
getOrderId
()
!=
null
,
OrderTrainChangePayInfo:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeNo
()),
OrderTrainChangePayInfo:
:
getChangeNo
,
bo
.
getChangeNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPaySubject
()),
OrderTrainChangePayInfo:
:
getPaySubject
,
bo
.
getPaySubject
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getPaySubjectName
()),
OrderTrainChangePayInfo:
:
getPaySubjectName
,
bo
.
getPaySubjectName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayMothed
()),
OrderTrainChangePayInfo:
:
getPayMothed
,
bo
.
getPayMothed
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getPayMothedName
()),
OrderTrainChangePayInfo:
:
getPayMothedName
,
bo
.
getPayMothedName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayBankCard
()),
OrderTrainChangePayInfo:
:
getPayBankCard
,
bo
.
getPayBankCard
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayDatetime
()),
OrderTrainChangePayInfo:
:
getPayDatetime
,
bo
.
getPayDatetime
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayBillno
()),
OrderTrainChangePayInfo:
:
getPayBillno
,
bo
.
getPayBillno
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayUser
()),
OrderTrainChangePayInfo:
:
getPayUser
,
bo
.
getPayUser
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPayRemark
()),
OrderTrainChangePayInfo:
:
getPayRemark
,
bo
.
getPayRemark
());
lqw
.
eq
(
bo
.
getPayAmount
()
!=
null
,
OrderTrainChangePayInfo:
:
getPayAmount
,
bo
.
getPayAmount
());
return
lqw
;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainChangeTicketInfoServiceImpl.java
deleted
100644 → 0
浏览文件 @
1ed66f26
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.server.domain.bo.OrderTrainChangeTicketInfoBo
;
import
org.dromara.server.domain.vo.OrderTrainChangeTicketInfoVo
;
import
org.dromara.server.domain.OrderTrainChangeTicketInfo
;
import
org.dromara.server.mapper.OrderTrainChangeTicketInfoMapper
;
import
org.dromara.server.service.IOrderTrainChangeTicketInfoService
;
import
org.dromara.common.mybatis.service.AbstractBaseService
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Collection
;
/**
* 火车票改签乘机人信息Service业务层处理
*
* @author hzh
* @date 2025-04-16
*/
@RequiredArgsConstructor
@Service
public
class
OrderTrainChangeTicketInfoServiceImpl
extends
AbstractBaseService
<
OrderTrainChangeTicketInfoVo
,
OrderTrainChangeTicketInfoBo
,
OrderTrainChangeTicketInfo
>
implements
IOrderTrainChangeTicketInfoService
{
private
final
OrderTrainChangeTicketInfoMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderTrainChangeTicketInfo
,
OrderTrainChangeTicketInfoVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderTrainChangeTicketInfo
>
buildQueryWrapper
(
OrderTrainChangeTicketInfoBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderTrainChangeTicketInfo
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
bo
.
getOrderId
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getOrderId
,
bo
.
getOrderId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getChangeNo
()),
OrderTrainChangeTicketInfo:
:
getChangeNo
,
bo
.
getChangeNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNewTicketCode
()),
OrderTrainChangeTicketInfo:
:
getNewTicketCode
,
bo
.
getNewTicketCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNation
()),
OrderTrainChangeTicketInfo:
:
getNation
,
bo
.
getNation
());
lqw
.
eq
(
bo
.
getChangeFee
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getChangeFee
,
bo
.
getChangeFee
());
lqw
.
eq
(
bo
.
getChangeCount
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getChangeCount
,
bo
.
getChangeCount
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOldSeatCode
()),
OrderTrainChangeTicketInfo:
:
getOldSeatCode
,
bo
.
getOldSeatCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getEmpDeptid
()),
OrderTrainChangeTicketInfo:
:
getEmpDeptid
,
bo
.
getEmpDeptid
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getSid
()),
OrderTrainChangeTicketInfo:
:
getSid
,
bo
.
getSid
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getEmpNo
()),
OrderTrainChangeTicketInfo:
:
getEmpNo
,
bo
.
getEmpNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getNewSeatCode
()),
OrderTrainChangeTicketInfo:
:
getNewSeatCode
,
bo
.
getNewSeatCode
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getIdType
()),
OrderTrainChangeTicketInfo:
:
getIdType
,
bo
.
getIdType
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getEmpDeptName
()),
OrderTrainChangeTicketInfo:
:
getEmpDeptName
,
bo
.
getEmpDeptName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getExpiryDate
()),
OrderTrainChangeTicketInfo:
:
getExpiryDate
,
bo
.
getExpiryDate
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getBorn
()),
OrderTrainChangeTicketInfo:
:
getBorn
,
bo
.
getBorn
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getSex
()),
OrderTrainChangeTicketInfo:
:
getSex
,
bo
.
getSex
());
lqw
.
eq
(
bo
.
getOldTicketPrice
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getOldTicketPrice
,
bo
.
getOldTicketPrice
());
lqw
.
like
(
StringUtils
.
isNotBlank
(
bo
.
getPassengerName
()),
OrderTrainChangeTicketInfo:
:
getPassengerName
,
bo
.
getPassengerName
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getIdCode
()),
OrderTrainChangeTicketInfo:
:
getIdCode
,
bo
.
getIdCode
());
lqw
.
eq
(
bo
.
getBuyServiceCharge
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getBuyServiceCharge
,
bo
.
getBuyServiceCharge
());
lqw
.
eq
(
bo
.
getSpreadPrice
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getSpreadPrice
,
bo
.
getSpreadPrice
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getTrTicketId
()),
OrderTrainChangeTicketInfo:
:
getTrTicketId
,
bo
.
getTrTicketId
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getPhoneNumber
()),
OrderTrainChangeTicketInfo:
:
getPhoneNumber
,
bo
.
getPhoneNumber
());
lqw
.
eq
(
bo
.
getNewTicketPrice
()
!=
null
,
OrderTrainChangeTicketInfo:
:
getNewTicketPrice
,
bo
.
getNewTicketPrice
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getTrOrderNo
()),
OrderTrainChangeTicketInfo:
:
getTrOrderNo
,
bo
.
getTrOrderNo
());
return
lqw
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论