Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
travel-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cloud
travel-cloud
Commits
de19b311
提交
de19b311
authored
6月 27, 2025
作者:
hzh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
代码优化
上级
75b5ec65
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
487 行增加
和
5 行删除
+487
-5
OrderLogController.java
...ava/org/dromara/server/controller/OrderLogController.java
+38
-0
AirportController.java
.../dromara/server/controller/airport/AirportController.java
+11
-0
HotelController.java
.../org/dromara/server/controller/hotel/HotelController.java
+12
-0
TrainController.java
.../org/dromara/server/controller/train/TrainController.java
+11
-0
VehiclesController.java
...dromara/server/controller/vehicle/VehiclesController.java
+20
-0
OrderLog.java
...ver/src/main/java/org/dromara/server/domain/OrderLog.java
+64
-0
OrderLogBo.java
...rc/main/java/org/dromara/server/domain/bo/OrderLogBo.java
+79
-0
OrderLogVo.java
...rc/main/java/org/dromara/server/domain/vo/OrderLogVo.java
+75
-0
RemoteYsOrderServiceImpl.java
...va/org/dromara/server/dubbo/RemoteYsOrderServiceImpl.java
+46
-5
OrderLogMapper.java
...c/main/java/org/dromara/server/mapper/OrderLogMapper.java
+15
-0
IOrderLogService.java
...ain/java/org/dromara/server/service/IOrderLogService.java
+21
-0
OrderLogServiceImpl.java
.../org/dromara/server/service/impl/OrderLogServiceImpl.java
+53
-0
OrderLogUtil.java
...r/src/main/java/org/dromara/server/util/OrderLogUtil.java
+35
-0
OrderLogMapper.xml
...erver/src/main/resources/mapper/server/OrderLogMapper.xml
+7
-0
没有找到文件。
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/OrderLogController.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
controller
;
import
lombok.RequiredArgsConstructor
;
import
org.dromara.common.mybatis.core.page.PageQuery
;
import
org.dromara.common.mybatis.core.page.TableDataInfo
;
import
org.dromara.common.web.core.BaseController
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.vo.OrderLogVo
;
import
org.dromara.server.service.IOrderLogService
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* 订单第三方接口调用日志
* 前端访问路由地址为:/server/orderLog
*
* @author hzh
* @date 2025-06-27
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping
(
"/orderLog"
)
public
class
OrderLogController
extends
BaseController
{
private
final
IOrderLogService
orderLogService
;
/**
* 查询订单第三方接口调用日志列表
*/
@GetMapping
(
"/list"
)
public
TableDataInfo
<
OrderLogVo
>
list
(
OrderLogBo
bo
,
PageQuery
pageQuery
)
{
return
orderLogService
.
queryPageList
(
bo
,
pageQuery
);
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java
浏览文件 @
de19b311
...
@@ -49,15 +49,18 @@ import org.dromara.common.ys.model.res.comomResource.AirportModel;
...
@@ -49,15 +49,18 @@ import org.dromara.common.ys.model.res.comomResource.AirportModel;
import
org.dromara.common.ys.service.IAirportService
;
import
org.dromara.common.ys.service.IAirportService
;
import
org.dromara.common.ys.service.ICommonResourceService
;
import
org.dromara.common.ys.service.ICommonResourceService
;
import
org.dromara.common.ys.service.IInsuranceService
;
import
org.dromara.common.ys.service.IInsuranceService
;
import
org.dromara.order.api.enums.OrderType
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.domain.bo.OrderAirportBo
;
import
org.dromara.server.domain.bo.OrderAirportBo
;
import
org.dromara.server.domain.bo.OrderAirportRefundBo
;
import
org.dromara.server.domain.bo.OrderAirportRefundBo
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.vo.OrderAirportRefundVo
;
import
org.dromara.server.domain.vo.OrderAirportRefundVo
;
import
org.dromara.server.domain.vo.OrderAirportVo
;
import
org.dromara.server.domain.vo.OrderAirportVo
;
import
org.dromara.server.dubbo.RemoteYsOrderServiceImpl
;
import
org.dromara.server.dubbo.RemoteYsOrderServiceImpl
;
import
org.dromara.server.service.IOrderAirportChangeService
;
import
org.dromara.server.service.IOrderAirportChangeService
;
import
org.dromara.server.service.IOrderAirportRefundService
;
import
org.dromara.server.service.IOrderAirportRefundService
;
import
org.dromara.server.service.IOrderAirportService
;
import
org.dromara.server.service.IOrderAirportService
;
import
org.dromara.server.util.OrderLogUtil
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -187,6 +190,14 @@ public class AirportController extends BaseController {
...
@@ -187,6 +190,14 @@ public class AirportController extends BaseController {
List
<
org
.
dromara
.
common
.
ys
.
model
.
res
.
airport
.
BookOrderModel
>
orderList
=
airportService
.
bookOrder
(
getUserId
(),
model
);
List
<
org
.
dromara
.
common
.
ys
.
model
.
res
.
airport
.
BookOrderModel
>
orderList
=
airportService
.
bookOrder
(
getUserId
(),
model
);
//添加到订单表
//添加到订单表
orderAirportService
.
batchSaveOrder
(
getUserId
(),
travelNo
,
StreamUtils
.
toList
(
orderList
,
org
.
dromara
.
common
.
ys
.
model
.
res
.
airport
.
BookOrderModel
::
getOrderNo
));
orderAirportService
.
batchSaveOrder
(
getUserId
(),
travelNo
,
StreamUtils
.
toList
(
orderList
,
org
.
dromara
.
common
.
ys
.
model
.
res
.
airport
.
BookOrderModel
::
getOrderNo
));
//添加日志
OrderLogUtil
.
log
(
new
OrderLogBo
()
.
setOrderNo
(
orderList
.
get
(
0
).
getOrderNo
())
.
setOrderType
(
OrderType
.
AIRPORT
.
getType
())
.
setLogType
(
OrderLogUtil
.
LogType
.
CREATE
.
name
())
.
setReqParams
(
JSON
.
toJSONString
(
model
))
.
setSuccess
(
true
)
);
return
R
.
ok
(
orderList
);
return
R
.
ok
(
orderList
);
}
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
controller
.
hotel
;
package
org
.
dromara
.
server
.
controller
.
hotel
;
import
com.alibaba.fastjson.JSON
;
import
io.seata.spring.annotation.GlobalTransactional
;
import
io.seata.spring.annotation.GlobalTransactional
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.dromara.common.core.domain.R
;
import
org.dromara.common.core.domain.R
;
...
@@ -12,11 +13,14 @@ import org.dromara.common.ys.common.PageInfo;
...
@@ -12,11 +13,14 @@ import org.dromara.common.ys.common.PageInfo;
import
org.dromara.common.ys.constant.TripType
;
import
org.dromara.common.ys.constant.TripType
;
import
org.dromara.common.ys.model.res.hotel.*
;
import
org.dromara.common.ys.model.res.hotel.*
;
import
org.dromara.common.ys.service.IHotelService
;
import
org.dromara.common.ys.service.IHotelService
;
import
org.dromara.order.api.enums.OrderType
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.domain.bo.OrderHotelBo
;
import
org.dromara.server.domain.bo.OrderHotelBo
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.vo.OrderHotelVo
;
import
org.dromara.server.domain.vo.OrderHotelVo
;
import
org.dromara.server.dubbo.RemoteYsOrderServiceImpl
;
import
org.dromara.server.dubbo.RemoteYsOrderServiceImpl
;
import
org.dromara.server.service.IOrderHotelService
;
import
org.dromara.server.service.IOrderHotelService
;
import
org.dromara.server.util.OrderLogUtil
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -75,6 +79,14 @@ public class HotelController extends BaseController {
...
@@ -75,6 +79,14 @@ public class HotelController extends BaseController {
model
.
setTripType
(
Integer
.
parseInt
(
LoginHelper
.
isVirtual
()
?
TripType
.
PRIVATE
.
getCode
()
:
TripType
.
PUBLIC
.
getCode
()));
model
.
setTripType
(
Integer
.
parseInt
(
LoginHelper
.
isVirtual
()
?
TripType
.
PRIVATE
.
getCode
()
:
TripType
.
PUBLIC
.
getCode
()));
HotelOrderBookModel
book
=
hotelService
.
orderBook
(
getUserId
(),
model
);
HotelOrderBookModel
book
=
hotelService
.
orderBook
(
getUserId
(),
model
);
orderHotelService
.
batchSaveOrder
(
getUserId
(),
subjectCode
,
List
.
of
(
book
.
getOrderId
()));
orderHotelService
.
batchSaveOrder
(
getUserId
(),
subjectCode
,
List
.
of
(
book
.
getOrderId
()));
//添加日志
OrderLogUtil
.
log
(
new
OrderLogBo
()
.
setOrderNo
(
book
.
getOrderId
())
.
setOrderType
(
OrderType
.
HOTEL
.
getType
())
.
setLogType
(
OrderLogUtil
.
LogType
.
CREATE
.
name
())
.
setReqParams
(
JSON
.
toJSONString
(
model
))
.
setSuccess
(
true
)
);
return
R
.
ok
(
book
);
return
R
.
ok
(
book
);
}
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java
浏览文件 @
de19b311
...
@@ -29,7 +29,9 @@ import org.dromara.common.ys.model.res.train.TrainStopModel;
...
@@ -29,7 +29,9 @@ import org.dromara.common.ys.model.res.train.TrainStopModel;
import
org.dromara.common.ys.model.res.train.*
;
import
org.dromara.common.ys.model.res.train.*
;
import
org.dromara.common.ys.service.ICommonResourceService
;
import
org.dromara.common.ys.service.ICommonResourceService
;
import
org.dromara.common.ys.service.ITrainService
;
import
org.dromara.common.ys.service.ITrainService
;
import
org.dromara.order.api.enums.OrderType
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.bo.OrderTrainBo
;
import
org.dromara.server.domain.bo.OrderTrainBo
;
import
org.dromara.server.domain.bo.OrderTrainRefundBo
;
import
org.dromara.server.domain.bo.OrderTrainRefundBo
;
import
org.dromara.server.domain.vo.OrderTrainRefundVo
;
import
org.dromara.server.domain.vo.OrderTrainRefundVo
;
...
@@ -38,6 +40,7 @@ import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
...
@@ -38,6 +40,7 @@ import org.dromara.server.dubbo.RemoteYsOrderServiceImpl;
import
org.dromara.server.service.IOrderTrainChangeService
;
import
org.dromara.server.service.IOrderTrainChangeService
;
import
org.dromara.server.service.IOrderTrainRefundService
;
import
org.dromara.server.service.IOrderTrainRefundService
;
import
org.dromara.server.service.IOrderTrainService
;
import
org.dromara.server.service.IOrderTrainService
;
import
org.dromara.server.util.OrderLogUtil
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -221,6 +224,14 @@ public class TrainController extends BaseController {
...
@@ -221,6 +224,14 @@ public class TrainController extends BaseController {
model
.
setTripType
(
Integer
.
parseInt
(
LoginHelper
.
isVirtual
()
?
TripType
.
PRIVATE
.
getCode
()
:
TripType
.
PUBLIC
.
getCode
()));
model
.
setTripType
(
Integer
.
parseInt
(
LoginHelper
.
isVirtual
()
?
TripType
.
PRIVATE
.
getCode
()
:
TripType
.
PUBLIC
.
getCode
()));
OrderBookResModel
res
=
trainService
.
bookOrder
(
getUserId
(),
model
);
OrderBookResModel
res
=
trainService
.
bookOrder
(
getUserId
(),
model
);
orderTrainService
.
batchSaveOrder
(
getUserId
(),
subjectCode
,
List
.
of
(
res
.
getOrderId
()));
orderTrainService
.
batchSaveOrder
(
getUserId
(),
subjectCode
,
List
.
of
(
res
.
getOrderId
()));
//添加日志
OrderLogUtil
.
log
(
new
OrderLogBo
()
.
setOrderNo
(
res
.
getOrderId
())
.
setOrderType
(
OrderType
.
TRAIN
.
getType
())
.
setLogType
(
OrderLogUtil
.
LogType
.
CREATE
.
name
())
.
setReqParams
(
JSON
.
toJSONString
(
model
))
.
setSuccess
(
true
)
);
return
R
.
ok
(
res
);
return
R
.
ok
(
res
);
}
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
controller
.
vehicle
;
package
org
.
dromara
.
server
.
controller
.
vehicle
;
import
com.alibaba.fastjson.JSON
;
import
io.seata.spring.annotation.GlobalTransactional
;
import
io.seata.spring.annotation.GlobalTransactional
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.dromara.common.core.domain.R
;
import
org.dromara.common.core.domain.R
;
...
@@ -16,11 +17,14 @@ import org.dromara.common.ys.model.req.vehicles.EstimateYyycPriceModel;
...
@@ -16,11 +17,14 @@ import org.dromara.common.ys.model.req.vehicles.EstimateYyycPriceModel;
import
org.dromara.common.ys.model.req.vehicles.OrderDetailModel
;
import
org.dromara.common.ys.model.req.vehicles.OrderDetailModel
;
import
org.dromara.common.ys.model.res.vehicles.*
;
import
org.dromara.common.ys.model.res.vehicles.*
;
import
org.dromara.common.ys.service.IVehiclesService
;
import
org.dromara.common.ys.service.IVehiclesService
;
import
org.dromara.order.api.enums.OrderType
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.base.BaseController
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.bo.OrderVehiclesBo
;
import
org.dromara.server.domain.bo.OrderVehiclesBo
;
import
org.dromara.server.domain.vo.OrderVehiclesVo
;
import
org.dromara.server.domain.vo.OrderVehiclesVo
;
import
org.dromara.server.dubbo.RemoteYsOrderServiceImpl
;
import
org.dromara.server.dubbo.RemoteYsOrderServiceImpl
;
import
org.dromara.server.service.IOrderVehiclesService
;
import
org.dromara.server.service.IOrderVehiclesService
;
import
org.dromara.server.util.OrderLogUtil
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.util.List
;
...
@@ -89,6 +93,14 @@ public class VehiclesController extends BaseController {
...
@@ -89,6 +93,14 @@ public class VehiclesController extends BaseController {
model
.
setSubjectCode
(
null
);
model
.
setSubjectCode
(
null
);
OrderBookJsycModel
order
=
vehiclesService
.
bookJsyc
(
getUserId
(),
model
);
OrderBookJsycModel
order
=
vehiclesService
.
bookJsyc
(
getUserId
(),
model
);
orderVehiclesService
.
saveOrder
(
getUserId
(),
subjectCode
,
order
.
getOrderId
(),
order
.
getOrderNo
());
orderVehiclesService
.
saveOrder
(
getUserId
(),
subjectCode
,
order
.
getOrderId
(),
order
.
getOrderNo
());
//添加日志
OrderLogUtil
.
log
(
new
OrderLogBo
()
.
setOrderNo
(
order
.
getOrderNo
())
.
setOrderType
(
OrderType
.
CAR
.
getType
())
.
setLogType
(
OrderLogUtil
.
LogType
.
CREATE
.
name
())
.
setReqParams
(
JSON
.
toJSONString
(
model
))
.
setSuccess
(
true
)
);
return
R
.
ok
(
order
);
return
R
.
ok
(
order
);
}
}
...
@@ -103,6 +115,14 @@ public class VehiclesController extends BaseController {
...
@@ -103,6 +115,14 @@ public class VehiclesController extends BaseController {
model
.
setSubjectCode
(
null
);
model
.
setSubjectCode
(
null
);
OrderBookYyycModel
order
=
vehiclesService
.
bookYyyc
(
getUserId
(),
model
);
OrderBookYyycModel
order
=
vehiclesService
.
bookYyyc
(
getUserId
(),
model
);
orderVehiclesService
.
saveOrder
(
getUserId
(),
subjectCode
,
order
.
getOrderId
(),
order
.
getOrderNo
());
orderVehiclesService
.
saveOrder
(
getUserId
(),
subjectCode
,
order
.
getOrderId
(),
order
.
getOrderNo
());
//添加日志
OrderLogUtil
.
log
(
new
OrderLogBo
()
.
setOrderNo
(
order
.
getOrderNo
())
.
setOrderType
(
OrderType
.
CAR
.
getType
())
.
setLogType
(
OrderLogUtil
.
LogType
.
CREATE
.
name
())
.
setReqParams
(
JSON
.
toJSONString
(
model
))
.
setSuccess
(
true
)
);
return
R
.
ok
(
order
);
return
R
.
ok
(
order
);
}
}
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/OrderLog.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
domain
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
import
java.io.Serial
;
import
java.util.Date
;
/**
* 订单第三方接口调用日志对象 biz_order_log
*
* @author hzh
* @date 2025-06-27
*/
@Data
@TableName
(
"biz_order_log"
)
public
class
OrderLog
{
@Serial
private
static
final
long
serialVersionUID
=
1L
;
/**
* id
*/
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Long
id
;
/**
* 订单类型
*/
private
String
orderType
;
/**
* 订单编号
*/
private
String
orderNo
;
/**
* 请求参数
*/
private
String
reqParams
;
/**
* 接口类型
*/
private
String
logType
;
/**
* 是否成功
*/
private
Boolean
success
;
/**
* 错误信息
*/
private
String
errorMsg
;
/**
* 创建时间
*/
private
Date
createTime
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/OrderLogBo.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
domain
.
bo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
jakarta.validation.constraints.NotBlank
;
import
jakarta.validation.constraints.NotNull
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
org.dromara.common.core.validate.AddGroup
;
import
org.dromara.common.core.validate.EditGroup
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* 订单第三方接口调用日志业务对象 biz_order_log
*
* @author hzh
* @date 2025-06-27
*/
@Data
@Accessors
(
chain
=
true
)
public
class
OrderLogBo
{
/**
* id
*/
@NotNull
(
message
=
"id不能为空"
,
groups
=
{
EditGroup
.
class
})
private
Long
id
;
/**
* 订单类型
*/
@NotBlank
(
message
=
"订单类型不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
String
orderType
;
/**
* 订单编号
*/
@NotBlank
(
message
=
"订单编号不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
String
orderNo
;
/**
* 请求参数
*/
@NotBlank
(
message
=
"请求参数不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
String
reqParams
;
/**
* 接口类型
*/
@NotBlank
(
message
=
"接口类型不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
String
logType
;
/**
* 是否成功
*/
@NotNull
(
message
=
"是否成功不能为空"
,
groups
=
{
AddGroup
.
class
,
EditGroup
.
class
})
private
Boolean
success
;
/**
* 错误信息
*/
private
String
errorMsg
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 请求参数
*/
@JsonInclude
(
JsonInclude
.
Include
.
NON_EMPTY
)
@TableField
(
exist
=
false
)
private
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/OrderLogVo.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
domain
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnoreUnannotated
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
io.github.linpeilie.annotations.AutoMapper
;
import
lombok.Data
;
import
org.dromara.server.domain.OrderLog
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 订单第三方接口调用日志视图对象 biz_order_log
*
* @author hzh
* @date 2025-06-27
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper
(
target
=
OrderLog
.
class
)
public
class
OrderLogVo
implements
Serializable
{
@Serial
private
static
final
long
serialVersionUID
=
1L
;
/**
* id
*/
@ExcelProperty
(
value
=
"id"
)
private
Long
id
;
/**
* 订单类型
*/
@ExcelProperty
(
value
=
"订单类型"
)
private
String
orderType
;
/**
* 订单编号
*/
@ExcelProperty
(
value
=
"订单编号"
)
private
String
orderNo
;
/**
* 请求参数
*/
@ExcelProperty
(
value
=
"请求参数"
)
private
String
reqParams
;
/**
* 接口类型
*/
@ExcelProperty
(
value
=
"接口类型"
)
private
String
logType
;
/**
* 是否成功
*/
@ExcelProperty
(
value
=
"是否成功"
)
private
Boolean
success
;
/**
* 错误信息
*/
@ExcelProperty
(
value
=
"错误信息"
)
private
String
errorMsg
;
/**
* 创建时间
*/
private
Date
createTime
;
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteYsOrderServiceImpl.java
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
dubbo
;
package
org
.
dromara
.
server
.
dubbo
;
import
com.alibaba.fastjson.JSON
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.dubbo.config.annotation.DubboReference
;
import
org.apache.dubbo.config.annotation.DubboReference
;
...
@@ -22,6 +23,7 @@ import org.dromara.server.api.domain.RemoteOrderApprove;
...
@@ -22,6 +23,7 @@ import org.dromara.server.api.domain.RemoteOrderApprove;
import
org.dromara.server.domain.bo.*
;
import
org.dromara.server.domain.bo.*
;
import
org.dromara.server.domain.vo.*
;
import
org.dromara.server.domain.vo.*
;
import
org.dromara.server.service.*
;
import
org.dromara.server.service.*
;
import
org.dromara.server.util.OrderLogUtil
;
import
org.dromara.system.api.RemoteUserService
;
import
org.dromara.system.api.RemoteUserService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -193,50 +195,89 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
...
@@ -193,50 +195,89 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
}
}
private
void
pay
(
String
orderType
,
String
orderNo
)
{
private
void
pay
(
String
orderType
,
String
orderNo
)
{
OrderLogBo
orderLog
=
new
OrderLogBo
()
.
setSuccess
(
true
)
.
setOrderType
(
orderType
)
.
setOrderNo
(
orderNo
);
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
AIRPORT
.
getType
()))
{
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
AIRPORT
.
getType
()))
{
//飞机票
//飞机票
Optional
.
ofNullable
(
orderAirportService
.
getOne
(
new
OrderAirportBo
().
setOrderNo
(
orderNo
))).
ifPresent
(
vo
->
{
Optional
.
ofNullable
(
orderAirportService
.
getOne
(
new
OrderAirportBo
().
setOrderNo
(
orderNo
))).
ifPresent
(
vo
->
{
orderLog
.
setLogType
(
OrderLogUtil
.
LogType
.
PAY
.
name
());
try
{
try
{
//飞机票支付
//飞机票支付
airportService
.
payOrder
(
vo
.
getPersonCode
(),
new
OrderPayModel
().
setOrderNo
(
orderNo
));
OrderPayModel
model
=
new
OrderPayModel
().
setOrderNo
(
orderNo
);
airportService
.
payOrder
(
vo
.
getPersonCode
(),
model
);
orderLog
.
setReqParams
(
JSON
.
toJSONString
(
model
));
OrderLogUtil
.
log
(
orderLog
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"飞机票支付失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
log
.
error
(
"飞机票支付失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
orderLog
.
setSuccess
(
false
);
orderLog
.
setErrorMsg
(
e
.
getMessage
());
OrderLogUtil
.
log
(
orderLog
);
}
}
orderLog
.
setLogType
(
OrderLogUtil
.
LogType
.
CONFIRM
.
name
());
try
{
try
{
//确认出票
//确认出票
airportService
.
confirmOrder
(
vo
.
getPersonCode
(),
new
OrderConfirmModel
().
setOrderNo
(
orderNo
).
setAutoDraw
(
1
));
OrderConfirmModel
model
=
new
OrderConfirmModel
().
setOrderNo
(
orderNo
).
setAutoDraw
(
1
);
airportService
.
confirmOrder
(
vo
.
getPersonCode
(),
model
);
orderLog
.
setReqParams
(
JSON
.
toJSONString
(
model
));
OrderLogUtil
.
log
(
orderLog
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"飞机票确认出票失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
log
.
error
(
"飞机票确认出票失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
orderLog
.
setSuccess
(
false
);
orderLog
.
setErrorMsg
(
e
.
getMessage
());
OrderLogUtil
.
log
(
orderLog
);
}
}
orderAirportService
.
updateOrderInfo
(
List
.
of
(
orderNo
));
orderAirportService
.
updateOrderInfo
(
List
.
of
(
orderNo
));
});
});
}
else
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
TRAIN
.
getType
()))
{
}
else
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
TRAIN
.
getType
()))
{
//火车票
//火车票
Optional
.
ofNullable
(
orderTrainService
.
getOne
(
new
OrderTrainBo
().
setOrderNo
(
orderNo
))).
ifPresent
(
vo
->
{
Optional
.
ofNullable
(
orderTrainService
.
getOne
(
new
OrderTrainBo
().
setOrderNo
(
orderNo
))).
ifPresent
(
vo
->
{
orderLog
.
setLogType
(
OrderLogUtil
.
LogType
.
PAY
.
name
());
try
{
try
{
//火车票支付
//火车票支付
trainService
.
payOrder
(
vo
.
getPersonCode
(),
new
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
PayOrderModel
().
setOrderNo
(
orderNo
));
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
PayOrderModel
model
=
new
org
.
dromara
.
common
.
ys
.
model
.
req
.
train
.
PayOrderModel
().
setOrderNo
(
orderNo
);
trainService
.
payOrder
(
vo
.
getPersonCode
(),
model
);
orderLog
.
setReqParams
(
JSON
.
toJSONString
(
model
));
OrderLogUtil
.
log
(
orderLog
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"火车票支付失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
log
.
error
(
"火车票支付失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
orderLog
.
setSuccess
(
false
);
orderLog
.
setErrorMsg
(
e
.
getMessage
());
OrderLogUtil
.
log
(
orderLog
);
}
}
orderLog
.
setLogType
(
OrderLogUtil
.
LogType
.
CONFIRM
.
name
());
try
{
try
{
//确认出票
//确认出票
trainService
.
confirmOrder
(
vo
.
getPersonCode
(),
new
ConfirmOrderModel
().
setOrderNo
(
orderNo
));
ConfirmOrderModel
model
=
new
ConfirmOrderModel
().
setOrderNo
(
orderNo
);
trainService
.
confirmOrder
(
vo
.
getPersonCode
(),
model
);
orderLog
.
setReqParams
(
JSON
.
toJSONString
(
model
));
OrderLogUtil
.
log
(
orderLog
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"火车票确认出票失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
log
.
error
(
"火车票确认出票失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
orderLog
.
setSuccess
(
false
);
orderLog
.
setErrorMsg
(
e
.
getMessage
());
OrderLogUtil
.
log
(
orderLog
);
}
}
orderTrainService
.
updateOrderInfo
(
List
.
of
(
orderNo
));
orderTrainService
.
updateOrderInfo
(
List
.
of
(
orderNo
));
});
});
}
else
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
CAR
.
getType
()))
{
}
else
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
CAR
.
getType
()))
{
}
else
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
HOTEL
.
getType
()))
{
}
else
if
(
StringUtils
.
equals
(
orderType
,
OrderType
.
HOTEL
.
getType
()))
{
orderLog
.
setLogType
(
OrderLogUtil
.
LogType
.
CONFIRM
.
name
());
//酒店
//酒店
Optional
.
ofNullable
(
orderHotelService
.
getOne
(
new
OrderHotelBo
().
setOrderNo
(
orderNo
))).
ifPresent
(
vo
->
{
Optional
.
ofNullable
(
orderHotelService
.
getOne
(
new
OrderHotelBo
().
setOrderNo
(
orderNo
))).
ifPresent
(
vo
->
{
try
{
try
{
//确认出票
//确认出票
hotelService
.
orderPay
(
vo
.
getPersonCode
(),
new
PayOrderModel
().
setOrderNo
(
orderNo
));
PayOrderModel
model
=
new
PayOrderModel
().
setOrderNo
(
orderNo
);
hotelService
.
orderPay
(
vo
.
getPersonCode
(),
model
);
orderLog
.
setReqParams
(
JSON
.
toJSONString
(
model
));
OrderLogUtil
.
log
(
orderLog
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"酒店确认出票失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
log
.
error
(
"酒店确认出票失败,orderNo:{},失败原因:{}"
,
orderNo
,
e
.
getMessage
());
orderLog
.
setSuccess
(
false
);
orderLog
.
setErrorMsg
(
e
.
getMessage
());
OrderLogUtil
.
log
(
orderLog
);
}
}
orderHotelService
.
updateOrderInfo
(
List
.
of
(
orderNo
));
orderHotelService
.
updateOrderInfo
(
List
.
of
(
orderNo
));
});
});
...
...
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/mapper/OrderLogMapper.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
mapper
;
import
org.dromara.server.domain.OrderLog
;
import
org.dromara.server.domain.vo.OrderLogVo
;
import
org.dromara.common.mybatis.core.mapper.BaseMapperPlus
;
/**
* 订单第三方接口调用日志Mapper接口
*
* @author hzh
* @date 2025-06-27
*/
public
interface
OrderLogMapper
extends
BaseMapperPlus
<
OrderLog
,
OrderLogVo
>
{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderLogService.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
service
;
import
org.dromara.server.domain.OrderLog
;
import
org.dromara.server.domain.vo.OrderLogVo
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.OrderLog
;
import
org.dromara.common.mybatis.service.IBaseService
;
import
java.util.Collection
;
import
java.util.List
;
/**
* 订单第三方接口调用日志Service接口
*
* @author hzh
* @date 2025-06-27
*/
public
interface
IOrderLogService
extends
IBaseService
<
OrderLogVo
,
OrderLogBo
,
OrderLog
>{
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderLogServiceImpl.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
lombok.RequiredArgsConstructor
;
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.OrderLog
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.domain.vo.OrderLogVo
;
import
org.dromara.server.mapper.OrderLogMapper
;
import
org.dromara.server.service.IOrderLogService
;
import
org.springframework.stereotype.Service
;
import
java.util.Map
;
/**
* 订单第三方接口调用日志Service业务层处理
*
* @author hzh
* @date 2025-06-27
*/
@RequiredArgsConstructor
@Service
public
class
OrderLogServiceImpl
extends
AbstractBaseService
<
OrderLogVo
,
OrderLogBo
,
OrderLog
>
implements
IOrderLogService
{
private
final
OrderLogMapper
baseMapper
;
@Override
public
BaseMapperPlus
<
OrderLog
,
OrderLogVo
>
mapper
()
{
return
baseMapper
;
}
@Override
public
LambdaQueryWrapper
<
OrderLog
>
buildQueryWrapper
(
OrderLogBo
bo
)
{
Map
<
String
,
Object
>
params
=
bo
.
getParams
();
LambdaQueryWrapper
<
OrderLog
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOrderType
()),
OrderLog:
:
getOrderType
,
bo
.
getOrderType
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getOrderNo
()),
OrderLog:
:
getOrderNo
,
bo
.
getOrderNo
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getReqParams
()),
OrderLog:
:
getReqParams
,
bo
.
getReqParams
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getLogType
()),
OrderLog:
:
getLogType
,
bo
.
getLogType
());
lqw
.
eq
(
bo
.
getSuccess
()
!=
null
,
OrderLog:
:
getSuccess
,
bo
.
getSuccess
());
lqw
.
eq
(
StringUtils
.
isNotBlank
(
bo
.
getErrorMsg
()),
OrderLog:
:
getErrorMsg
,
bo
.
getErrorMsg
());
Object
orderNoList
=
params
.
get
(
"orderNoList"
);
if
(
orderNoList
!=
null
)
{
lqw
.
in
(
OrderLog:
:
getOrderNo
,
JSON
.
parseArray
(
JSON
.
toJSONString
(
orderNoList
),
String
.
class
));
}
return
lqw
;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/util/OrderLogUtil.java
0 → 100644
浏览文件 @
de19b311
package
org
.
dromara
.
server
.
util
;
import
org.dromara.common.core.utils.SpringUtils
;
import
org.dromara.server.domain.bo.OrderLogBo
;
import
org.dromara.server.service.IOrderLogService
;
import
java.util.Date
;
/**
* @author hzh
* @date 2025-06-27
**/
public
class
OrderLogUtil
{
/**
* 添加日志
*
* @param log log
*/
public
static
void
log
(
OrderLogBo
log
)
{
IOrderLogService
service
=
SpringUtils
.
getBean
(
IOrderLogService
.
class
);
log
.
setCreateTime
(
new
Date
());
service
.
insertByBo
(
log
);
}
/**
* 日志类型
*/
public
enum
LogType
{
CREATE
,
PAY
,
CONFIRM
}
}
ruoyi-modules/ruoyi-server/src/main/resources/mapper/server/OrderLogMapper.xml
0 → 100644
浏览文件 @
de19b311
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"org.dromara.server.mapper.OrderLogMapper"
>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论