Authored by tanling

物流详情title

@@ -146,6 +146,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -146,6 +146,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
146 private final String last_seller_un_accept = "。"; 146 private final String last_seller_un_accept = "。";
147 private final String last_seller_confirm = ",等待买家确认。"; 147 private final String last_seller_confirm = ",等待买家确认。";
148 148
  149 +
  150 + private final static String DEFAULT_EXPRESS_TITLE = "订单跟踪";
  151 + private final static String APPRAISE_EXPRESS_TITLE = "物流详情";
  152 +
149 @Autowired 153 @Autowired
150 private SkupService skupService; 154 private SkupService skupService;
151 155
@@ -494,7 +498,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -494,7 +498,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
494 } 498 }
495 499
496 //1.物流单号信息 500 //1.物流单号信息
497 - constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo); 501 + constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
498 502
499 // 构造物流信息 503 // 构造物流信息
500 if (expressTypeList.size() == 1) { 504 if (expressTypeList.size() == 1) {
@@ -600,7 +604,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -600,7 +604,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
600 } 604 }
601 605
602 // 物流单号信息 606 // 物流单号信息
603 - constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo); 607 + constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, APPRAISE_EXPRESS_TITLE);
604 608
605 // 根据订单号and物流类型 返回物流信息 609 // 根据订单号and物流类型 返回物流信息
606 List<ExpressInfoDetail> expressInfoDetailList = getExpressInfoDetailListByOrderCodeExpressType(orderCode, expressTypeList); 610 List<ExpressInfoDetail> expressInfoDetailList = getExpressInfoDetailListByOrderCodeExpressType(orderCode, expressTypeList);
@@ -629,7 +633,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -629,7 +633,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
629 } 633 }
630 634
631 // 物流单号信息 635 // 物流单号信息
632 - constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo); 636 + constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
633 637
634 // 根据订单号and物流类型 返回物流信息 638 // 根据订单号and物流类型 返回物流信息
635 List<ExpressInfoDetail> expressInfoDetailList = getExpressInfoDetailListByOrderCodeExpressType(orderCode, expressTypeList); 639 List<ExpressInfoDetail> expressInfoDetailList = getExpressInfoDetailListByOrderCodeExpressType(orderCode, expressTypeList);
@@ -650,7 +654,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -650,7 +654,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
650 } 654 }
651 655
652 // 物流单号信息 656 // 物流单号信息
653 - constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo); 657 + constructWayBillInfo(orderCode, expressTypeList, expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
654 658
655 // 其中是否包含了 鉴定中心内部调拨信息 659 // 其中是否包含了 鉴定中心内部调拨信息
656 if (expressTypeList.contains(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode())){ 660 if (expressTypeList.contains(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode())){
@@ -694,7 +698,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -694,7 +698,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
694 //如果还没有新的物流信息,卖家显示上一个阶段的物流 698 //如果还没有新的物流信息,卖家显示上一个阶段的物流
695 if (StringUtils.isBlank(expressInfoRespBo.getExpressSender())) { 699 if (StringUtils.isBlank(expressInfoRespBo.getExpressSender())) {
696 //物流单号信息 700 //物流单号信息
697 - constructWayBillInfo(orderCode, Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode()), expressInfoRespBo); 701 + constructWayBillInfo(orderCode, Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode()), expressInfoRespBo, DEFAULT_EXPRESS_TITLE);
698 } 702 }
699 List<ExpressInfo> previousExpressInfoList = getExpressInfoListByStage(actor, orderCode, EnumExpressType.EXPRESS_TYPE_1.getCode()); 703 List<ExpressInfo> previousExpressInfoList = getExpressInfoListByStage(actor, orderCode, EnumExpressType.EXPRESS_TYPE_1.getCode());
700 constructExpressInfo(actor, previousExpressInfoList, expressInfoRespBo.getSupplementExpressInfoDetailList()); 704 constructExpressInfo(actor, previousExpressInfoList, expressInfoRespBo.getSupplementExpressInfoDetailList());
@@ -703,7 +707,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -703,7 +707,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
703 } 707 }
704 708
705 //物流单号信息 709 //物流单号信息
706 - private void constructWayBillInfo(Long orderCode, List<Integer> expressTypeList, ExpressInfoRespBo expressInfoRespBo) { 710 + private void constructWayBillInfo(Long orderCode, List<Integer> expressTypeList, ExpressInfoRespBo expressInfoRespBo, String expressTitle) {
707 Integer expressType = 0; 711 Integer expressType = 0;
708 for (Integer i : expressTypeList) { 712 for (Integer i : expressTypeList) {
709 if (EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().equals(i)) { 713 if (EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().equals(i)) {
@@ -720,7 +724,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -720,7 +724,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
720 //物流类型 724 //物流类型
721 expressInfoRespBo.setExpressType(expressType.byteValue()); 725 expressInfoRespBo.setExpressType(expressType.byteValue());
722 //物流发货方 726 //物流发货方
723 - expressInfoRespBo.setExpressSender(getSenderName(expressInfoRespBo.getExpressType().intValue())); 727 + expressInfoRespBo.setExpressSender(expressTitle);
724 // 快递公司名称 728 // 快递公司名称
725 expressInfoRespBo.setExpressCompanyName(expressCompanyService.getExpressName(expressRecord.getLogisticsType())); 729 expressInfoRespBo.setExpressCompanyName(expressCompanyService.getExpressName(expressRecord.getLogisticsType()));
726 } 730 }