Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
ce88a07b
提交
ce88a07b
authored
8月 19, 2024
作者:
李瑞鑫
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
校验不进行ocr识别
上级
0454d134
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
0 行增加
和
102 行删除
+0
-102
PerformanceSdkFeignController.java
...mance/controller/feign/PerformanceSdkFeignController.java
+0
-2
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+0
-100
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
浏览文件 @
ce88a07b
...
...
@@ -64,8 +64,6 @@ public class PerformanceSdkFeignController {
private
final
OrderService
orderService
;
private
final
PerformanceProgressService
performanceProgressService
;
@ApiOperation
(
value
=
"货主端取消订单"
,
notes
=
"<br>By:胡宇帆"
)
@PostMapping
(
"/ownCancelOrderPre"
)
...
...
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
ce88a07b
...
...
@@ -261,8 +261,6 @@ public class OrderChildServiceImpl implements OrderChildService {
@Autowired
private
UserClxFeign
userClxFeign
;
@Autowired
private
OrderWeightService
orderWeightService
;
@Autowired
private
OrderChildOperateLimitConfigService
orderChildOperateLimitConfigService
;
@Autowired
private
LoadAppConfig
appConfig
;
...
...
@@ -272,8 +270,6 @@ public class OrderChildServiceImpl implements OrderChildService {
private
ClxMessageOpenapiFeign
clxMessageOpenapiFeign
;
@Autowired
private
ClxMessageConfig
messageConfig
;
@Autowired
private
OrderChildWeighPictureDao
pictureDao
;
...
...
@@ -3565,46 +3561,6 @@ public class OrderChildServiceImpl implements OrderChildService {
}
}
@Override
public
List
<
HistoryLineTranVolumeChartVO
>
getHistoryLineTransportVolume
(
String
orderNo
)
{
//查询近一个月与该订单收发货地线路一致的订单
Optional
<
List
<
String
>>
result
=
orderService
.
getMonthSameLineOrderList
(
orderNo
);
if
(!
result
.
isPresent
()){
log
.
warn
(
"通过订单号:{} 查找相同线路的订单列列表,返回结果:{}"
,
orderNo
,
result
);
throw
new
ServiceSystemException
(
ResultEnum
.
DATA_ERROR
,
"获取相同线路的订单列表失败"
);
}
List
<
BigDecimal
>
priceList
=
orderGoodsAdjustmentPriceService
.
getNoRepeatAdjustmentPriceRecord
(
result
.
get
());
List
<
HistoryLineTranVolumeChartVO
>
charts
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isEmpty
(
priceList
)){
return
charts
;
}
//查询相同路线的订单下的所有运单
List
<
OrderChild
>
childs
=
orderChildDao
.
listCompleteByOrderNos
(
result
.
get
());
if
(
CollectionUtils
.
isEmpty
(
childs
)){
priceList
.
forEach
(
item
->
charts
.
add
(
HistoryLineTranVolumeChartVO
.
builder
()
.
pendingOrderFreight
(
item
).
number
(
0
).
build
()));
return
charts
;
}
LinkedHashMap
<
BigDecimal
,
Integer
>
priceMap
=
priceList
.
stream
().
collect
(
Collectors
.
toMap
(
item
->
item
,
item
->
0
,
(
existing
,
replacement
)
->
existing
,
// 如果有冲突的键,则保留现有的键
LinkedHashMap:
:
new
));
//进行相同路线运费拉运单数统计
childs
.
forEach
(
item
->{
if
(
priceMap
.
containsKey
(
item
.
getFreightPrice
())){
priceMap
.
put
(
item
.
getFreightPrice
(),
priceMap
.
get
(
item
.
getFreightPrice
())
+
1
);
}
});
for
(
Map
.
Entry
<
BigDecimal
,
Integer
>
entry
:
priceMap
.
entrySet
())
{
charts
.
add
(
HistoryLineTranVolumeChartVO
.
builder
().
pendingOrderFreight
(
entry
.
getKey
()).
number
(
entry
.
getValue
()).
build
());
}
return
charts
;
}
@Override
public
NeedAlertSuperviseInfoResultVO
needAlertSuperviseInfo
(
NeedAlertSuperviseInfoParam
param
)
{
...
...
@@ -3790,60 +3746,4 @@ public class OrderChildServiceImpl implements OrderChildService {
}
}
@Override
public
NeedAlertSuperviseInfoResultVO
needAlertSuperviseInfo
(
NeedAlertSuperviseInfoParam
param
)
{
//查询运单信息
OrderChild
orderChild
=
orderChildDao
.
getByChildNo
(
param
.
getChildNo
()).
orElseThrow
(
DATA_NOT_FIND
);
//返回对象
NeedAlertSuperviseInfoResultVO
result
=
new
NeedAlertSuperviseInfoResultVO
();
App
app
=
appConfig
.
getPurchaseManageApp
();
//对接马上来供应链配置信息
//组装配置信息
RequestConfig
config
=
new
RequestConfig
()
.
setAppId
(
app
.
getAppNo
())
.
setAppKey
(
app
.
getAppKey
())
.
setGatewayUrl
(
app
.
getCallback
());
//通过订单号查询监装监卸信息
SupplyChainSupervisionLoadAction
action
=
new
SupplyChainSupervisionLoadAction
();
action
.
setOrderNo
(
orderChild
.
getOrderNo
());
action
.
setType
(
param
.
getType
());
log
.
info
(
"请求获取监装监卸信息参数,{}"
,
action
);
Result
<
SupervisionLoadInfoDto
>
supervisionLoadInfoDto
=
OpenClient
.
doAction
(
config
,
action
);
if
(!
supervisionLoadInfoDto
.
succeed
()){
//接口调用失败
result
.
setNeedAlert
(
0
);
return
result
;
//throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息失败");
}
SupervisionLoadInfoDto
supervisionLoadInfo
=
supervisionLoadInfoDto
.
getData
();
//监装信息
if
(
Objects
.
nonNull
(
supervisionLoadInfo
)){
//有监装信息
//通过运单号查询监装监卸子任务状态
SupplyChainSupervisionLoadTruckAction
truckAction
=
new
SupplyChainSupervisionLoadTruckAction
();
truckAction
.
setChildNo
(
param
.
getChildNo
());
truckAction
.
setType
(
param
.
getType
());
log
.
info
(
"请求获取监装监卸子任务信息参数,{}"
,
truckAction
);
Result
<
SupervisionLoadTruckInfoDto
>
supervisionLoadTruckInfoDto
=
OpenClient
.
doAction
(
config
,
truckAction
);
if
(!
supervisionLoadTruckInfoDto
.
succeed
()){
//接口调用失败
result
.
setNeedAlert
(
0
);
return
result
;
//throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息子任务失败");
}
SupervisionLoadTruckInfoDto
supervisionLoadTruckInfo
=
supervisionLoadTruckInfoDto
.
getData
();
if
(
Objects
.
nonNull
(
supervisionLoadTruckInfo
)){
if
(
supervisionLoadTruckInfo
.
getLoadStatus
()){
result
.
setNeedAlert
(
1
);
result
.
setLocation
(
supervisionLoadInfo
.
getTaskAddress
());
result
.
setMobile
(
supervisionLoadInfo
.
getTaskMobile
());
result
.
setSupervisor
(
supervisionLoadInfo
.
getTaskContracts
());
return
result
;
}
}
}
result
.
setNeedAlert
(
0
);
return
result
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论