Merge branch 'develop' into develop2

src/custom/restcontroller/sale/itemgroup/SQL/查询商品原价.sql

@@ -1,4 +1,4 @@
 SELECT t1.sa_itemgroupid,t1.itemid,t7.price
 FROM sa_itemgroupmx t1
-         left join sa_itemprice t7 on t1.itemid = t7.itemid and t7.pricegrade = 1
+         left join sa_itemprice t7 on t1.itemid = t7.itemid and t7.pricegrade = $pricegrade$
 where t1.siteid=$siteid$ and t1.sa_itemgroupid=$sa_itemgroupid$

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

@@ -178,7 +178,16 @@ public class itemgroup extends Controller {
         if (enterpriseGrade != null) {
             factorygroupid.addParameter("pricegrade", enterpriseGrade.getPricegrade());
         }else {
-            factorygroupid.addParameter("pricegrade", "1");
+            Rows siteParameterRows =dbConnect.runSqlQuery("select defaultlevelprice from sys_site_parameter where siteid='"+siteid+"'");
+            if(!siteParameterRows.isEmpty()){
+                if(StringUtils.isBlank(siteParameterRows.get(0).getString("defaultlevelprice"))){
+                    factorygroupid.addParameter("pricegrade", "1");
+                }else{
+                    factorygroupid.addParameter("pricegrade", siteParameterRows.get(0).getString("defaultlevelprice"));
+                }
+            }else{
+                factorygroupid.addParameter("pricegrade", "1");
+            }
         }
         Rows rowsgroupids = dbConnect.runSqlQuery(factorygroupid.getSQL());
         RowsMap itemgroupRowMap = rowsgroupids.toRowsMap("sa_itemgroupid");
@@ -373,6 +382,16 @@ public class itemgroup extends Controller {
         SQLFactory priceSqlFactory = new SQLFactory(this, "查询商品原价");
         priceSqlFactory.addParameter("sa_itemgroupid", sa_itemgroupid);
         priceSqlFactory.addParameter("siteid", siteid);
+        Rows siteParameterRows =dbConnect.runSqlQuery("select defaultlevelprice from sys_site_parameter where siteid='"+siteid+"'");
+        if(!siteParameterRows.isEmpty()){
+            if(StringUtils.isBlank(siteParameterRows.get(0).getString("defaultlevelprice"))){
+                priceSqlFactory.addParameter("pricegrade", "1");
+            }else{
+                priceSqlFactory.addParameter("pricegrade", siteParameterRows.get(0).getString("defaultlevelprice"));
+            }
+        }else{
+            priceSqlFactory.addParameter("pricegrade", "1");
+        }
         Rows pricerows = dbConnect.runSqlQuery(priceSqlFactory);
         RowsMap pricerowsMap = pricerows.toRowsMap("itemid");
         for (Row row : rows) {
@@ -932,6 +951,16 @@ public class itemgroup extends Controller {
         SQLFactory priceSqlFactory = new SQLFactory(this, "查询商品原价");
         priceSqlFactory.addParameter("sa_itemgroupid", content.getString("sa_itemgroupid"));
         priceSqlFactory.addParameter("siteid", siteid);
+        Rows siteParameterRows =dbConnect.runSqlQuery("select defaultlevelprice from sys_site_parameter where siteid='"+siteid+"'");
+        if(!siteParameterRows.isEmpty()){
+            if(StringUtils.isBlank(siteParameterRows.get(0).getString("defaultlevelprice"))){
+                priceSqlFactory.addParameter("pricegrade", "1");
+            }else{
+                priceSqlFactory.addParameter("pricegrade", siteParameterRows.get(0).getString("defaultlevelprice"));
+            }
+        }else{
+            priceSqlFactory.addParameter("pricegrade", "1");
+        }
         Rows pricerows = dbConnect.runSqlQuery(priceSqlFactory);
         RowsMap pricerowsMap = pricerows.toRowsMap("itemid");