物流

@@ -315,6 +315,21 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
             }else if(ExpressInfoConstant.EXPRESS_TYPE_3.intValue()==expressType.intValue()
                 ||ExpressInfoConstant.EXPRESS_TYPE_REBACK.intValue()==expressType.intValue()){
                 //卖家这个时候看自己上一阶段的物流
+                //如果还没有新的物流信息，卖家显示上一个阶段的物流
+                if(StringUtils.isBlank(expressInfoRespBo.getExpressSender())){
+                    ExpressRecord expressRecord = expressRecordMapper.selectByUidAndOrderCodeAndExpressType(uid,orderCode,ExpressInfoConstant.EXPRESS_TYPE_1);
+                    if(expressRecord!=null){
+                        expressInfoRespBo.setExpressInfoDetailList(new ArrayList<>());
+                        // 快递单号
+                        expressInfoRespBo.setWayBillCode(expressRecord.getWaybillCode());
+                        //物流类型
+                        expressInfoRespBo.setExpressType(expressRecord.getExpressType());
+                        //物流发货方
+                        expressInfoRespBo.setExpressSender(EnumExpressSender.getSenderName(expressInfoRespBo.getExpressType().intValue()));
+                        // 快递公司名称
+                        expressInfoRespBo.setExpressCompanyName(expressCompanyService.getExpressName(expressRecord.getLogisticsType()));
+                    }
+                }
                 List<ExpressInfo> previousExpressInfoList = expressInfoMapper.selectAllExpressInfo(uid, orderCode, ExpressInfoConstant.EXPRESS_TYPE_1);
                 constructExpressInfo(previousExpressInfoList, supplementExpressInfoDetailList);
             }