Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
25f847e4
提交
25f847e4
authored
10月 26, 2023
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加货单调价接口
上级
f3849d63
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
57 行增加
和
1 行删除
+57
-1
UpdateOrderGoodsPriceParam.java
.../clx/performance/param/pc/UpdateOrderGoodsPriceParam.java
+32
-0
GoodsOrderController.java
...m/clx/performance/controller/pc/GoodsOrderController.java
+9
-0
OrderGoodsDao.java
.../src/main/java/com/clx/performance/dao/OrderGoodsDao.java
+1
-0
OrderGoodsDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
+4
-1
OrderGoodsService.java
...n/java/com/clx/performance/service/OrderGoodsService.java
+3
-0
OrderGoodsServiceImpl.java
...m/clx/performance/service/impl/OrderGoodsServiceImpl.java
+8
-0
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/pc/UpdateOrderGoodsPriceParam.java
0 → 100644
浏览文件 @
25f847e4
package
com
.
clx
.
performance
.
param
.
pc
;
import
com.msl.common.convertor.type.MoneyInConvert
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
javax.validation.constraints.NotNull
;
import
java.math.BigDecimal
;
/**
* @ClassName UpdateOrderGoodsPriceParam
* @Description
* @Author kavin
* @Date 2023/10/26 10:30
* @Version 1.0
*/
@Getter
@Setter
public
class
UpdateOrderGoodsPriceParam
{
@NotNull
(
message
=
"货单id不能为空"
)
@ApiModelProperty
(
"货单id"
)
private
Integer
id
;
@NotNull
(
message
=
"挂单运费不能为空"
)
@ApiModelProperty
(
"挂单运费"
)
@MoneyInConvert
private
BigDecimal
pendingOrderFreight
;
}
performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
浏览文件 @
25f847e4
...
@@ -9,6 +9,7 @@ import com.clx.order.vo.feign.FeignOrderVO;
...
@@ -9,6 +9,7 @@ import com.clx.order.vo.feign.FeignOrderVO;
import
com.clx.performance.component.GoodsOrderStrategyContext
;
import
com.clx.performance.component.GoodsOrderStrategyContext
;
import
com.clx.performance.constant.RedisConstants
;
import
com.clx.performance.constant.RedisConstants
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.param.pc.UpdateOrderGoodsPriceParam
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.vo.pc.OrderChildPCVO
;
import
com.clx.performance.vo.pc.OrderChildPCVO
;
...
@@ -142,4 +143,12 @@ public class GoodsOrderController {
...
@@ -142,4 +143,12 @@ public class GoodsOrderController {
public
Result
<
BigDecimal
>
orderCancelResidueWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
,
@RequestParam
(
value
=
"optionType"
)
String
optionType
)
{
public
Result
<
BigDecimal
>
orderCancelResidueWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
,
@RequestParam
(
value
=
"optionType"
)
String
optionType
)
{
return
Result
.
ok
(
orderGoodsService
.
orderCancelResidueWeight
(
orderNo
,
optionType
));
return
Result
.
ok
(
orderGoodsService
.
orderCancelResidueWeight
(
orderNo
,
optionType
));
}
}
@ApiOperation
(
value
=
"调整货单价格"
,
notes
=
"<br>By:刘海泉"
)
@PostMapping
(
"/updateOrderGoodsPrice"
)
public
Result
updateOrderGoodsPrice
(
UpdateOrderGoodsPriceParam
param
)
{
orderGoodsService
.
updateOrderGoodsPrice
(
param
);
return
Result
.
ok
();
}
}
}
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
浏览文件 @
25f847e4
...
@@ -55,4 +55,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
...
@@ -55,4 +55,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
List
<
OrderGoods
>
listIntegralOrderGoodsSync
();
List
<
OrderGoods
>
listIntegralOrderGoodsSync
();
boolean
updatePendingOrderFreightById
(
Integer
id
,
BigDecimal
pendingOrderFreight
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
浏览文件 @
25f847e4
...
@@ -145,5 +145,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
...
@@ -145,5 +145,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
);
);
}
}
@Override
public
boolean
updatePendingOrderFreightById
(
Integer
id
,
BigDecimal
pendingOrderFreight
)
{
return
update
(
lUdWrapper
().
eq
(
OrderGoods
::
getGoodsId
,
id
).
set
(
OrderGoods
::
getPendingOrderFreight
,
pendingOrderFreight
));
}
}
}
performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
浏览文件 @
25f847e4
...
@@ -6,6 +6,7 @@ import com.clx.order.params.PageOrderGoodsListParam;
...
@@ -6,6 +6,7 @@ import com.clx.order.params.PageOrderGoodsListParam;
import
com.clx.order.params.UpdateEditOrderGoodsParam
;
import
com.clx.order.params.UpdateEditOrderGoodsParam
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.model.OrderGoods
;
import
com.clx.performance.param.app.OrderGoodsListPageParam
;
import
com.clx.performance.param.app.OrderGoodsListPageParam
;
import
com.clx.performance.param.pc.UpdateOrderGoodsPriceParam
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.feign.OrderGoodsFeignVO
;
import
com.clx.performance.vo.feign.OrderGoodsFeignVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
...
@@ -40,4 +41,6 @@ public interface OrderGoodsService {
...
@@ -40,4 +41,6 @@ public interface OrderGoodsService {
BigDecimal
orderCancelResidueWeight
(
String
orderNo
,
String
optionType
);
BigDecimal
orderCancelResidueWeight
(
String
orderNo
,
String
optionType
);
void
updateEditOrderGoods
(
UpdateEditOrderGoodsParam
param
);
void
updateEditOrderGoods
(
UpdateEditOrderGoodsParam
param
);
void
updateOrderGoodsPrice
(
UpdateOrderGoodsPriceParam
param
);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @
25f847e4
...
@@ -16,6 +16,7 @@ import com.clx.performance.model.OrderGoods;
...
@@ -16,6 +16,7 @@ import com.clx.performance.model.OrderGoods;
import
com.clx.performance.model.OrderGoodsDriverTruck
;
import
com.clx.performance.model.OrderGoodsDriverTruck
;
import
com.clx.performance.model.OrderGoodsTruckBind
;
import
com.clx.performance.model.OrderGoodsTruckBind
;
import
com.clx.performance.param.app.OrderGoodsListPageParam
;
import
com.clx.performance.param.app.OrderGoodsListPageParam
;
import
com.clx.performance.param.pc.UpdateOrderGoodsPriceParam
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.struct.OrderGoodsStruct
;
import
com.clx.performance.struct.OrderGoodsStruct
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
...
@@ -220,5 +221,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
...
@@ -220,5 +221,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
}
}
@Override
public
void
updateOrderGoodsPrice
(
UpdateOrderGoodsPriceParam
param
)
{
orderGoodsDao
.
updatePendingOrderFreightById
(
param
.
getId
(),
param
.
getPendingOrderFreight
());
//记录货单调价日志
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论