Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
92d83ed0
提交
92d83ed0
authored
6月 21, 2024
作者:
胡宁宁
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加结算单字段
上级
1a2012b1
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
11 行增加
和
3 行删除
+11
-3
SettlementPlatformServiceFee.java
...erformance/model/settle/SettlementPlatformServiceFee.java
+3
-2
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+7
-1
SettlementMqHandlerServiceImpl.java
...e/service/impl/settle/SettlementMqHandlerServiceImpl.java
+1
-0
没有找到文件。
performance-web/src/main/java/com/clx/performance/model/settle/SettlementPlatformServiceFee.java
浏览文件 @
92d83ed0
...
@@ -28,8 +28,9 @@ public class SettlementPlatformServiceFee implements HasKey<Integer> {
...
@@ -28,8 +28,9 @@ public class SettlementPlatformServiceFee implements HasKey<Integer> {
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
//id
private
Integer
id
;
//id
private
String
childNo
;
//运单编号
private
String
childNo
;
//运单编号
private
Long
driverUserNo
;
//车主用户编号
private
Long
driverUserNo
;
//司机用户编号
private
String
driverName
;
//车主名称
private
String
driverName
;
//司机名称
private
String
driverMobile
;
//司机手机号
private
Integer
sendAddressId
;
//发货地址id
private
Integer
sendAddressId
;
//发货地址id
private
String
sendAddress
;
//发货地址
private
String
sendAddress
;
//发货地址
private
Integer
receiveAddressId
;
//收货地址id
private
Integer
receiveAddressId
;
//收货地址id
...
...
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
92d83ed0
...
@@ -1996,7 +1996,13 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -1996,7 +1996,13 @@ public class OrderChildServiceImpl implements OrderChildService {
if
(
result
!=
null
&&
Objects
.
equals
(
result
.
getCode
(),
0
)
&&
result
.
getData
()
!=
null
)
{
if
(
result
!=
null
&&
Objects
.
equals
(
result
.
getCode
(),
0
)
&&
result
.
getData
()
!=
null
)
{
WalletResidueCardDTO
data
=
result
.
getData
();
WalletResidueCardDTO
data
=
result
.
getData
();
//钱包不能为负
//钱包不能为负
if
(
Objects
.
isNull
(
data
.
getResidue
())
||
data
.
getResidue
()
<
0L
)
{
if
(
Objects
.
isNull
(
data
.
getResidue
())){
String
remark
=
truckOwnerFlag
?
"钱包余额不足"
:
"车主钱包余额不足"
;
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
APP_POP_UP_ERROR
,
remark
);
}
//目前支付返回的是元 所以乘以100
data
.
setResidue
(
data
.
getResidue
()*
100
);
if
(
data
.
getResidue
()
<
0L
)
{
String
remark
=
truckOwnerFlag
?
"钱包余额不足"
:
"车主钱包余额不足"
;
String
remark
=
truckOwnerFlag
?
"钱包余额不足"
:
"车主钱包余额不足"
;
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
APP_POP_UP_ERROR
,
remark
);
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
APP_POP_UP_ERROR
,
remark
);
}
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
浏览文件 @
92d83ed0
...
@@ -206,6 +206,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
...
@@ -206,6 +206,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
settlementPlatformServiceFee
.
setChildNo
(
settlementDriverDetail
.
getChildNo
());
settlementPlatformServiceFee
.
setChildNo
(
settlementDriverDetail
.
getChildNo
());
settlementPlatformServiceFee
.
setDriverUserNo
(
settlementDriverDetail
.
getDriverUserNo
());
settlementPlatformServiceFee
.
setDriverUserNo
(
settlementDriverDetail
.
getDriverUserNo
());
settlementPlatformServiceFee
.
setDriverName
(
settlementDriverDetail
.
getDriverName
());
settlementPlatformServiceFee
.
setDriverName
(
settlementDriverDetail
.
getDriverName
());
settlementPlatformServiceFee
.
setDriverMobile
(
orderChild
.
getDriverMobile
());
settlementPlatformServiceFee
.
setSendAddressId
(
orderChild
.
getSendAddressId
());
settlementPlatformServiceFee
.
setSendAddressId
(
orderChild
.
getSendAddressId
());
settlementPlatformServiceFee
.
setSendAddress
(
orderChild
.
getSendAddress
());
settlementPlatformServiceFee
.
setSendAddress
(
orderChild
.
getSendAddress
());
settlementPlatformServiceFee
.
setReceiveAddressId
(
orderChild
.
getReceiveAddressId
());
settlementPlatformServiceFee
.
setReceiveAddressId
(
orderChild
.
getReceiveAddressId
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论