Authored by chenchao

Merge branch 'dev_6.8.7_order_出售权限' into test6.8.8

@@ -137,8 +137,8 @@ public class ProductProxyService { @@ -137,8 +137,8 @@ public class ProductProxyService {
137 storageId, productId); 137 storageId, productId);
138 throw new UfoServiceException(501, "查无商品"); 138 throw new UfoServiceException(501, "查无商品");
139 } 139 }
  140 + //add uid from 6.8.8
140 ProductDetailResp resp = ufoServiceCaller.call("ufo.product.baseInfo", productId, uid); 141 ProductDetailResp resp = ufoServiceCaller.call("ufo.product.baseInfo", productId, uid);
141 -  
142 ProductInfo productInfo = null; 142 ProductInfo productInfo = null;
143 BigDecimal minPrice,maxPrice; 143 BigDecimal minPrice,maxPrice;
144 if (Objects.isNull(resp) 144 if (Objects.isNull(resp)