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