ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 2db78567ac3c01178c104ebc323323a8dacb17b4 1 parent 04b58119

确认收货优化

Inline Side-by-side
Showing 1 changed file with 18 additions and 2 deletions
... ... @@ -16,8 +16,6 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import com.yoho.ufo.order.request.OrderOperateTask;
import com.yoho.ufo.util.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.common.collect.Lists;
... ... @@ -99,11 +97,18 @@ import com.yoho.ufo.dal.model.ProductLimitSale;
import com.yoho.ufo.exception.CommonException;
import com.yoho.ufo.order.constant.Constant;
import com.yoho.ufo.order.constant.OrderConfigConstant;
import com.yoho.ufo.order.request.OrderOperateTask;
import com.yoho.ufo.order.request.SaveQualityCheckInfoRequest;
import com.yoho.ufo.order.service.IBuyerOrderService;
import com.yoho.ufo.service.impl.UfoServiceCaller;
import com.yoho.ufo.service.impl.UserHelper;
import com.yoho.ufo.service.model.PageResponseBO;
import com.yoho.ufo.util.DateUtil;
import com.yoho.ufo.util.ImagesConstant;
import com.yoho.ufo.util.ImagesHelper;
import com.yoho.ufo.util.ListUtil;
import com.yoho.ufo.util.MobileHelper;
import com.yoho.ufo.util.OrderVideoUrlUtil;
import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
import com.yohobuy.ufo.model.order.common.EnumExpressType;
import com.yohobuy.ufo.model.order.common.EnumQualityCheckStatus;
... ... @@ -2824,6 +2829,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
resp.setGoodsPrice(String.format("%.2f", buyerGoodsMap.get(item.getOrderCode()).getGoodsPrice().doubleValue()));
resp.setStatusStr(Constant.convertOrderStatusStr(item.getStatus()));
resp.setStatus(item.getStatus());
resp.setButton(getOrderBtnInfo(item.getStatus()));
resp.setAttributes(item.getAttributes());
resp.setAttributesStr(OrderConfigConstant.getOrderAttributeStr(item.getAttributes()));
... ... @@ -2833,6 +2839,16 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
return respList;
}
private String getOrderBtnInfo(Byte status){
if(status.equals(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal())){
return "confirmReceive";
}else if(status.equals(Constant.CS_CANCEL_BEFORE_DEPOT_RECEIVE.getByteVal())){
return "reback";
}else {
return "";
}
}
private List<Byte> getStatusListByNavStatus(Integer navStatus) {
switch (navStatus) {
case 1:
... ...