Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
cms-ci-test
Commits
a57022bc
提交
a57022bc
authored
8月 25, 2023
作者:
xiaowang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
钱包操作
上级
7185e568
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
18 行增加
和
2 行删除
+18
-2
PayWalletServiceImpl.java
...c/iuav/user/service/wallet/impl/PayWalletServiceImpl.java
+18
-2
没有找到文件。
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java
浏览文件 @
a57022bc
...
@@ -242,12 +242,14 @@ public class PayWalletServiceImpl implements PayWalletService {
...
@@ -242,12 +242,14 @@ public class PayWalletServiceImpl implements PayWalletService {
assert
flyerWalletFlowVO
!=
null
;
assert
flyerWalletFlowVO
!=
null
;
int
flyerUpdateCount
=
addFlyerSalary
(
publisherWalletFlowVO
,
flyerWalletFlowVO
,
flyerWallet
);
int
flyerUpdateCount
=
addFlyerSalary
(
publisherWalletFlowVO
,
flyerWalletFlowVO
,
flyerWallet
);
if
(
flyerUpdateCount
>
0
)
{
if
(
flyerUpdateCount
>
0
)
{
// 记录流水记录
// 记录
订单结算
流水记录
PayLogDO
flyerPayLogDO
=
buildPayLogDO
(
null
,
flyerWalletFlowVO
);
PayLogDO
flyerPayLogDO
=
buildPayLogDO
(
null
,
flyerWalletFlowVO
);
flyerPayLogDO
.
setSalaryAmtPaid
(
publisherWalletFlowVO
.
getFlyerSalaryAmount
());
flyerPayLogDO
.
setSalaryAmtPaid
(
publisherWalletFlowVO
.
getFlyerSalaryAmount
());
flyerPayLogDO
.
setOperateUser
(
publisherWalletFlowVO
.
getUserAccountId
());
flyerPayLogDO
.
setOperateUser
(
publisherWalletFlowVO
.
getUserAccountId
());
// 插入接单者流水记录表
// 插入接单者流水记录表
payWalletDao
.
insertPayLogDO
(
flyerPayLogDO
);
payWalletDao
.
insertPayLogDO
(
flyerPayLogDO
);
// 记录订单保证金退回记录
sendBackPledge
(
flyerWalletFlowVO
);
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
else
{
}
else
{
log
.
error
(
"正常结算时,接单方用户钱包更新失败,接单者id是:{},发布者传参是:{}"
,
flyerWalletFlowVO
.
getUserAccountId
(),
publisherWalletFlowVO
);
log
.
error
(
"正常结算时,接单方用户钱包更新失败,接单者id是:{},发布者传参是:{}"
,
flyerWalletFlowVO
.
getUserAccountId
(),
publisherWalletFlowVO
);
...
@@ -290,6 +292,7 @@ public class PayWalletServiceImpl implements PayWalletService {
...
@@ -290,6 +292,7 @@ public class PayWalletServiceImpl implements PayWalletService {
flyerPayLogDO
.
setOperateUser
(
publisherWalletFlowVO
.
getUserAccountId
());
flyerPayLogDO
.
setOperateUser
(
publisherWalletFlowVO
.
getUserAccountId
());
// 插入接单者流水记录表
// 插入接单者流水记录表
payWalletDao
.
insertPayLogDO
(
flyerPayLogDO
);
payWalletDao
.
insertPayLogDO
(
flyerPayLogDO
);
sendBackPledge
(
flyerWalletFlowVO
);
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
else
{
}
else
{
log
.
error
(
"飞手未确认修改金额大于原订单状态时,接单方用户钱包更新失败,接单者id是:{},发布者传参是:{}"
,
flyerWalletFlowVO
.
getUserAccountId
(),
publisherWalletFlowVO
);
log
.
error
(
"飞手未确认修改金额大于原订单状态时,接单方用户钱包更新失败,接单者id是:{},发布者传参是:{}"
,
flyerWalletFlowVO
.
getUserAccountId
(),
publisherWalletFlowVO
);
...
@@ -322,6 +325,7 @@ public class PayWalletServiceImpl implements PayWalletService {
...
@@ -322,6 +325,7 @@ public class PayWalletServiceImpl implements PayWalletService {
flyerPayLogDO
.
setOperateUser
(
publisherWalletFlowVO
.
getUserAccountId
());
flyerPayLogDO
.
setOperateUser
(
publisherWalletFlowVO
.
getUserAccountId
());
// 插入接单者流水记录表
// 插入接单者流水记录表
payWalletDao
.
insertPayLogDO
(
flyerPayLogDO
);
payWalletDao
.
insertPayLogDO
(
flyerPayLogDO
);
sendBackPledge
(
flyerWalletFlowVO
);
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
else
{
}
else
{
log
.
error
(
"飞手确认修改金额小于原订单状态,接单方用户钱包更新失败,接单者id是:{},发布者传参是:{}"
,
flyerWalletFlowVO
.
getUserAccountId
(),
publisherWalletFlowVO
);
log
.
error
(
"飞手确认修改金额小于原订单状态,接单方用户钱包更新失败,接单者id是:{},发布者传参是:{}"
,
flyerWalletFlowVO
.
getUserAccountId
(),
publisherWalletFlowVO
);
...
@@ -330,6 +334,15 @@ public class PayWalletServiceImpl implements PayWalletService {
...
@@ -330,6 +334,15 @@ public class PayWalletServiceImpl implements PayWalletService {
return
ResultBody
.
error
(
"钱包操作错误"
);
return
ResultBody
.
error
(
"钱包操作错误"
);
}
}
private
void
sendBackPledge
(
FlyerWalletFlowVO
flyerWalletFlowVO
)
{
if
(
flyerWalletFlowVO
.
getCashAmount
().
compareTo
(
new
BigDecimal
(
0
))
>
0
||
flyerWalletFlowVO
.
getSalaryAmount
().
compareTo
(
new
BigDecimal
(
0
))
>
0
)
{
PayLogDO
flyerPledgeSendBack
=
buildPayLogDO
(
null
,
flyerWalletFlowVO
);
flyerPledgeSendBack
.
setPayMethod
(
500
);
// 插入接单者流水记录表
payWalletDao
.
insertPayLogDO
(
flyerPledgeSendBack
);
}
}
private
int
buildFlyerWallet
(
FlyerWalletFlowVO
flyerWalletFlowVO
,
PayWalletDO
flyerWallet
)
{
private
int
buildFlyerWallet
(
FlyerWalletFlowVO
flyerWalletFlowVO
,
PayWalletDO
flyerWallet
)
{
PayWalletDO
flyerUpdatePayWallet
=
new
PayWalletDO
();
PayWalletDO
flyerUpdatePayWallet
=
new
PayWalletDO
();
flyerUpdatePayWallet
.
setUserAccountId
(
flyerWalletFlowVO
.
getUserAccountId
());
flyerUpdatePayWallet
.
setUserAccountId
(
flyerWalletFlowVO
.
getUserAccountId
());
...
@@ -356,7 +369,10 @@ public class PayWalletServiceImpl implements PayWalletService {
...
@@ -356,7 +369,10 @@ public class PayWalletServiceImpl implements PayWalletService {
PayWalletDO
flyerPayWalletDO
=
new
PayWalletDO
();
PayWalletDO
flyerPayWalletDO
=
new
PayWalletDO
();
flyerPayWalletDO
.
setUserAccountId
(
flyerWalletFlowVO
.
getUserAccountId
());
flyerPayWalletDO
.
setUserAccountId
(
flyerWalletFlowVO
.
getUserAccountId
());
flyerPayWalletDO
.
setPid
(
flyerWallet
.
getPid
());
flyerPayWalletDO
.
setPid
(
flyerWallet
.
getPid
());
flyerPayWalletDO
.
setSalaryAmt
(
flyerWallet
.
getSalaryAmt
().
add
(
publisherWalletFlowVO
.
getFlyerSalaryAmount
()));
flyerPayWalletDO
.
setSalaryAmt
(
flyerWallet
.
getSalaryAmt
().
add
(
publisherWalletFlowVO
.
getFlyerSalaryAmount
()).
add
(
flyerWalletFlowVO
.
getSalaryAmount
()));
flyerPayWalletDO
.
setSalaryFreeze
(
flyerWallet
.
getSalaryFreeze
().
subtract
(
flyerWalletFlowVO
.
getSalaryAmount
()));
flyerPayWalletDO
.
setCashAmt
(
flyerWallet
.
getCashAmt
().
add
(
flyerWalletFlowVO
.
getCashAmount
()));
flyerPayWalletDO
.
setCashFreeze
(
flyerWallet
.
getCashFreeze
().
subtract
(
flyerWalletFlowVO
.
getCashAmount
()));
int
flyerUpdateCount
=
payWalletDao
.
updatePayWallet
(
flyerPayWalletDO
);
int
flyerUpdateCount
=
payWalletDao
.
updatePayWallet
(
flyerPayWalletDO
);
return
flyerUpdateCount
;
return
flyerUpdateCount
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论