Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
f4f4cfef
提交
f4f4cfef
authored
7月 19, 2024
作者:
李瑞鑫
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
运单变化更新货单已装车吨数
上级
d7e63613
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
40 行增加
和
10 行删除
+40
-10
OrderGoodsDao.java
.../src/main/java/com/clx/performance/dao/OrderGoodsDao.java
+6
-4
OrderGoodsDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
+5
-0
OrderChildDtsListener.java
...a/com/clx/performance/listener/OrderChildDtsListener.java
+11
-5
OrderGoodsMapper.java
...ain/java/com/clx/performance/mapper/OrderGoodsMapper.java
+6
-1
OrderGoodsSqlProvider.java
...om/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
+12
-0
没有找到文件。
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
浏览文件 @
f4f4cfef
...
...
@@ -2,14 +2,14 @@ package com.clx.performance.dao;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.dto.CancelOrderGoodsWeightDTO
;
import
com.clx.performance.model.OrderGoodsFleetOpenTruck
;
import
com.clx.performance.param.app.AppGoodsOrderSearchParam
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.mapper.OrderGoodsMapper
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoodsFleetOpenTruck
;
import
com.clx.performance.param.app.AppGoodsOrderSearchParam
;
import
com.clx.performance.param.app.OrderGoodsListPageParam
;
import
com.clx.performance.param.pc.GoodsOrderMapParam
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
com.msl.common.base.Optional
;
...
...
@@ -108,4 +108,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
void
batchCancel
(
List
<
Integer
>
idList
);
void
batchCancelOrderGoods
(
List
<
CancelOrderGoodsWeightDTO
>
cancelOrderGoodsWeight
);
void
updateAlreadyLoadWeight
(
BigDecimal
alreadyLoadWeight
,
String
orderGoodsNo
);
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
浏览文件 @
f4f4cfef
...
...
@@ -305,4 +305,9 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
public
void
batchCancelOrderGoods
(
List
<
CancelOrderGoodsWeightDTO
>
cancelOrderGoodsWeight
)
{
baseMapper
.
batchCancelOrderGoods
(
cancelOrderGoodsWeight
);
}
@Override
public
void
updateAlreadyLoadWeight
(
BigDecimal
alreadyLoadWeight
,
String
orderGoodsNo
)
{
baseMapper
.
updateAlreadyLoadWeight
(
alreadyLoadWeight
,
orderGoodsNo
);
}
}
performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
浏览文件 @
f4f4cfef
...
...
@@ -13,6 +13,7 @@ import com.clx.order.feign.OrderFeign;
import
com.clx.order.vo.feign.FeignOrderVO
;
import
com.clx.performance.config.ThirdAppConfig
;
import
com.clx.performance.constant.RabbitKeyConstants
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dto.dts.DataTransportDTO
;
import
com.clx.performance.enums.DtsOperationTypeEnum
;
import
com.clx.performance.enums.OrderChildEnum
;
...
...
@@ -32,6 +33,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
import
org.springframework.context.ApplicationEventPublisher
;
import
org.springframework.stereotype.Component
;
import
java.math.BigDecimal
;
import
java.util.Objects
;
import
java.util.Optional
;
...
...
@@ -45,6 +47,8 @@ public class OrderChildDtsListener {
private
final
ApplicationEventPublisher
applicationEventPublisher
;
private
final
ThirdAppConfig
thirdAppConfig
;
private
final
OrderGoodsDao
orderGoodsDao
;
@RabbitListener
(
queues
=
RabbitKeyConstants
.
CLX_PERFORMANCE_ORDER_CHILD_QUEUE
)
...
...
@@ -206,12 +210,14 @@ public class OrderChildDtsListener {
* @param after
*/
private
void
afterLogicalProcessing
(
OrderChildMessage
before
,
OrderChildMessage
after
){
//运单取消处理
if
(
OrderChildEnum
.
DTS_LISTEN_CANCEL_lIST
.
contains
(
after
.
getStatus
())){
//如果运单有装车吨数,货单装车吨数需要扣除
if
(
Objects
.
nonNull
(
after
.
getLoadNet
())){
BigDecimal
loadNet
=
after
.
getLoadNet
();
//装车净重
String
orderGoodsNo
=
after
.
getOrderGoodsNo
();
//货单号
if
(
Objects
.
nonNull
(
loadNet
))
{
//装车吨数不为空处理
if
(
OrderChildEnum
.
DTS_LISTEN_CANCEL_lIST
.
contains
(
after
.
getStatus
()))
{
//运单取消,货单装车吨数需要减掉
loadNet
=
loadNet
.
negate
();
}
orderGoodsDao
.
updateAlreadyLoadWeight
(
loadNet
,
orderGoodsNo
);
}
}
...
...
performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java
浏览文件 @
f4f4cfef
...
...
@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.performance.dto.CancelOrderGoodsWeightDTO
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoodsFleetOpenTruck
;
import
com.clx.performance.param.app.AppGoodsOrderSearchParam
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.sqlProvider.OrderGoodsSqlProvider
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
...
...
@@ -106,4 +106,9 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
@UpdateProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"batchCancelOrderGoods"
)
void
batchCancelOrderGoods
(
List
<
CancelOrderGoodsWeightDTO
>
cancelOrderGoodsWeight
);
@UpdateProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"updateAlreadyLoadWeight"
)
void
updateAlreadyLoadWeight
(
@Param
(
value
=
"alreadyLoadWeight"
)
BigDecimal
alreadyLoadWeight
,
@Param
(
value
=
"orderGoodsNo"
)
String
orderGoodsNo
);
}
performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
浏览文件 @
f4f4cfef
...
...
@@ -379,4 +379,16 @@ public class OrderGoodsSqlProvider {
}
public
String
updateAlreadyLoadWeight
(
@Param
(
value
=
"alreadyLoadWeight"
)
BigDecimal
alreadyLoadWeight
,
@Param
(
value
=
"orderGoodsNo"
)
String
orderGoodsNo
){
String
sql
=
new
SQL
()
{{
UPDATE
(
"order_goods"
)
.
SET
(
"already_load_weight = already_load_weight + #{alreadyLoadWeight}"
)
.
WHERE
(
"order_goods_no = #{orderGoodsNo}"
);
}}.
toString
();
return
sql
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论