Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1237,7 +1237,22 @@ public class OrderItems extends Controller {
             row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             row.put("brand", brandRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             if (itemPriceRowsMap.containsKey(row.getLong("itemid"))) {
-                row.put("price", itemPriceRowsMap.get(row.getLong("itemid")).getPrice());
+                BigDecimal price;
+                if(siteid.equalsIgnoreCase("ccyosg")){
+                    if( itemPriceRowsMap.get(row.getLong("itemid")).getQinminPrice().compareTo(BigDecimal.ZERO)>0){
+                        if( itemPriceRowsMap.get(row.getLong("itemid")).getQinminPrice().compareTo( itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice())<=0){
+                            price = itemPriceRowsMap.get(row.getLong("itemid")).getQinminPrice();
+                        }else{
+                            price =  itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice();
+                        }
+
+                    }else{
+                        price =  itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice();
+                    }
+                }else{
+                    price =  itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice();
+                }
+                row.put("price", price);
             } else {
                 row.put("price", 0);
             }