...
|
...
|
@@ -146,6 +146,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
private final String last_seller_un_accept = "。";
|
|
|
private final String last_seller_confirm = ",等待买家确认。";
|
|
|
|
|
|
|
|
|
private final static String DEFAULT_EXPRESS_TITLE = "订单跟踪";
|
|
|
private final static String APPRAISE_EXPRESS_TITLE = "物流详情";
|
|
|
|
|
|
@Autowired
|
|
|
private SkupService skupService;
|
|
|
|
...
|
...
|
@@ -494,7 +498,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
}
|
|
|
|
|
|
//1.物流单号信息
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo);
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
|
|
|
|
|
|
// 构造物流信息
|
|
|
if (expressTypeList.size() == 1) {
|
...
|
...
|
@@ -600,7 +604,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
}
|
|
|
|
|
|
// 物流单号信息
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo);
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, APPRAISE_EXPRESS_TITLE);
|
|
|
|
|
|
// 根据订单号and物流类型 返回物流信息
|
|
|
List<ExpressInfoDetail> expressInfoDetailList = getExpressInfoDetailListByOrderCodeExpressType(orderCode, expressTypeList);
|
...
|
...
|
@@ -629,7 +633,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
}
|
|
|
|
|
|
// 物流单号信息
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo);
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
|
|
|
|
|
|
// 根据订单号and物流类型 返回物流信息
|
|
|
List<ExpressInfoDetail> expressInfoDetailList = getExpressInfoDetailListByOrderCodeExpressType(orderCode, expressTypeList);
|
...
|
...
|
@@ -650,7 +654,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
}
|
|
|
|
|
|
// 物流单号信息
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo);
|
|
|
constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
|
|
|
|
|
|
// 其中是否包含了 鉴定中心内部调拨信息
|
|
|
if (expressTypeList.contains(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode())){
|
...
|
...
|
@@ -694,7 +698,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
//如果还没有新的物流信息,卖家显示上一个阶段的物流
|
|
|
if (StringUtils.isBlank(expressInfoRespBo.getExpressSender())) {
|
|
|
//物流单号信息
|
|
|
constructWayBillInfo(orderCode, Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode()), expressInfoRespBo);
|
|
|
constructWayBillInfo(orderCode, Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode()), expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
|
|
|
}
|
|
|
List<ExpressInfo> previousExpressInfoList = getExpressInfoListByStage(actor, orderCode, EnumExpressType.EXPRESS_TYPE_1.getCode());
|
|
|
constructExpressInfo(actor, previousExpressInfoList, expressInfoRespBo.getSupplementExpressInfoDetailList());
|
...
|
...
|
@@ -703,7 +707,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
}
|
|
|
|
|
|
//物流单号信息
|
|
|
private void constructWayBillInfo(Long orderCode, List<Integer> expressTypeList, ExpressInfoRespBo expressInfoRespBo) {
|
|
|
private void constructWayBillInfo(Long orderCode, List<Integer> expressTypeList, ExpressInfoRespBo expressInfoRespBo, String expressTitle) {
|
|
|
Integer expressType = 0;
|
|
|
for (Integer i : expressTypeList) {
|
|
|
if (EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().equals(i)) {
|
...
|
...
|
@@ -720,7 +724,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
//物流类型
|
|
|
expressInfoRespBo.setExpressType(expressType.byteValue());
|
|
|
//物流发货方
|
|
|
expressInfoRespBo.setExpressSender(getSenderName(expressInfoRespBo.getExpressType().intValue()));
|
|
|
expressInfoRespBo.setExpressSender(expressTitle);
|
|
|
// 快递公司名称
|
|
|
expressInfoRespBo.setExpressCompanyName(expressCompanyService.getExpressName(expressRecord.getLogisticsType()));
|
|
|
}
|
...
|
...
|
|