|
|
@@ -165,6 +165,7 @@ public class KwpSettlementLogisticsService {
|
|
|
|
|
|
/**
|
|
|
* 对查询结果进行处理,转换 status 等状态值为对应中文描述
|
|
|
+ *
|
|
|
* @author Aick Spt
|
|
|
* @date 2023-08-03 10:44
|
|
|
*/
|
|
|
@@ -177,6 +178,7 @@ public class KwpSettlementLogisticsService {
|
|
|
|
|
|
/**
|
|
|
* 根据条件获取列表头部汇总数据
|
|
|
+ *
|
|
|
* @author Aick Spt
|
|
|
* @date 2023-08-03 10:44
|
|
|
*/
|
|
|
@@ -221,6 +223,12 @@ public class KwpSettlementLogisticsService {
|
|
|
return tableTops;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 运费-物流订单详情
|
|
|
+ *
|
|
|
+ * @author Aick Spt
|
|
|
+ * @date 2023-08-07 10:14
|
|
|
+ */
|
|
|
private SettlementLogisticsDto detail(Long id, Integer unitType) {
|
|
|
SettlementLogisticsDto settlementLogisticsDto = settlementLogisticsMapper.detail(id, unitType);
|
|
|
if (settlementLogisticsDto == null) {
|
|
|
@@ -230,6 +238,12 @@ public class KwpSettlementLogisticsService {
|
|
|
return settlementLogisticsDto;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 增加 创建、更新人名称及字段
|
|
|
+ *
|
|
|
+ * @author Aick Spt
|
|
|
+ * @date 2023-08-07 10:14
|
|
|
+ */
|
|
|
private void setDetailDesc(SettlementLogisticsDto settlementLogisticsDto) {
|
|
|
settlementLogisticsDto.setStatusText(SettlementEnum.getStatusDesc(settlementLogisticsDto.getStatus()));
|
|
|
if (settlementLogisticsDto.getLedgerSettlePrice() != null) {
|
|
|
@@ -249,18 +263,22 @@ public class KwpSettlementLogisticsService {
|
|
|
Long updateBy = settlementLogisticsDto.getUpdateBy();
|
|
|
UserCacheResDto userCacheResDto = map.get(createBy);
|
|
|
if (Objects.isNull(userCacheResDto)) {
|
|
|
+ //通过缓存拿对应数据
|
|
|
userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
|
|
|
map.put(createBy, userCacheResDto);
|
|
|
}
|
|
|
if (Objects.nonNull(userCacheResDto)) {
|
|
|
+ //写入对应数据
|
|
|
settlementLogisticsDto.setCreateByText(userCacheResDto.getName());
|
|
|
}
|
|
|
userCacheResDto = map.get(updateBy);
|
|
|
if (Objects.isNull(userCacheResDto)) {
|
|
|
+ //通过缓存拿对应数据
|
|
|
userCacheResDto = remoteSystemService.queryUserCacheById(updateBy);
|
|
|
map.put(updateBy, userCacheResDto);
|
|
|
}
|
|
|
if (Objects.nonNull(userCacheResDto)) {
|
|
|
+ //写入对应数据
|
|
|
settlementLogisticsDto.setUpdateByText(userCacheResDto.getName());
|
|
|
}
|
|
|
}
|