Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
a10cf365
提交
a10cf365
authored
11月 09, 2023
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加最后一车的逻辑
上级
6926f3ff
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
101 行增加
和
1 行删除
+101
-1
OrderChildDao.java
.../src/main/java/com/clx/performance/dao/OrderChildDao.java
+1
-0
OrderGoodsDao.java
.../src/main/java/com/clx/performance/dao/OrderGoodsDao.java
+2
-0
OrderChildDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
+8
-0
OrderGoodsDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
+4
-1
OrderGoodsMapper.java
...ain/java/com/clx/performance/mapper/OrderGoodsMapper.java
+2
-0
LastTruckService.java
...in/java/com/clx/performance/service/LastTruckService.java
+8
-0
LastTruckServiceImpl.java
...om/clx/performance/service/impl/LastTruckServiceImpl.java
+67
-0
OrderGoodsSqlProvider.java
...om/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
+9
-0
没有找到文件。
performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @
a10cf365
...
@@ -125,4 +125,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
...
@@ -125,4 +125,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
*/
*/
List
<
OrderChild
>
selectInTransitOrderChildByOrderGoodsNo
(
String
orderGoodsNo
);
List
<
OrderChild
>
selectInTransitOrderChildByOrderGoodsNo
(
String
orderGoodsNo
);
OrderChild
findLastTruckChild
(
String
orderNo
);
}
}
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
浏览文件 @
a10cf365
...
@@ -85,4 +85,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
...
@@ -85,4 +85,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
List
<
OrderGoods
>
getOrderGoodsListByOrderNoAndStatus
(
String
orderNo
);
List
<
OrderGoods
>
getOrderGoodsListByOrderNoAndStatus
(
String
orderNo
);
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
List
<
OrderGoodsTruckBind
>
list
);
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
List
<
OrderGoodsTruckBind
>
list
);
BigDecimal
getAlreadyTransportWeight
(
String
orderNo
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @
a10cf365
...
@@ -381,4 +381,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
...
@@ -381,4 +381,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
return
baseMapper
.
selectList
(
lQrWrapper
().
eq
(
OrderChild:
:
getOrderGoodsNo
,
orderGoodsNo
)
return
baseMapper
.
selectList
(
lQrWrapper
().
eq
(
OrderChild:
:
getOrderGoodsNo
,
orderGoodsNo
)
.
lt
(
OrderChild:
:
getStatus
,
OrderChildEnum
.
Status
.
UNLOAD
.
getCode
())
.
lt
(
OrderChild:
:
getStatus
,
OrderChildEnum
.
Status
.
UNLOAD
.
getCode
())
);
}
);
}
@Override
public
OrderChild
findLastTruckChild
(
String
orderNo
)
{
return
getOne
(
lQrWrapper
().
eq
(
OrderChild:
:
getOrderNo
,
orderNo
)
.
notIn
(
OrderChild:
:
getStatus
,
OrderChildEnum
.
DTS_LISTEN_CANCEL_lIST
)
.
orderByDesc
(
OrderChild:
:
getCreateTime
)
.
last
(
"limit 1"
));
}
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
浏览文件 @
a10cf365
...
@@ -228,5 +228,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
...
@@ -228,5 +228,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
return
baseMapper
.
getCancelOrderGoods
(
param
);
return
baseMapper
.
getCancelOrderGoods
(
param
);
}
}
@Override
public
BigDecimal
getAlreadyTransportWeight
(
String
orderNo
)
{
return
baseMapper
.
getAlreadyTransportWeight
(
orderNo
);
}
}
}
performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java
浏览文件 @
a10cf365
...
@@ -82,4 +82,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
...
@@ -82,4 +82,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
@SelectProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"getCancelOrderGoods"
)
@SelectProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"getCancelOrderGoods"
)
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
@Param
(
value
=
"param"
)
List
<
OrderGoodsTruckBind
>
param
);
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
@Param
(
value
=
"param"
)
List
<
OrderGoodsTruckBind
>
param
);
@SelectProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"getAlreadyTransportWeight"
)
BigDecimal
getAlreadyTransportWeight
(
@Param
(
"orderNo"
)
String
orderNo
);
}
}
performance-web/src/main/java/com/clx/performance/service/LastTruckService.java
0 → 100644
浏览文件 @
a10cf365
package
com
.
clx
.
performance
.
service
;
import
com.clx.performance.model.OrderChild
;
public
interface
LastTruckService
{
OrderChild
getLastTruckChild
(
String
orderNo
);
}
performance-web/src/main/java/com/clx/performance/service/impl/LastTruckServiceImpl.java
0 → 100644
浏览文件 @
a10cf365
package
com
.
clx
.
performance
.
service
.
impl
;
import
com.clx.order.enums.OrderEnum
;
import
com.clx.order.feign.OrderFeign
;
import
com.clx.order.vo.feign.FeignOrderVO
;
import
com.clx.performance.dao.OrderChildDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.model.OrderChild
;
import
com.clx.performance.service.LastTruckService
;
import
com.clx.user.enums.SyncPlatformEnum
;
import
com.msl.common.exception.ServiceSystemException
;
import
groovy.util.logging.Slf4j
;
import
lombok.AllArgsConstructor
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
java.math.BigDecimal
;
import
java.util.Objects
;
/**
* @ClassName LastTruckServiceImpl
* @Description
* @Author kavin
* @Date 2023/11/9 13:13
* @Version 1.0
*/
@Service
@Slf4j
@AllArgsConstructor
public
class
LastTruckServiceImpl
implements
LastTruckService
{
private
final
OrderFeign
orderFeign
;
private
final
OrderChildDao
orderChildDao
;
private
final
OrderGoodsDao
orderGoodsDao
;
/**
* @Author kavin
* @Description 判断最后一车的逻辑
* @Param [orderNo]
* @return
**/
@Override
public
OrderChild
getLastTruckChild
(
String
orderNo
)
{
//判断订单是否已经完结
FeignOrderVO
orderInfo
=
orderFeign
.
getOrderInfoFeign
(
orderNo
);
if
(
Objects
.
isNull
(
orderInfo
)){
return
null
;
}
if
(!
Objects
.
equals
(
orderInfo
.
getOrderSource
(),
SyncPlatformEnum
.
TRADE_PLATFORM
.
getCode
())){
return
null
;
}
//已完结直接按照时间顺序查找最后一个运单
if
(
Objects
.
equals
(
orderInfo
.
getOrderStatus
(),
OrderEnum
.
Status
.
COMPLETED
.
getCode
())
||
Objects
.
equals
(
orderInfo
.
getOrderStatus
(),
OrderEnum
.
Status
.
SUCCESS
.
getCode
())
){
return
orderChildDao
.
findLastTruckChild
(
orderNo
);
}
else
{
//未完结,判断所有货单的已拉运的吨数是否等于 订单的拉运吨数-向下浮动量
BigDecimal
alreadyTransprotWeight
=
orderGoodsDao
.
getAlreadyTransportWeight
(
orderNo
);
//查询所有货单的已拉运吨数 + 向下浮动量 >= 订单的承运吨数 (满足此情况查找最后一单)
if
(
Objects
.
nonNull
(
alreadyTransprotWeight
)
&&
alreadyTransprotWeight
.
add
(
new
BigDecimal
(
orderInfo
.
getDownFloatWeight
())).
compareTo
(
orderInfo
.
getTransportWeight
())
>=
0
){
return
orderChildDao
.
findLastTruckChild
(
orderNo
);
}
}
return
null
;
}
}
performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
浏览文件 @
a10cf365
...
@@ -277,4 +277,13 @@ public class OrderGoodsSqlProvider {
...
@@ -277,4 +277,13 @@ public class OrderGoodsSqlProvider {
}
}
public
String
getAlreadyTransportWeight
(
String
orderNo
){
String
sql
=
new
SQL
()
{{
SELECT
(
"sum(already_transport_weight)"
);
FROM
(
"order_goods "
);
WHERE
(
"order_no = #{orderNo}"
);
}}.
toString
();
return
sql
;
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论