ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 944ba31a1fb75171e23e224756041595556d9957 1 parent 536882bf

fixbug

Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
... ... @@ -819,6 +819,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
expressInfoDetail.setCreateTimeStr(DateUtil.formatDate(expressInfo.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
expressInfoDetail.setState(expressInfo.getState());
expressInfoDetail.setExpressType(expressInfo.getExpressType().intValue());
... ...
package com.yohoufo.order.service.impl;
import com.google.common.collect.Lists;
import com.yohobuy.ufo.model.order.common.EnumExpressType;
import com.yohobuy.ufo.model.order.common.OrderStatus;
import com.yohobuy.ufo.model.order.common.TabType;
import com.yohobuy.ufo.model.order.resp.ExpressInfoDetail;
... ... @@ -75,15 +76,14 @@ public class ExpressStageBuilder {
// 快速发货
if (ExpressScene.QUICK_SHIP.equals(scene)) {
if (TabType.BUY == actor) {
expressInfoRespBo.setExpressInfoDetailTitle(StringUtils.EMPTY);
expressInfoRespBo.setSupplementExpressInfoDetailTitle(StringUtils.EMPTY);
expressInfoRespBo.setSupplementExpressInfoDetailList(Lists.newArrayList());
expressInfoRespBo.setJudgeExpressInfoDetailTitle(StringUtils.EMPTY);
expressInfoRespBo.setExpressInfoDetailList(Lists.newArrayList());
expressInfoRespBo.setJudgeExpressInfoDetailList(Lists.newArrayList());
boolean isDone = expressInfoRespBo.getSupplementExpressInfoDetailList()
boolean isDone = expressInfoRespBo.getExpressInfoDetailList()
.stream()
.map(ExpressInfoDetail::getState)
.filter(Objects::nonNull)
.filter(e -> e == ExpressInfoConstant.EXPRESS_STATUS_SIGN)
.filter(e -> Objects.equals(e.getExpressType(), EnumExpressType.EXPRESS_TYPE_2.getCode()))
.filter(e -> Objects.equals(e.getState(), ExpressInfoConstant.EXPRESS_STATUS_SIGN))
.findFirst()
.isPresent();
return isDone ? QUICK_SHIP_DONE : QUICK_SHIP_DEPOT_SENT;
... ...