Merge branch 'develop' into develop2

src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -966,9 +966,27 @@ public class itemgroup extends Controller {
             } 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"));
+                        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.getGraderateprice();
+                                }
+
+                            }else{
+                                price = itemPrice.getGraderateprice();
+                            }
+                        }else{
+                            price = itemPrice.getGraderateprice();
+                        }
+
+                        row.put("gradeprice",price);
+                        row.put("price",itemPrice.getGraderateprice());
                     }else{
                         row.put("gradeprice",0);
+                        row.put("price",0);
                     }
                 }else {
                     row.put("gradeprice", 0);