Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
0705f230
提交
0705f230
authored
12月 20, 2023
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加结算单支付锁
上级
cbff55b4
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
57 行增加
和
32 行删除
+57
-32
RedissonConstants.java
.../java/com/clx/performance/constant/RedissonConstants.java
+5
-0
SettlementMqHandlerServiceImpl.java
...e/service/impl/settle/SettlementMqHandlerServiceImpl.java
+52
-32
没有找到文件。
performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java
浏览文件 @
0705f230
...
@@ -6,4 +6,9 @@ public class RedissonConstants {
...
@@ -6,4 +6,9 @@ public class RedissonConstants {
public
static
final
String
ORDER_CHILD_SAVE_USER_TRUCK_LOCK
=
"clx-performance:orderChild:save:userTruck:"
;
public
static
final
String
ORDER_CHILD_SAVE_USER_TRUCK_LOCK
=
"clx-performance:orderChild:save:userTruck:"
;
public
static
final
String
ORDER_CHILD_SAVE_ORDER_GOODS_NO_LOCK
=
"clx-performance:orderChild:save:orderGoodsNo:"
;
public
static
final
String
ORDER_CHILD_SAVE_ORDER_GOODS_NO_LOCK
=
"clx-performance:orderChild:save:orderGoodsNo:"
;
//货主结算单支付锁
public
static
final
String
SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK
=
"clx-performance:settlementOwner:batchPay:id:"
;
//货主违约结算单支付锁
public
static
final
String
BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK
=
"clx-performance:breakContractSettlementOwner:batchPay:id:"
;
}
}
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
浏览文件 @
0705f230
package
com
.
clx
.
performance
.
service
.
impl
.
settle
;
package
com
.
clx
.
performance
.
service
.
impl
.
settle
;
import
com.clx.performance.config.MslPaymentConfig
;
import
com.clx.performance.config.MslPaymentConfig
;
import
com.clx.performance.constant.RedissonConstants
;
import
com.clx.performance.dao.OrderChildDao
;
import
com.clx.performance.dao.OrderChildDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.settle.SettlementDriverDao
;
import
com.clx.performance.dao.settle.SettlementDriverDao
;
...
@@ -31,11 +32,13 @@ import com.clx.performance.service.settle.SettlementLogService;
...
@@ -31,11 +32,13 @@ import com.clx.performance.service.settle.SettlementLogService;
import
com.clx.performance.service.settle.SettlementMqHandlerService
;
import
com.clx.performance.service.settle.SettlementMqHandlerService
;
import
com.clx.performance.service.settle.SettlementService
;
import
com.clx.performance.service.settle.SettlementService
;
import
com.clx.performance.utils.LocalDateTimeUtils
;
import
com.clx.performance.utils.LocalDateTimeUtils
;
import
com.clx.performance.utils.RedisUtil
;
import
com.clx.performance.vo.mq.SettlementDetailAddMqParam
;
import
com.clx.performance.vo.mq.SettlementDetailAddMqParam
;
import
com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam
;
import
com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam
;
import
com.clx.user.vo.feign.DriverInfoFeignVo
;
import
com.clx.user.vo.feign.DriverInfoFeignVo
;
import
com.clx.user.vo.feign.OwnerInfoFeignVO
;
import
com.clx.user.vo.feign.OwnerInfoFeignVO
;
import
com.msl.common.enums.ResultCodeEnum
;
import
com.msl.common.enums.ResultCodeEnum
;
import
com.msl.common.exception.ServiceSystemException
;
import
com.msl.common.result.Result
;
import
com.msl.common.result.Result
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -46,6 +49,7 @@ import java.math.BigDecimal;
...
@@ -46,6 +49,7 @@ import java.math.BigDecimal;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Objects
;
import
java.util.UUID
;
@Slf4j
@Slf4j
@Service
@Service
...
@@ -91,6 +95,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
...
@@ -91,6 +95,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
@Autowired
@Autowired
private
OrderChildLogService
orderChildLogService
;
private
OrderChildLogService
orderChildLogService
;
@Autowired
RedisUtil
redisUtil
;
@Override
@Override
...
@@ -206,41 +213,54 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
...
@@ -206,41 +213,54 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
* 车主结算单自动支付
* 车主结算单自动支付
*/
*/
public
String
paySettlementDriver
(
SettlementDriverDetail
detail
){
public
String
paySettlementDriver
(
SettlementDriverDetail
detail
){
DriverInfoFeignVo
driverInfoFeignVo
=
driverService
.
getDriverInfo
(
detail
.
getDriverUserNo
()).
orElseThrow
(
ResultCodeEnum
.
FAIL
);
String
uuid
=
UUID
.
randomUUID
().
toString
();
PayParam
noCheckPwd
=
null
;
String
key
=
RedissonConstants
.
SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK
+
detail
.
getId
();
if
(
detail
.
getSettlementFreight
().
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
noCheckPwd
=
PayParam
.
builder
().
from
(
mslPaymentConfig
.
getTransportWalletCode
())
.
to
(
driverInfoFeignVo
.
getWalletCode
())
.
figure
(
detail
.
getSettlementFreight
().
intValue
())
.
tradeNo
(
detail
.
getChildNo
())
.
tradeId
(
detail
.
getChildNo
())
.
pwd
(
"noCheckPwd"
)
.
remark
(
PayRemarkEnum
.
toString
(
PayRemarkEnum
.
FREIGHT_TO_OWNER
.
getValue
()))
.
build
();
}
else
{
BigDecimal
freight
=
detail
.
getSettlementFreight
().
abs
();
noCheckPwd
=
PayParam
.
builder
().
from
(
driverInfoFeignVo
.
getWalletCode
())
.
to
(
mslPaymentConfig
.
getTransportWalletCode
())
.
figure
(
freight
.
intValue
())
.
tradeNo
(
detail
.
getChildNo
())
.
tradeId
(
detail
.
getChildNo
())
.
pwd
(
"noCheckPwd"
)
.
remark
(
PayRemarkEnum
.
toString
(
PayRemarkEnum
.
FREIGHT_TO_OWNER
.
getValue
()))
.
build
();
}
Result
result
=
null
;
String
msg
=
null
;
try
{
try
{
result
=
paymentService
.
paymentWallet
(
noCheckPwd
);
boolean
flag
=
redisUtil
.
lock
(
key
,
uuid
);
if
(!
flag
){
return
"获取支付锁失败,操作频繁,请稍后重试"
;
}
DriverInfoFeignVo
driverInfoFeignVo
=
driverService
.
getDriverInfo
(
detail
.
getDriverUserNo
()).
orElseThrow
(
ResultCodeEnum
.
FAIL
);
PayParam
noCheckPwd
=
null
;
if
(
detail
.
getSettlementFreight
().
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
noCheckPwd
=
PayParam
.
builder
().
from
(
mslPaymentConfig
.
getTransportWalletCode
())
.
to
(
driverInfoFeignVo
.
getWalletCode
())
.
figure
(
detail
.
getSettlementFreight
().
intValue
())
.
tradeNo
(
detail
.
getChildNo
())
.
tradeId
(
detail
.
getChildNo
())
.
pwd
(
"noCheckPwd"
)
.
remark
(
PayRemarkEnum
.
toString
(
PayRemarkEnum
.
FREIGHT_TO_OWNER
.
getValue
()))
.
build
();
}
else
{
BigDecimal
freight
=
detail
.
getSettlementFreight
().
abs
();
noCheckPwd
=
PayParam
.
builder
().
from
(
driverInfoFeignVo
.
getWalletCode
())
.
to
(
mslPaymentConfig
.
getTransportWalletCode
())
.
figure
(
freight
.
intValue
())
.
tradeNo
(
detail
.
getChildNo
())
.
tradeId
(
detail
.
getChildNo
())
.
pwd
(
"noCheckPwd"
)
.
remark
(
PayRemarkEnum
.
toString
(
PayRemarkEnum
.
FREIGHT_TO_OWNER
.
getValue
()))
.
build
();
}
Result
result
=
null
;
String
msg
=
null
;
try
{
result
=
paymentService
.
paymentWallet
(
noCheckPwd
);
}
catch
(
Exception
e
){
settlementDriverNotify
(
detail
.
getChildNo
(),
0
,
e
.
getMessage
());
msg
=
e
.
getMessage
();
}
if
(
Objects
.
nonNull
(
result
)){
settlementDriverNotify
(
detail
.
getChildNo
(),
0
,
result
.
getMsg
());
}
return
msg
;
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
settlementDriverNotify
(
detail
.
getChildNo
(),
0
,
e
.
getMessage
());
//解锁
msg
=
e
.
getMessage
();
redisUtil
.
unlock
(
key
,
uuid
);
}
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
DATA_REPEAT
);
if
(
Objects
.
nonNull
(
result
)){
settlementDriverNotify
(
detail
.
getChildNo
(),
0
,
result
.
getMsg
());
}
}
return
msg
;
}
}
/**
/**
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论