Merge branch 'develop' into develop2

src/custom/restcontroller/sale/favorites/favorites.java

@@ -133,16 +133,35 @@ public class favorites extends Controller {
             ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, row.getLong("itemid"));
             row.put("oldprice", itemPrice.getPrice());
             if (sys_enterpriseid > 0 || (usertype == 21 || usertype == 22)) {
-                row.put("gradeprice", itemPrice.getContractprice());
+                BigDecimal price;
+                if(siteid.equalsIgnoreCase("ccyosg")){
+                    if(itemPrice.getQinminPrice().compareTo(BigDecimal.ZERO)>0){
+                        if(itemPrice.getQinminPrice().compareTo(itemPrice.getGraderateprice())<=0){
+                            price =itemPrice.getQinminPrice();
+                        }else{
+                            price = itemPrice.getContractprice();
+                        }
+
+                    }else{
+                        price = itemPrice.getContractprice();
+                    }
+                }else{
+                    price = itemPrice.getContractprice();
+                }
+                row.put("gradeprice", price);
+                row.put("price", itemPrice.getContractprice());
             } else {
                 if (pricerowsMap.containsKey(row.getString("itemid"))) {
                     if (pricerowsMap.get(row.getString("itemid")).isNotEmpty()) {
                         row.put("gradeprice", pricerowsMap.get(row.getString("itemid")).get(0).getBigDecimal("price"));
+                        row.put("price", pricerowsMap.get(row.getString("itemid")).get(0).getBigDecimal("price"));
                     } else {
                         row.put("gradeprice", 0);
+                        row.put("price", 0);
                     }
                 } else {
                     row.put("gradeprice", 0);
+                    row.put("price", 0);
                 }
             }
             //定制信息

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

@@ -322,18 +322,35 @@ public class ShoppingCart extends Controller {
                         row.put("gradeprice", itemPrice.getPromotionPrice(content.getLongValue("sa_promotionid")));
                     }
                 } else {
+                    BigDecimal price;
+                    if(siteid.equalsIgnoreCase("ccyosg")){
+                        if(itemPrice.getQinminPrice().compareTo(BigDecimal.ZERO)>0){
+                            if(itemPrice.getQinminPrice().compareTo(itemPrice.getGraderateprice())<=0){
+                                price =itemPrice.getQinminPrice();
+                            }else{
+                                price = itemPrice.getContractprice();
+                            }
+
+                        }else{
+                            price = itemPrice.getContractprice();
+                        }
+                    }else{
+                        price = 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)));
+                        row.put("gradeprice", price.multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
+                        row.put("price", 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", price);
+                        row.put("price", itemPrice.getContractprice());
                     }
                 }
-
 //                row.put("gradeprice", istool == 0 ?itemPrice.getContractprice():itemPrice.getMarketprice());
             } catch (Exception e) {
                 e.printStackTrace();
                 row.put("oldprice", 0);
                 row.put("gradeprice", 0);
+                row.put("price", 0);
             }
             row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             //定制信息