Authored by mali

Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.2

@@ -154,8 +154,8 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -154,8 +154,8 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
154 ProductProxyService.PrdPrice prdPrice = sellerOrderPrepareProcessor.checkPrice(storageId, salePrice); 154 ProductProxyService.PrdPrice prdPrice = sellerOrderPrepareProcessor.checkPrice(storageId, salePrice);
155 try { 155 try {
156 sellerOrderPrepareProcessor.checkSuggestPrice(prdPrice, salePrice); 156 sellerOrderPrepareProcessor.checkSuggestPrice(prdPrice, salePrice);
157 - }catch (Exception ex){  
158 - tips = ex.getMessage(); 157 + }catch (UfoServiceException ex){
  158 + tips = ex.getErrorMessage();
159 } 159 }
160 160
161 SoldPrdComputeBo spc = buildSoldPrdComputeBo(uid, num, salePrice); 161 SoldPrdComputeBo spc = buildSoldPrdComputeBo(uid, num, salePrice);
@@ -107,8 +107,8 @@ public class ChangePricePrepareProcessor { @@ -107,8 +107,8 @@ public class ChangePricePrepareProcessor {
107 prdPrice = sellerOrderPrepareProcessor.checkPrice(storageId, salePrice); 107 prdPrice = sellerOrderPrepareProcessor.checkPrice(storageId, salePrice);
108 try { 108 try {
109 sellerOrderPrepareProcessor.checkSuggestPrice(prdPrice, salePrice); 109 sellerOrderPrepareProcessor.checkSuggestPrice(prdPrice, salePrice);
110 - }catch (Exception ex){  
111 - tips = ex.getMessage(); 110 + }catch (UfoServiceException ex){
  111 + tips = ex.getErrorMessage();
112 } 112 }
113 // compute every fee from price 113 // compute every fee from price
114 SellerOrderComputeResult computeResult = computeHandler.compute(salePrice); 114 SellerOrderComputeResult computeResult = computeHandler.compute(salePrice);
@@ -134,8 +134,8 @@ public class SellerOrderPrepareProcessor { @@ -134,8 +134,8 @@ public class SellerOrderPrepareProcessor {
134 134
135 try { 135 try {
136 checkSuggestPrice(prdPrice, salePrice); 136 checkSuggestPrice(prdPrice, salePrice);
137 - }catch (Exception ex){  
138 - context.setPriceOverFlowTips( ex.getMessage()); 137 + }catch (UfoServiceException ex){
  138 + context.setPriceOverFlowTips( ex.getErrorMessage());
139 } 139 }
140 140
141 // compute every fee from price 141 // compute every fee from price