购物车列表查询单价逻辑更新

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -184,11 +184,20 @@ public class ShoppingCart extends Controller {
             try {
                 ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, row.getLong("itemid"));
                 row.put("oldprice",  istool == 0 ?itemPrice.getContractprice():itemPrice.getMarketprice());
-                if(row.getBoolean("iscustomsize") && row.getLong("pricingmetod")==1){
-                    row.put("gradeprice", itemPrice.getContractprice().multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
+                if(content.getLongValue("sa_promotionid")>0){
+                    if(row.getBoolean("iscustomsize") && row.getLong("pricingmetod")==1){
+                        row.put("gradeprice", itemPrice.getPromotionPrice(content.getLongValue("sa_promotionid")).multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
+                    }else{
+                        row.put("gradeprice", itemPrice.getPromotionPrice(content.getLongValue("sa_promotionid")));
+                    }
                 }else{
-                    row.put("gradeprice", itemPrice.getContractprice());
+                    if(row.getBoolean("iscustomsize") && row.getLong("pricingmetod")==1){
+                        row.put("gradeprice", itemPrice.getContractprice().multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
+                    }else{
+                        row.put("gradeprice", itemPrice.getContractprice());
+                    }
                 }
+
 //                row.put("gradeprice", istool == 0 ?itemPrice.getContractprice():itemPrice.getMarketprice());
             } catch (Exception e) {
                 e.printStackTrace();