楚楚商城亲民价与等级价判断取小的

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

@@ -962,34 +962,35 @@ 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());
-            } else {
-                if(pricerowsMap.containsKey(row.getString("itemid"))){
-                    if(pricerowsMap.get(row.getString("itemid")).isNotEmpty()){
-                        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();
-                            }
+                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();
+                            price = itemPrice.getContractprice();
                         }
 
-                        row.put("gradeprice",price);
-                        row.put("price",itemPrice.getGraderateprice());
+                    }else{
+                        price = itemPrice.getContractprice();
+                    }
+                }else{
+                    price = itemPrice.getContractprice();
+                }
+                row.put("gradeprice", price);
+                row.put("price",itemPrice.getContractprice());
+            } 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"));
+                        row.put("price",pricerowsMap.get(row.getString("itemid")).get(0).getBigDecimal("price"));
                     }else{
                         row.put("gradeprice",0);
                         row.put("price",0);
                     }
                 }else {
                     row.put("gradeprice", 0);
+                    row.put("price", 0);
                 }
             }