Authored by mali

Merge branch 'hotfix_getWaybillCode_20190505' into hotfix_areacode

... ... @@ -18,6 +18,7 @@ import com.yoho.ufo.dal.IdentifyRecordsMapper;
import com.yoho.ufo.dal.ProductMapper;
import com.yoho.ufo.dal.model.IdentifyRecords;
import com.yoho.ufo.dal.model.Product;
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.SaveQualityCheckInfoRequest;
... ... @@ -26,6 +27,7 @@ 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.*;
import com.yohobuy.ufo.model.enums.ProductSkupStatusEnum;
import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
import com.yohobuy.ufo.model.order.common.*;
import com.yohobuy.ufo.model.order.req.BuyerOrderMetaUpdateReq;
... ... @@ -1717,6 +1719,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
return null;
}
if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal())) {//平台已发货
throw new CommonException(500, "状态异常,当前状态是"+Constant.convertOrderStatusStr(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal()));
}
//查询buyer_order_goods
List<BuyerOrderGoods> goodsList = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(buyerOrder.getOrderCode()));
if(CollectionUtils.isEmpty(goodsList)) {
... ...