Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
d6ff2646
提交
d6ff2646
authored
11月 10, 2023
作者:
aiqingguo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
接单限制
上级
a78dfc31
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
16 行增加
和
8 行删除
+16
-8
OrderGoodsDao.java
.../src/main/java/com/clx/performance/dao/OrderGoodsDao.java
+3
-1
OrderGoodsDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
+5
-1
OrderGoodsMapper.java
...ain/java/com/clx/performance/mapper/OrderGoodsMapper.java
+5
-5
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+3
-1
没有找到文件。
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
浏览文件 @
d6ff2646
package
com
.
clx
.
performance
.
dao
;
package
com
.
clx
.
performance
.
dao
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.model.OrderGoodsTruckBind
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.mapper.OrderGoodsMapper
;
import
com.clx.performance.mapper.OrderGoodsMapper
;
...
@@ -85,4 +84,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
...
@@ -85,4 +84,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
List
<
OrderGoods
>
getOrderGoodsListByOrderNoAndStatus
(
String
orderNo
);
List
<
OrderGoods
>
getOrderGoodsListByOrderNoAndStatus
(
String
orderNo
);
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
List
<
String
>
list
);
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
List
<
String
>
list
);
BigDecimal
sumAlreadyTransportWeightByOrderNo
(
String
orderNo
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
浏览文件 @
d6ff2646
...
@@ -3,7 +3,6 @@ package com.clx.performance.dao.impl;
...
@@ -3,7 +3,6 @@ package com.clx.performance.dao.impl;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.performance.model.OrderGoodsTruckBind
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
...
@@ -228,5 +227,10 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
...
@@ -228,5 +227,10 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
return
baseMapper
.
getCancelOrderGoods
(
param
);
return
baseMapper
.
getCancelOrderGoods
(
param
);
}
}
@Override
public
BigDecimal
sumAlreadyTransportWeightByOrderNo
(
String
orderNo
)
{
return
baseMapper
.
sumAlreadyTransportWeightByOrderNo
(
orderNo
);
}
}
}
performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java
浏览文件 @
d6ff2646
...
@@ -3,17 +3,13 @@ package com.clx.performance.mapper;
...
@@ -3,17 +3,13 @@ package com.clx.performance.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.performance.model.OrderGoodsTruckBind
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.OrderGoodsEditParams
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.param.pc.PageOrderGoodsListParam
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.sqlProvider.OrderGoodsSqlProvider
;
import
com.clx.performance.sqlProvider.OrderGoodsSqlProvider
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.*
;
import
org.apache.ibatis.annotations.SelectProvider
;
import
org.apache.ibatis.annotations.Update
;
import
org.apache.ibatis.annotations.UpdateProvider
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
...
@@ -82,4 +78,8 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
...
@@ -82,4 +78,8 @@ 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
<
String
>
param
);
List
<
OrderGoodsAPPVO
>
getCancelOrderGoods
(
@Param
(
value
=
"param"
)
List
<
String
>
param
);
@Select
(
"select sum(already_transport_weight) from order_goods where order_no=#{orderNo}"
)
BigDecimal
sumAlreadyTransportWeightByOrderNo
(
@Param
(
"orderNo"
)
String
orderNo
);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
d6ff2646
...
@@ -330,7 +330,9 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -330,7 +330,9 @@ public class OrderChildServiceImpl implements OrderChildService {
}
}
// 订单数量限制
// 订单数量限制
if
(
orderInfo
.
getTransportWeight
().
add
(
orderChild
.
getWeight
()).
compareTo
(
orderInfo
.
getPlatformCarryWeight
().
subtract
(
orderInfo
.
getDownFloatWeight
()))
>
0
){
// 订单已拉运吨数
BigDecimal
alreadyTransportWeight
=
orderGoodsDao
.
sumAlreadyTransportWeightByOrderNo
(
orderGoods
.
getOrderNo
());
if
(
alreadyTransportWeight
.
add
(
orderChild
.
getWeight
()).
compareTo
(
orderInfo
.
getTransportWeight
().
subtract
(
orderInfo
.
getDownFloatWeight
()))
>
0
){
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
ORDER_WEIGHT_LACK
);
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
ORDER_WEIGHT_LACK
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论