修复分段价格大小写问题

src/main/java/com/uas/platform/b2c/prod/commodity/model/GoodsQtyPrice.java

@@ -23,22 +23,22 @@ public class GoodsQtyPrice {
 	/**
 	 * 人民币含税价格(默认含税17%)，单位元
 	 */
-	private Double RMBPrice;
+	private Double rMBPrice;
 
 	/**
 	 * 人民币未税价格，单位元
 	 */
-	private Double RMBNTPrice;
+	private Double rMBNTPrice;
 
 	/**
 	 * 美元价含税格(默认含税0%)，单位美元
 	 */
-	private Double USDPrice;
+	private Double uSDPrice;
 
 	/**
 	 * 美元未税价格，单位美元
 	 */
-	private Double USDNTPrice;
+	private Double uSDNTPrice;
 
 	// price和taxprice作兼容使用
 	/**
@@ -73,9 +73,9 @@ public class GoodsQtyPrice {
 	
 	public Double getPrice(String currencyName) {
 		if("USD".equals(currencyName)) {
-			return USDNTPrice;
+			return uSDNTPrice;
 		}else {
-			return RMBNTPrice;
+			return rMBNTPrice;
 		}
 	}
 
@@ -89,9 +89,9 @@ public class GoodsQtyPrice {
 	
 	public Double getTaxPrice(String currencyName) {
 		if("USD".equalsIgnoreCase(currencyName)) {//返回
-			return USDPrice;
+			return uSDPrice;
 		}else {
-			return RMBPrice;
+			return rMBPrice;
 		}
 	}
 
@@ -100,45 +100,45 @@ public class GoodsQtyPrice {
 	}
 
 	public Double getRMBPrice() {
-		return RMBPrice;
+		return rMBPrice;
 	}
 
 	public void setRMBPrice(Double RMBPrice) {
-		this.RMBPrice = RMBPrice;
+		this.rMBPrice = RMBPrice;
 	}
 
 	public Double getRMBNTPrice() {
-		return RMBNTPrice;
+		return rMBNTPrice;
 	}
 
 	public void setRMBNTPrice(Double RMBNTPrice) {
-		this.RMBNTPrice = RMBNTPrice;
+		this.rMBNTPrice = RMBNTPrice;
 	}
 
 	public Double getUSDPrice() {
-		return USDPrice;
+		return uSDPrice;
 	}
 
 	public void setUSDPrice(Double USDPrice) {
-		this.USDPrice = USDPrice;
+		this.uSDPrice = USDPrice;
 	}
 
 	public Double getUSDNTPrice() {
-		return USDNTPrice;
+		return uSDNTPrice;
 	}
 
 	public void setUSDNTPrice(Double USDNTPrice) {
-		this.USDNTPrice = USDNTPrice;
+		this.uSDNTPrice = USDNTPrice;
 	}
 
 	// TODO huxz 根据币别进行转换
 	public GoodsQtyPriceUas converDetailUas() {
 		GoodsQtyPriceUas uasdt = new GoodsQtyPriceUas();
 		uasdt.setStart(this.start);
-		uasdt.setRMBNTPrice(this.RMBNTPrice);
-		uasdt.setRMBPrice(this.RMBPrice);
-		uasdt.setUSDNTPrice(this.USDNTPrice);
-		uasdt.setUSDPrice(this.USDPrice);
+		uasdt.setRMBNTPrice(this.rMBNTPrice);
+		uasdt.setRMBPrice(this.rMBPrice);
+		uasdt.setUSDNTPrice(this.uSDNTPrice);
+		uasdt.setUSDPrice(this.uSDPrice);
 		uasdt.setEnd(this.end);
 		return uasdt;
 	}
@@ -148,10 +148,10 @@ public class GoodsQtyPrice {
 		return "GoodsQtyPrice{" +
 				"start=" + start +
 				", end=" + end +
-				", RMBPrice=" + RMBPrice +
-				", RMBNTPrice=" + RMBNTPrice +
-				", USDPrice=" + USDPrice +
-				", USDNTPrice=" + USDNTPrice +
+				", RMBPrice=" + rMBPrice +
+				", RMBNTPrice=" + rMBNTPrice +
+				", USDPrice=" + uSDPrice +
+				", USDNTPrice=" + uSDNTPrice +
 				", price=" + price +
 				", taxPrice=" + taxPrice +
 				'}';

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_onSaleCtrl.js

@@ -94,7 +94,7 @@ define([ 'app/app' ], function(app) {
                 }else if(qty < price.end) {
                     var end = price.end;
                     price.end = qty - 1;
-                    var obj = {start : qty, end : end, RMBPrice : null, USDPrice : null};
+                    var obj = {start : qty, end : end, rMBPrice : null, uSDPrice : null};
                     commodity.editPrices.splice(i + 1 , 0 , obj);
                     $scope.$$onSale.qty = null;
                     return ;
@@ -456,19 +456,19 @@ define([ 'app/app' ], function(app) {
                 }
                 //目前系统中存在双币别，与现有的逻辑冲突，暂时先用企业地址确定币别
                 if($scope.$$onSale.currency.indexOf('USD') > -1) {
-                    if(!price.USDPrice) {
+                    if(!price.uSDPrice) {
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价($)为空，请填写后再次提交！');
                         return result;
-                    }else if(isNaN(price.USDPrice)){
+                    }else if(isNaN(price.uSDPrice)){
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价($)信息必须是数字');
                         return result;
                     }
                 }
                 if($scope.$$onSale.currency.indexOf('RMB') > -1) {
-                    if(!price.RMBPrice) {
+                    if(!price.rMBPrice) {
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价(￥)为空，请填写后再次提交！');
                         return result;
-                    }else if(isNaN(price.RMBPrice)){
+                    }else if(isNaN(price.rMBPrice)){
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价(￥)信息必须是数字');
                         return result;
                     }
@@ -490,17 +490,17 @@ define([ 'app/app' ], function(app) {
             }else if(isNaN(num)){
                 toaster.pop('warning', '价格的信息必须只能包含数字');
                 if(isRMB) {
-                    price.RMBPrice = null;
+                    price.rMBPrice = null;
                 }else {
-                    price.USDPrice = null;
+                    price.uSDPrice = null;
                 }
                 return ;
             }else if(Number(num) <= 0) {
                 toaster.pop('warning', '价格的信息必须是大于零的数字');
                 if(isRMB) {
-                    price.RMBPrice = null;
+                    price.rMBPrice = null;
                 }else {
-                    price.USDPrice = null;
+                    price.uSDPrice = null;
                 }
                 return ;
             }

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_standard_putOn_ctrl.js

@@ -177,8 +177,8 @@ define(['app/app'], function (app) {
                 var obj = {
                     start : 1,
                     end : getMaxNumber(toBeSale, standard.editMinBuyQty),
-                    RMBPrice : null,
-                    USDPrice : null
+                    rMBPrice : null,
+                    uSDPrice : null
                 }
                 standard.editQtyPrices.push(obj);
             }else {
@@ -225,7 +225,7 @@ define(['app/app'], function (app) {
                 }else if(qty < price.end) {
                     var end = price.end;
                     price.end = qty -1;
-                    var obj = {start : qty, end : end, RMBPrice : null, USDPrice : null};
+                    var obj = {start : qty, end : end, rMBPrice : null, uSDPrice : null};
                     standard.editQtyPrices.splice(i + 1 , 0 , obj);
                     standard.insertQty = null;
                     return ;
@@ -479,25 +479,25 @@ define(['app/app'], function (app) {
                 }
                 //目前系统中存在双币别，与现有的逻辑冲突，暂时先用企业地址确定币别
                 if($scope.$$putOn.currency.indexOf('USD') > -1) {
-                    if(!fragments[i].USDPrice) {
+                    if(!fragments[i].uSDPrice) {
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价($)为空，请填写后再次提交！');
                         return result;
-                    }else if(isNaN(fragments[i].USDPrice)){
+                    }else if(isNaN(fragments[i].uSDPrice)){
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价($)信息必须是数字');
                         return result;
-                    }else if(Number(fragments[i].USDPrice) < 0) {
+                    }else if(Number(fragments[i].uSDPrice) < 0) {
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价($)信息必须是大于零的数字');
                         return result;
                     }
                 }
                 if($scope.$$putOn.currency.indexOf('RMB') > -1) {
-                    if(!fragments[i].RMBPrice) {
+                    if(!fragments[i].rMBPrice) {
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价(￥)为空，请填写后再次提交！');
                         return result;
-                    }else if(isNaN(fragments[i].RMBPrice)){
+                    }else if(isNaN(fragments[i].rMBPrice)){
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价(￥)信息必须是数字');
                         return result;
-                    }else if(Number(fragments[i].RMBPrice) < 0) {
+                    }else if(Number(fragments[i].rMBPrice) < 0) {
                         toaster.pop('warning', '第' +(i + 1)+'个分段的单价(￥)信息必须是大于零的数字');
                         return result;
                     }
@@ -519,17 +519,17 @@ define(['app/app'], function (app) {
             }else if(isNaN(num)){
                 toaster.pop('warning', '价格的信息必须只能包含数字');
                 if(isRMB) {
-                    price.RMBPrice = null;
+                    price.rMBPrice = null;
                 }else {
-                    price.USDPrice = null;
+                    price.uSDPrice = null;
                 }
                 return ;
             }else if(Number(num) <= 0) {
                 toaster.pop('warning', '价格的信息必须是大于零的数字');
                 if(isRMB) {
-                    price.RMBPrice = null;
+                    price.rMBPrice = null;
                 }else {
-                    price.USDPrice = null;
+                    price.uSDPrice = null;
                 }
                 return ;
             }

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

@@ -782,8 +782,8 @@
                             </td>
                             <td>
                                 <div ng-repeat="price in commodity.prices">
-                                    <span ng-if="$$onSale.currency == 'RMB'" style="margin-left: 20px;" ng-bind="price.RMBPrice | formateNumber : 6 | currencySysmbol : $$onSale.currency">0.52</span>
-                                    <span ng-if="$$onSale.currency == 'USD'" style="margin-left: 20px;" ng-bind="price.USDPrice | formateNumber : 6 | currencySysmbol : $$onSale.currency">0.52</span>
+                                    <span ng-if="$$onSale.currency == 'RMB'" style="margin-left: 20px;" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : $$onSale.currency">0.52</span>
+                                    <span ng-if="$$onSale.currency == 'USD'" style="margin-left: 20px;" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : $$onSale.currency">0.52</span>
                                 </div>
                             </td>
                             <td>
@@ -870,8 +870,8 @@
                             <td>
                                 <div ng-repeat="price in commodity.editPrices" class="price">
                                     <span>
-                                        <input ng-if="$$onSale.currency == 'RMB'" type="text" placeholder="单价(含税)￥)" ng-blur="validPrice(price, price.RMBPrice, true)" ng-model="price.RMBPrice" class="width82 form-control"/>
-                                        <input ng-if="$$onSale.currency == 'USD'" type="text" placeholder="单价($)" ng-blur="validPrice(price, price.USDPrice, false)" ng-model="price.USDPrice" class="width82 form-control"/>
+                                        <input ng-if="$$onSale.currency == 'RMB'" type="text" placeholder="单价(含税)￥)" ng-blur="validPrice(price, price.rMBPrice, true)" ng-model="price.rMBPrice" class="width82 form-control"/>
+                                        <input ng-if="$$onSale.currency == 'USD'" type="text" placeholder="单价($)" ng-blur="validPrice(price, price.uSDPrice, false)" ng-model="price.uSDPrice" class="width82 form-control"/>
                                     </span>
                                     <a class="delete" title="删除" ng-click="deleteFragment(commodity, $index)" ng-if="commodity.editPrices.length != 1"><i class="fa fa-trash"></i></a>
                                 </div>

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

@@ -431,8 +431,8 @@
                         </td>
                         <td>
                             <div ng-repeat="price in standard.qtyPrices">
-                               <span ng-if="standard.currency == 'RMB'" ng-bind="price.RMBPrice | formateNumber : 6 | currencySysmbol : standard.currency"></span>
-                               <span ng-if="standard.currency == 'USD'" ng-bind="price.USDPrice | formateNumber : 6 | currencySysmbol : standard.currency"></span>
+                               <span ng-if="standard.currency == 'RMB'" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : standard.currency"></span>
+                               <span ng-if="standard.currency == 'USD'" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : standard.currency"></span>
                                 <span ng-if="!standard.currency">-</span>
                             </div>
                             <div ng-if="!standard.qtyPrices.length">-</div>
@@ -535,8 +535,8 @@
                         <td>
                             <div class="price" ng-repeat="price in standard.editQtyPrices">
                                 <span class="price-input">
-                                    <span ng-if="standard.currency == 'USD'">$</span><input ng-blur="validPrice(price, price.USDPrice, false)" ng-if="standard.currency == 'USD'" type="text" class="form-control" ng-model="price.USDPrice" style="width: 65px;" placeholder="单价($)">
-                                    <span ng-if="standard.currency == 'RMB'">￥</span><input ng-blur="validPrice(price, price.RMBPrice, true)" ng-if="standard.currency == 'RMB'" type="text" class="form-control" ng-model="price.RMBPrice" style="width: 65px;" placeholder="单价(￥)">
+                                    <span ng-if="standard.currency == 'USD'">$</span><input ng-blur="validPrice(price, price.uSDPrice, false)" ng-if="standard.currency == 'USD'" type="text" class="form-control" ng-model="price.uSDPrice" style="width: 65px;" placeholder="单价($)">
+                                    <span ng-if="standard.currency == 'RMB'">￥</span><input ng-blur="validPrice(price, price.rMBPrice, true)" ng-if="standard.currency == 'RMB'" type="text" class="form-control" ng-model="price.rMBPrice" style="width: 65px;" placeholder="单价(￥)">
                                 </span>
                                 <a ng-if="standard.editQtyPrices.length != 1" class="delete" title="删除" ng-click="deleteFragment(standard, $index)"><i class="fa fa-trash"></i></a>
                             </div>