Merge branch 'develop' into develop2

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

@@ -250,9 +250,26 @@ public class itemgroup 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.getGraderateprice();
+                        }
+
+                    }else{
+                        price = itemPrice.getGraderateprice();
+                    }
+                }else{
+                    price = itemPrice.getGraderateprice();
+                }
+                row.put("gradeprice", price);
+                row.put("price", itemPrice.getGraderateprice());
             } else {
                 row.put("gradeprice", itemPrice.getMarketprice());
+                row.put("price", itemPrice.getMarketprice());
             }
         }
         RowsMap itemRowsMap = itemrows.toRowsMap("itemid");