ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 0bf7939c677593c622564e999df5a5a23bbca861 2 parents 334fe454 f034baa0

Merge branch 'hotfix_getWaybillCode_20190505' into hotfix_areacode

Inline Side-by-side
Showing 1 changed file with 6 additions and 0 deletions
@@ -18,6 +18,7 @@ import com.yoho.ufo.dal.IdentifyRecordsMapper; @@ -18,6 +18,7 @@ import com.yoho.ufo.dal.IdentifyRecordsMapper;
18 import com.yoho.ufo.dal.ProductMapper; 18 import com.yoho.ufo.dal.ProductMapper;
19 import com.yoho.ufo.dal.model.IdentifyRecords; 19 import com.yoho.ufo.dal.model.IdentifyRecords;
20 import com.yoho.ufo.dal.model.Product; 20 import com.yoho.ufo.dal.model.Product;
  21 +import com.yoho.ufo.exception.CommonException;
21 import com.yoho.ufo.order.constant.Constant; 22 import com.yoho.ufo.order.constant.Constant;
22 import com.yoho.ufo.order.constant.OrderConfigConstant; 23 import com.yoho.ufo.order.constant.OrderConfigConstant;
23 import com.yoho.ufo.order.request.SaveQualityCheckInfoRequest; 24 import com.yoho.ufo.order.request.SaveQualityCheckInfoRequest;
@@ -26,6 +27,7 @@ import com.yoho.ufo.service.impl.UfoServiceCaller; @@ -26,6 +27,7 @@ import com.yoho.ufo.service.impl.UfoServiceCaller;
26 import com.yoho.ufo.service.impl.UserHelper; 27 import com.yoho.ufo.service.impl.UserHelper;
27 import com.yoho.ufo.service.model.PageResponseBO; 28 import com.yoho.ufo.service.model.PageResponseBO;
28 import com.yoho.ufo.util.*; 29 import com.yoho.ufo.util.*;
  30 +import com.yohobuy.ufo.model.enums.ProductSkupStatusEnum;
29 import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo; 31 import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
30 import com.yohobuy.ufo.model.order.common.*; 32 import com.yohobuy.ufo.model.order.common.*;
31 import com.yohobuy.ufo.model.order.req.BuyerOrderMetaUpdateReq; 33 import com.yohobuy.ufo.model.order.req.BuyerOrderMetaUpdateReq;
@@ -1717,6 +1719,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1717,6 +1719,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1717 return null; 1719 return null;
1718 } 1720 }
1719 1721
  1722 + if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal())) {//平台已发货
  1723 + throw new CommonException(500, "状态异常,当前状态是"+Constant.convertOrderStatusStr(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal()));
  1724 + }
  1725 +
1720 //查询buyer_order_goods 1726 //查询buyer_order_goods
1721 List<BuyerOrderGoods> goodsList = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(buyerOrder.getOrderCode())); 1727 List<BuyerOrderGoods> goodsList = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(buyerOrder.getOrderCode()));
1722 if(CollectionUtils.isEmpty(goodsList)) { 1728 if(CollectionUtils.isEmpty(goodsList)) {