ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 49f04a05217435199bb742a6ac97d8daf43ecee9 2 parents 0bf7939c 0cb23772

Merge branch 'hotfix_getWaybillCode_20190505' into hotfix_areacode

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
@@ -1719,10 +1719,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1719,10 +1719,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1719 return null; 1719 return null;
1720 } 1720 }
1721 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 -  
1726 //查询buyer_order_goods 1722 //查询buyer_order_goods
1727 List<BuyerOrderGoods> goodsList = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(buyerOrder.getOrderCode())); 1723 List<BuyerOrderGoods> goodsList = buyerOrderGoodsMapper.selectByOrderCode(Lists.newArrayList(buyerOrder.getOrderCode()));
1728 if(CollectionUtils.isEmpty(goodsList)) { 1724 if(CollectionUtils.isEmpty(goodsList)) {
@@ -1884,6 +1880,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1884,6 +1880,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1884 JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue()); 1880 JSONObject sellerMetaValue = JSONObject.parseObject(sellerMeta.getMetaValue());
1885 buildAddressInfo(sellerMetaValue, jsonObj, buyerOrder.getSellerUid()); 1881 buildAddressInfo(sellerMetaValue, jsonObj, buyerOrder.getSellerUid());
1886 jsonObj.put("receiverType", "seller"); 1882 jsonObj.put("receiverType", "seller");
  1883 + }else {
  1884 + throw new CommonException(500, "状态异常,当前状态是"+Constant.convertOrderStatusStr(buyerOrder.getStatus()));
1887 } 1885 }
1888 1886
1889 return jsonObj; 1887 return jsonObj;