Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -1357,7 +1357,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			if (RegexConstant.isNumber(firstValue.toString())) {
 				Double cellPrice = Double.valueOf(firstValue.toString());
 				if (validatePrice(cellPrice)) {
-					GoodsQtyPrice qtyPrice = getOneQtyPrice(aProduct.getMinBuyQty(), DoubleConstant.maxMinPackageQty,
+					GoodsQtyPrice qtyPrice = getOneQtyPrice(aProduct.getMinBuyQty(), DoubleConstant.maxReserve,
 							cellPrice, aProduct.getRmbTaxRate(), aProduct.getCurrency());
 					qtyPriceList.add(qtyPrice);
 				} else {
@@ -1413,7 +1413,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		if (start == null || lastEnd == null) {
 			return false;
 		}
-		return start.compareTo(lastEnd) > 0 && start.compareTo(DoubleConstant.maxMinPackageQty) <= 0;
+		return start.compareTo(lastEnd) > 0 && start.compareTo(DoubleConstant.maxReserve) <= 0;
 	}
 
 	/**

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1171,7 +1171,7 @@
 											<div class="clearfix"></div>
 										</li>
 										<li style="font-size: 14px;color: #333;background: #fff;" class='priceInfoList' ng-repeat="price in material.goods.prices">
-											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">{{price.start}}+</span>
+											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc;overflow: hidden;text-overflow: ellipsis;" title="{{price.start}}">{{price.start}}+</span>
 											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice || price.uSDPrice}}">
 												{{!store.enType || store.enType === 'HK' ? '$' : '¥'}}
 												{{price.rMBPrice || price.uSDPrice}}</span>