Authored by chenchao

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

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java
... ... @@ -129,7 +129,8 @@ public class ProductProxyService {
return ppc;
}
public PrdPrice getPrdPriceRange(int storageId){
public PrdPrice getPrdPriceRange(Integer uid,
int storageId){
StorageDataResp storage = getStorageData(storageId);
Integer productId=null;
if (Objects.isNull(storage) || Objects.isNull(productId=storage.getProductId()) || productId == 0){
... ... @@ -158,6 +159,8 @@ public class ProductProxyService {
.suggestMinPrice(storage.getSuggestLowPrice())
.leastPrice(storage.getLeastPrice())
.preSaleLeastPrice(storage.getPreSaleLeastPrice())
.goodsPaymentRate(productInfo.getSellerServiceFeeRate())
.canPublish(productInfo.isSellerCanPublish())
.build();
return prdPrice;
}
... ...