Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
5185d8ec
提交
5185d8ec
authored
10月 30, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
订单逆向
上级
9568b75c
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
150 行增加
和
72 行删除
+150
-72
UpdateEditOrderGoodsParam.java
...m/clx/performance/param/pc/UpdateEditOrderGoodsParam.java
+14
-55
OrderGoodsEditVO.java
...main/java/com/clx/performance/vo/pc/OrderGoodsEditVO.java
+42
-0
OrderGoodsVO.java
...src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
+15
-0
OrderCancelFeignController.java
...formance/controller/feign/OrderCancelFeignController.java
+6
-5
GoodsOrderController.java
...m/clx/performance/controller/pc/GoodsOrderController.java
+6
-4
OrderChildDao.java
.../src/main/java/com/clx/performance/dao/OrderChildDao.java
+2
-0
OrderGoodsDao.java
.../src/main/java/com/clx/performance/dao/OrderGoodsDao.java
+1
-1
OrderChildDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
+5
-0
OrderGoodsDaoImpl.java
.../java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
+1
-1
OrderGoodsMapper.java
...ain/java/com/clx/performance/mapper/OrderGoodsMapper.java
+2
-1
OrderCancelService.java
.../java/com/clx/performance/service/OrderCancelService.java
+1
-1
OrderGoodsService.java
...n/java/com/clx/performance/service/OrderGoodsService.java
+2
-1
OrderCancelServiceImpl.java
.../clx/performance/service/impl/OrderCancelServiceImpl.java
+0
-0
OrderGoodsServiceImpl.java
...m/clx/performance/service/impl/OrderGoodsServiceImpl.java
+29
-3
OrderGoodsSqlProvider.java
...om/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
+24
-0
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/pc/UpdateEditOrderGoodsParam.java
浏览文件 @
5185d8ec
package
com
.
clx
.
performance
.
param
.
pc
;
import
com.clx.order.params.OrderGoodsChildParams
;
import
com.msl.common.convertor.field.Converted
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
javax.validation.Valid
;
import
javax.validation.constraints.NotBlank
;
import
java.util.List
;
/**
* @ClassName UpdateEditOrderGoodsParam
* @Description
...
...
@@ -13,60 +20,12 @@ import lombok.Setter;
@Getter
@Setter
public
class
UpdateEditOrderGoodsParam
{
// @ApiModelProperty("货单id")
// private Integer id;
//
// @ApiModelProperty("提取方式 1提取全部 2提取部分")
// private Integer extractWay;
//
// @ApiModelProperty("提取吨数")
// private BigDecimal extractWeight;
//
// @ApiModelProperty("需要车辆/辆")
// private Integer needTruckNum;
//
//
// @ApiModelProperty("挂单方式 1公开派单 2定向派单")
// private Integer pendingOrderWay;
//
//
// @ApiModelProperty("用车方式 1:平台车辆配货 2:自有车辆配货")
// private String vehicleUsage;
//
//
//
//
//
//
//
//
//
//
// @ApiModelProperty(value = "最晚到达货源地时间/运单的最晚装货时间", example = "2023-09-09 12:00:01", required = true)
// private String lastArriveSendTime;
//
//
//
//
// @ApiModelProperty("高级物流经理id")
// private Integer seniorLogisticsManagerId;
//
// @ApiModelProperty("高级物流经理姓名")
// private String seniorLogisticsManagerName;
//
//
// @ApiModelProperty(value = "挂单时间", example = "2023-09-09 12:00:01", required = true)
// private String pendingOrderTime;
//
//
// @MoneyInConvert
// @ApiModelProperty("挂单运费")
// private BigDecimal pendingOrderFreight;
//
//
//
//
// @ApiModelProperty("车辆列表")
// private List<String> truckList;
@ApiModelProperty
(
"订单编号"
)
@NotBlank
(
message
=
"订单编号不能为空"
)
private
String
orderNo
;
@Valid
@Converted
(
isDynamic
=
true
)
private
List
<
OrderGoodsChildParams
>
orderGoodsChildParams
;
}
performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsEditVO.java
0 → 100644
浏览文件 @
5185d8ec
package
com
.
clx
.
performance
.
vo
.
pc
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.List
;
@Data
public
class
OrderGoodsEditVO
{
@ApiModelProperty
(
"订单编号"
)
private
String
orderNo
;
@ApiModelProperty
(
"拉运吨数"
)
private
String
transportWeight
;
@ApiModelProperty
(
"有效运费"
)
private
BigDecimal
validFreightPrice
;
@ApiModelProperty
(
"用车需求: 1平台车辆 2部分平台车辆 3自有车辆"
)
private
Integer
truckDemand
;
@ApiModelProperty
(
"剩余拉运吨数"
)
private
String
residueWeight
;
@ApiModelProperty
(
"自有承运吨数"
)
private
String
ownCarryWeight
;
@ApiModelProperty
(
"自有承运剩余吨数"
)
private
String
ownResidueCarryWeight
;
@ApiModelProperty
(
"平台承运吨数"
)
private
String
platformCarryWeight
;
@ApiModelProperty
(
"平台剩余承运吨数"
)
private
String
platformResidueCarryWeight
;
@ApiModelProperty
(
"向下浮动量(吨)"
)
private
String
downFloatWeight
;
@ApiModelProperty
(
"向上浮动量(吨)"
)
private
String
upFloatWeight
;
@ApiModelProperty
(
"是否暂停 0:否 1:是"
)
private
Integer
stopFlag
;
@ApiModelProperty
(
"结算账期 1拉运完成结 2月结"
)
private
Integer
settlementAccountPeriod
;
@ApiModelProperty
(
"1:可以全部编辑 0:不能全部编辑"
)
private
boolean
editAllFlag
;
private
List
<
OrderGoodsVO
>
orderGoodsVOList
;
}
performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
浏览文件 @
5185d8ec
...
...
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import
lombok.Setter
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.List
;
...
...
@@ -112,5 +113,18 @@ public class OrderGoodsVO {
@ApiModelProperty
(
"车辆列表"
)
private
List
<
String
>
truckList
;
@ApiModelProperty
(
"批次号"
)
private
String
batchNumber
;
@ApiModelProperty
(
"'最晚到达目的地时间'"
)
private
String
lastArriveReceiveTime
;
@ApiModelProperty
(
"最晚装货时间"
)
private
String
lastLoadTime
;
@ApiModelProperty
(
"'最晚接单时间'"
)
private
String
lastOrderTime
;
@ApiModelProperty
(
"'是否可编辑全部字段'"
)
private
boolean
editAllFlg
;
}
\ No newline at end of file
performance-web/src/main/java/com/clx/performance/controller/feign/OrderCancelFeignController.java
浏览文件 @
5185d8ec
...
...
@@ -29,11 +29,12 @@ public class OrderCancelFeignController {
@ApiOperation
(
value
=
"货主端订单取消"
,
notes
=
"<br>By:胡宇帆"
)
@PostMapping
(
"/orderCancel"
)
public
Result
<
Object
>
orderCancel
(
@RequestBody
OrderCancelFeignParam
param
)
{
OrderCancelParam
cancelParam
=
new
OrderCancelParam
();
cancelParam
.
setOrderNo
(
param
.
getOrderNo
());
cancelParam
.
setCancelType
(
3
);
cancelParam
.
setCreateByType
(
1
);
orderCancelService
.
platformCancelOrderPrePC
(
cancelParam
);
// OrderCancelParam cancelParam = new OrderCancelParam();
// cancelParam.setOrderNo(param.getOrderNo());
// cancelParam.setCancelType(3);
// cancelParam.setCreateByType(1);
// orderCancelService.platformCancelOrderPrePC(cancelParam);
orderCancelService
.
ownerCancelOrderPre
(
param
.
getOrderNo
());
return
Result
.
ok
();
}
}
performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
浏览文件 @
5185d8ec
...
...
@@ -14,6 +14,7 @@ import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.vo.pc.OrderChildPCVO
;
import
com.clx.performance.vo.pc.OrderGoodsEditVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
com.msl.common.base.PageData
;
import
com.msl.common.convertor.aspect.UnitCovert
;
...
...
@@ -127,15 +128,16 @@ public class GoodsOrderController {
return
Result
.
page
(
page
.
getRecords
(),
page
.
getTotal
(),
page
.
getPages
());
}
@ApiOperation
(
value
=
"货单编辑查询"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/findOrderGoodsByBatchNumber"
)
public
Result
<
OrderGoods
VO
>
findOrderGoodsByBatchNumber
(
@RequestParam
(
value
=
"batch_n
umber"
)
Long
batchNumber
){
OrderGoodsVO
orderGoodsVO
=
orderGoodsService
.
findOrderGoodsByBatchNumber
(
batchNumber
);
public
Result
<
OrderGoods
EditVO
>
findOrderGoodsByBatchNumber
(
@RequestParam
(
value
=
"batchN
umber"
)
Long
batchNumber
){
OrderGoods
Edit
VO
orderGoodsVO
=
orderGoodsService
.
findOrderGoodsByBatchNumber
(
batchNumber
);
return
Result
.
ok
(
orderGoodsVO
);
}
@ApiOperation
(
value
=
"货单编辑"
,
notes
=
"<br>By:刘海泉"
)
@ApiOperation
(
value
=
"货单编辑
提交
"
,
notes
=
"<br>By:刘海泉"
)
@PostMapping
(
"/updateEditOrderGoods"
)
public
Result
updateEditOrderGoods
(
@RequestBody
@Validated
UpdateEditOrderGoodsParam
param
)
{
public
Result
<
Object
>
updateEditOrderGoods
(
@RequestBody
@Validated
UpdateEditOrderGoodsParam
param
)
{
orderGoodsService
.
updateEditOrderGoods
(
param
);
return
Result
.
ok
();
}
...
...
performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @
5185d8ec
...
...
@@ -97,4 +97,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
void
batchUpdateOrderChildStatus
(
Integer
status
,
List
<
Integer
>
ids
);
List
<
OrderChild
>
selectOrderChildListByOrderGoodsNoAndStatusGE
(
String
orderGoodsNo
,
Integer
status
);
List
<
OrderChild
>
selectListByOrderGoodsList
(
List
<
String
>
orderGoodsList
);
}
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
浏览文件 @
5185d8ec
...
...
@@ -63,5 +63,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
Integer
updateOrderGoodsSetResidueWeight
(
BigDecimal
residueWeight
,
Integer
id
);
OrderGoodsVO
findOrderGoodsByBatchNumber
(
Long
batchNumber
);
List
<
OrderGoodsVO
>
findOrderGoodsByBatchNumber
(
Long
batchNumber
);
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @
5185d8ec
...
...
@@ -301,6 +301,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
.
ge
(
ObjectUtil
.
isNotNull
(
status
),
OrderChild:
:
getStatus
,
status
)
);
}
@Override
public
List
<
OrderChild
>
selectListByOrderGoodsList
(
List
<
String
>
orderGoodsList
)
{
return
baseMapper
.
selectList
(
lQrWrapper
().
in
(
OrderChild:
:
getOrderGoodsNo
,
orderGoodsList
));
}
@Override
public
List
<
OrderChild
>
getOrderChildByOrderNo
(
String
orderNo
)
{
LambdaQueryWrapper
<
OrderChild
>
query
=
new
LambdaQueryWrapper
();
...
...
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
浏览文件 @
5185d8ec
...
...
@@ -169,7 +169,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
}
@Override
public
OrderGoodsVO
findOrderGoodsByBatchNumber
(
Long
batchNumber
)
{
public
List
<
OrderGoodsVO
>
findOrderGoodsByBatchNumber
(
Long
batchNumber
)
{
return
baseMapper
.
findOrderGoodsByBatchNumber
(
batchNumber
);
}
...
...
performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java
浏览文件 @
5185d8ec
...
...
@@ -60,5 +60,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
@UpdateProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"updateOrderGoodsSetResidueWeight"
)
Integer
updateOrderGoodsSetResidueWeight
(
@Param
(
value
=
"residueWeight"
)
BigDecimal
residueWeight
,
@Param
(
value
=
"id"
)
Integer
id
);
OrderGoodsVO
findOrderGoodsByBatchNumber
(
Long
batchNumber
);
@SelectProvider
(
type
=
OrderGoodsSqlProvider
.
class
,
method
=
"findOrderGoodsByBatchNumber"
)
List
<
OrderGoodsVO
>
findOrderGoodsByBatchNumber
(
Long
batchNumber
);
}
performance-web/src/main/java/com/clx/performance/service/OrderCancelService.java
浏览文件 @
5185d8ec
...
...
@@ -8,7 +8,7 @@ public interface OrderCancelService {
//
// void platformCancelOrder(String orderNo);
//
//
void ownerCancelOrderPre(String orderNo);
void
ownerCancelOrderPre
(
String
orderNo
);
//
// void ownerCancelOrder(String orderNo);
...
...
performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
浏览文件 @
5185d8ec
...
...
@@ -10,6 +10,7 @@ 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.feign.OrderGoodsFeignVO
;
import
com.clx.performance.vo.pc.OrderGoodsEditVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
java.math.BigDecimal
;
...
...
@@ -79,5 +80,5 @@ public interface OrderGoodsService {
* @param batchNumber
* @return
*/
OrderGoodsVO
findOrderGoodsByBatchNumber
(
Long
batchNumber
);
OrderGoods
Edit
VO
findOrderGoodsByBatchNumber
(
Long
batchNumber
);
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @
5185d8ec
差异被折叠。
点击展开。
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @
5185d8ec
...
...
@@ -28,6 +28,7 @@ import com.clx.performance.service.OrderGoodsService;
import
com.clx.performance.struct.OrderGoodsStruct
;
import
com.clx.performance.vo.app.OrderGoodsAPPVO
;
import
com.clx.performance.vo.feign.OrderGoodsFeignVO
;
import
com.clx.performance.vo.pc.OrderGoodsEditVO
;
import
com.clx.performance.vo.pc.OrderGoodsVO
;
import
com.clx.user.feign.UserClxFeign
;
import
com.msl.common.base.Optional
;
...
...
@@ -441,8 +442,33 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
}
@Override
public
OrderGoodsVO
findOrderGoodsByBatchNumber
(
Long
batchNumber
)
{
OrderGoodsVO
orderGoodsVO
=
orderGoodsDao
.
findOrderGoodsByBatchNumber
(
batchNumber
);
return
orderGoodsVO
;
public
OrderGoodsEditVO
findOrderGoodsByBatchNumber
(
Long
batchNumber
)
{
OrderGoodsEditVO
result
=
new
OrderGoodsEditVO
();
List
<
OrderGoodsVO
>
orderGoodsVOList
=
orderGoodsDao
.
findOrderGoodsByBatchNumber
(
batchNumber
);
String
orderNo
=
orderGoodsVOList
.
get
(
0
).
getOrderNo
();
FeignOrderVO
orderInfoFeign
=
orderFeign
.
getOrderInfoFeign
(
orderNo
);
result
.
setOrderNo
(
orderInfoFeign
.
getOrderNo
());
result
.
setTransportWeight
(
orderInfoFeign
.
getTransportWeight
());
result
.
setValidFreightPrice
(
orderInfoFeign
.
getValidFreightPrice
());
result
.
setTruckDemand
(
orderInfoFeign
.
getTruckDemand
());
result
.
setResidueWeight
(
orderInfoFeign
.
getResidueWeight
());
result
.
setOwnCarryWeight
(
orderInfoFeign
.
getOwnCarryWeight
());
result
.
setOwnResidueCarryWeight
(
orderInfoFeign
.
getOwnResidueCarryWeight
());
result
.
setPlatformCarryWeight
(
orderInfoFeign
.
getPlatformCarryWeight
());
result
.
setDownFloatWeight
(
orderInfoFeign
.
getDownFloatWeight
());
result
.
setUpFloatWeight
(
orderInfoFeign
.
getUpFloatWeight
());
result
.
setStopFlag
(
orderInfoFeign
.
getStopFlag
());
result
.
setSettlementAccountPeriod
(
orderInfoFeign
.
getSettlementAccountPeriod
());
List
<
String
>
orderGoodsList
=
orderGoodsVOList
.
stream
().
map
(
OrderGoodsVO:
:
getOrderGoodsNo
).
collect
(
Collectors
.
toList
());
List
<
OrderChild
>
orderChildList
=
orderChildDao
.
selectListByOrderGoodsList
(
orderGoodsList
);
if
(
CollectionUtils
.
isNotEmpty
(
orderChildList
))
{
result
.
setEditAllFlag
(
false
);
}
else
{
result
.
setEditAllFlag
(
true
);
}
result
.
setOrderGoodsVOList
(
orderGoodsVOList
);
return
result
;
}
}
performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
浏览文件 @
5185d8ec
...
...
@@ -184,5 +184,29 @@ public class OrderGoodsSqlProvider {
return
sql
;
}
public
String
pageOrderGoodsList
(
@Param
(
"batchNumber"
)
Long
batchNumber
)
{
String
sql
=
new
SQL
()
{{
SELECT
(
"a.id, a.order_no,"
+
" a.order_goods_no, a.order_goods_status, a.extract_weight, "
+
" if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude,"
+
" a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude,"
+
"a.goods_id, a.goods_name, a.pending_order_way,"
+
" date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ,"
+
" date_format(a.last_arrive_send_time, '%Y-%m-%d %H:%i:%s') as last_arrive_send_time ,"
+
" date_format(a.pending_order_time, '%Y-%m-%d %H:%i:%s') as pending_order_time,"
+
" date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,"
+
" date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time,"
+
"a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight,"
+
"a.user_no,a.user_name,batch_number,last_arrive_receive_time,last_load_time,last_order_time"
);
FROM
(
"order_goods a"
);
if
(
Objects
.
nonNull
(
batchNumber
))
{
WHERE
(
"a.batch_number = #{batchNumber}"
);
}
ORDER_BY
(
"a.create_time desc"
);
}}.
toString
();
return
sql
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论