Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
9caefb49
提交
9caefb49
authored
1月 09, 2024
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
货主取消订单解绑order_truck_bind记录
上级
6b655750
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
118 行增加
和
7 行删除
+118
-7
OrderTruckBindCancelParam.java
.../com/clx/performance/vo/mq/OrderTruckBindCancelParam.java
+20
-0
OwnerAccountComponent.java
.../com/clx/performance/component/OwnerAccountComponent.java
+1
-6
RabbitBeanConfig.java
...ain/java/com/clx/performance/config/RabbitBeanConfig.java
+26
-0
RabbitKeyConstants.java
...java/com/clx/performance/constant/RabbitKeyConstants.java
+4
-0
OrderGoodsTruckBindDao.java
.../java/com/clx/performance/dao/OrderGoodsTruckBindDao.java
+2
-0
OrderGoodsTruckBindDaoImpl.java
.../clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java
+9
-0
OrderGoodsDriverBindListener.java
...lx/performance/listener/OrderGoodsDriverBindListener.java
+49
-0
OrderCancelServiceImpl.java
.../clx/performance/service/impl/OrderCancelServiceImpl.java
+7
-1
没有找到文件。
performance-api/src/main/java/com/clx/performance/vo/mq/OrderTruckBindCancelParam.java
0 → 100644
浏览文件 @
9caefb49
package
com
.
clx
.
performance
.
vo
.
mq
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
@Setter
@Getter
@ToString
@NoArgsConstructor
public
class
OrderTruckBindCancelParam
{
//货单编号
private
String
orderGoodsNo
;
//订单编号
private
String
orderNo
;
}
performance-web/src/main/java/com/clx/performance/component/OwnerAccountComponent.java
浏览文件 @
9caefb49
...
...
@@ -2,15 +2,12 @@ package com.clx.performance.component;
import
cn.hutool.json.JSONUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.clx.order.feign.OrderFeign
;
import
com.clx.performance.enums.OwnerAccountEnum
;
import
com.clx.performance.param.pc.owner.ThawAccountParam
;
import
com.clx.performance.param.pc.owner.UpdateStatusParam
;
import
com.clx.performance.service.OwnerAccountService
;
import
com.clx.performance.service.settle.SettlementOwnerDetailService
;
import
com.clx.performance.service.settle.SettlementOwnerService
;
import
com.msl.common.result.Result
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Component
;
...
...
@@ -45,14 +42,12 @@ public class OwnerAccountComponent {
if
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
ORDINARY
.
getCode
().
equals
(
invoiceType
))
{
log
.
info
(
"执行普通单解冻"
);
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
ORDINARY
.
getCode
());
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
}
else
{
log
.
info
(
"执行网运单解冻"
);
thawAccountParam
.
setOrderType
(
OwnerAccountEnum
.
OrderChildTypeStatus
.
NETWORK
.
getCode
());
}
log
.
info
(
"执行解冻账户,参数:{}"
,
JSONUtil
.
parse
(
thawAccountParam
));
ownerAccountService
.
ownerAccountThaw
(
thawAccountParam
);
}
//通知结算单锁定
settlementOwnerService
.
updateStatusByOrderNo
(
orderNo
,
1
,
10
,
20
);
...
...
performance-web/src/main/java/com/clx/performance/config/RabbitBeanConfig.java
浏览文件 @
9caefb49
...
...
@@ -140,4 +140,30 @@ public class RabbitBeanConfig {
public
Binding
orderChildSyncTransportExchangeBind
()
{
return
BindingBuilder
.
bind
(
orderChildSyncTransportQueue
()).
to
(
orderChildSyncTransportExchange
()).
with
(
RabbitKeyConstants
.
ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY
);
}
/**
* 处理延迟消息orderGoodsTruckBind
* @return
*/
@Bean
public
Queue
orderGoodsTruckBindQueue
()
{
return
new
Queue
(
RabbitKeyConstants
.
ORDER_TRUCK_BIND_LAZY_QUEUE
,
true
,
false
,
false
);
}
/**
* 处理延迟消息orderGoodsTruckBind
**/
@Bean
public
CustomExchange
orderGoodsTruckBindExchange
()
{
Map
<
String
,
Object
>
arguments
=
new
HashMap
<>();
//设置路由模式 direct模式
arguments
.
put
(
"x-delayed-type"
,
"direct"
);
return
new
CustomExchange
(
RabbitKeyConstants
.
ORDER_TRUCK_BIND_LAZY_EXCHANGE
,
"x-delayed-message"
,
true
,
false
,
arguments
);
}
//绑定交换机,队列和routingKey
@Bean
public
Binding
orderGoodsTruckBindBindingDelayedExchange
(
@Qualifier
(
"orderGoodsTruckBindQueue"
)
Queue
queue
,
@Qualifier
(
"orderGoodsTruckBindExchange"
)
CustomExchange
customExchange
)
{
return
BindingBuilder
.
bind
(
queue
).
to
(
customExchange
).
with
(
RabbitKeyConstants
.
ORDER_TRUCK_BIND_LAZY_ROUTE_KEY
).
noargs
();
}
}
performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java
浏览文件 @
9caefb49
...
...
@@ -78,5 +78,9 @@ public class RabbitKeyConstants {
public
static
final
String
FREEZE_TRIGGER_QUEUE
=
"clx-order.freeze.trigger.queue"
;
public
static
final
String
FREEZE_TRIGGER_ROUTING_KEY
=
"clx-order.freeze.trigger.routing.key"
;
public
static
final
String
ORDER_TRUCK_BIND_LAZY_EXCHANGE
=
"clx-order.truck.bind.lazy.exchange"
;
public
static
final
String
ORDER_TRUCK_BIND_LAZY_QUEUE
=
"clx-order.truck.bind.lazy.queue"
;
public
static
final
String
ORDER_TRUCK_BIND_LAZY_ROUTE_KEY
=
"clx-order.truck.bind.lazy.route.key"
;
}
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsTruckBindDao.java
浏览文件 @
9caefb49
...
...
@@ -31,6 +31,8 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
void
updateOrderGoodsBindStatus
(
String
orderGoodsNo
,
Integer
code
);
void
updateOrderGoodsBindStatus
(
List
<
String
>
orderGoodsList
,
Integer
code
);
void
updateOrderGoodsBindStatus
(
String
orderGoodsNo
,
Integer
code
,
List
<
String
>
truckList
);
void
updateOrderGoodsBindStatus
(
String
orderGoodsNo
,
Integer
code
,
String
truckNo
);
...
...
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java
浏览文件 @
9caefb49
...
...
@@ -87,6 +87,15 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
);
}
@Override
public
void
updateOrderGoodsBindStatus
(
List
<
String
>
orderGoodsList
,
Integer
code
)
{
update
(
lUdWrapper
()
.
in
(
OrderGoodsTruckBind:
:
getOrderGoodsNo
,
orderGoodsList
)
.
eq
(
OrderGoodsTruckBind:
:
getStatus
,
OrderGoodsTruckBindEnum
.
Status
.
NORMAL
.
getCode
())
.
set
(
OrderGoodsTruckBind:
:
getStatus
,
code
)
);
}
@Override
public
void
updateOrderGoodsBindStatus
(
String
orderGoodsNo
,
Integer
code
,
List
<
String
>
truckList
)
{
update
(
lUdWrapper
()
...
...
performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDriverBindListener.java
0 → 100644
浏览文件 @
9caefb49
package
com
.
clx
.
performance
.
listener
;
import
cn.hutool.json.JSONUtil
;
import
com.clx.order.enums.VehicleUsageEnum
;
import
com.clx.performance.constant.RabbitKeyConstants
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsTruckBindDao
;
import
com.clx.performance.enums.OrderGoodsTruckBindEnum
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.vo.mq.OrderTruckBindCancelParam
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.amqp.rabbit.annotation.RabbitListener
;
import
org.springframework.stereotype.Component
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Component
@Slf4j
@AllArgsConstructor
public
class
OrderGoodsDriverBindListener
{
private
final
OrderGoodsTruckBindDao
orderGoodsTruckBindDao
;
private
final
OrderGoodsDao
orderGoodsDao
;
@RabbitListener
(
queues
=
RabbitKeyConstants
.
ORDER_TRUCK_BIND_LAZY_QUEUE
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
onMessage
(
String
message
)
throws
Exception
{
OrderTruckBindCancelParam
param
=
JSONUtil
.
toBean
(
message
,
OrderTruckBindCancelParam
.
class
);
log
.
info
(
"OrderGoodsDriverBindListener请求参数{}"
,
JSONUtil
.
parse
(
param
));
if
(
StringUtils
.
isNotBlank
(
param
.
getOrderGoodsNo
()))
{
String
orderGoodsNo
=
param
.
getOrderGoodsNo
();
OrderGoods
orderGoods
=
orderGoodsDao
.
getByOrderGoodsNo
(
orderGoodsNo
).
get
();
if
(
VehicleUsageEnum
.
Status
.
OWN
.
getCode
().
equals
(
orderGoods
.
getVehicleUsage
()))
{
orderGoodsTruckBindDao
.
updateOrderGoodsBindStatus
(
orderGoodsNo
,
OrderGoodsTruckBindEnum
.
Status
.
CANCEL
.
getCode
());
}
}
else
if
(
StringUtils
.
isNotBlank
(
param
.
getOrderNo
()))
{
List
<
OrderGoods
>
orderGoodsList
=
orderGoodsDao
.
getOrderGoodsListByOrderNo
(
param
.
getOrderNo
());
List
<
String
>
orderGoodsNoList
=
orderGoodsList
.
stream
().
filter
(
i
->
VehicleUsageEnum
.
Status
.
OWN
.
getCode
().
equals
(
i
.
getVehicleUsage
()))
.
map
(
OrderGoods:
:
getOrderGoodsNo
).
collect
(
Collectors
.
toList
());
orderGoodsTruckBindDao
.
updateOrderGoodsBindStatus
(
orderGoodsNoList
,
OrderGoodsTruckBindEnum
.
Status
.
CANCEL
.
getCode
());
}
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @
9caefb49
...
...
@@ -182,7 +182,13 @@ public class OrderCancelServiceImpl implements OrderCancelService {
}
//进行解冻账户
ownerAccountComponent
.
thawOwnerAccountByOrderNo
(
orderNo
);
//开始执行订单取消吨数回填
Message
message
=
MessageBuilder
.
withBody
(
orderNo
.
getBytes
()).
build
();
message
.
getMessageProperties
().
setHeader
(
"x-delay"
,
2000
);
rabbitTemplate
.
send
(
RabbitKeyConstants
.
ORDER_ON_EXCHANGE
,
RabbitKeyConstants
.
ORDER_ON_ROUTE_KEY
,
message
);
//开始执行订单取消吨数回填
this
.
ownerConfirmCancelProcess
(
orderNo
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论