Merge branch 'develop' into develop2

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

@@ -775,11 +775,13 @@ public class OrderItemsHelper extends BaseClass {
             case "标准订单":
                 if(siteid.equalsIgnoreCase("ccyosg")){
                     if(itemPrice.getQinminPrice().compareTo(BigDecimal.ZERO)>0){
-                        if(itemPrice.getGraderateprice().compareTo(itemPrice.getQinminPrice())>0){
-
+                        if(itemPrice.getQinminPrice().compareTo(itemPrice.getGraderateprice())<=0){
+                            price =itemPrice.getQinminPrice();
+                            item.put("remarks","亲民价;"+item.getStringValue("remarks"));
+                        }else{
+                            price = itemPrice.getGraderateprice();
                         }
-                        price = (itemPrice.getGraderateprice().compareTo(itemPrice.getQinminPrice())<0)?itemPrice.getGraderateprice():itemPrice.getQinminPrice();
-                        item.put("remarks","亲民价;"+item.getStringValue("remarks"));
+
                     }else{
                         price = itemPrice.getGraderateprice();
                     }