Merge branch 'develop' into develop2

src/custom/beans/itemprice/ItemPrice.java

@@ -4,7 +4,6 @@ import beans.itemclass.ItemClass;
 import common.BaseClass;
 import common.Controller;
 import common.YosException;
-import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
 import utility.tools.Encryption;
@@ -20,7 +19,6 @@ public class ItemPrice extends BaseClass {
     private long sys_enterpriseid = -1;//企业id
     private long itemid;//商品id
     private BigDecimal marketprice = new BigDecimal(-1);//牌价，市场价
-    private BigDecimal qinminprice = new BigDecimal(-1);//牌价，市场价
     private int pricegrade = 0;//价格等级
     private BigDecimal price = new BigDecimal(-1);//等级价格（商品原价）
     private BigDecimal gradediscountrate = new BigDecimal(0);//商户等级折扣率
@@ -57,27 +55,6 @@ public class ItemPrice extends BaseClass {
         return marketprice;
     }
 
-    /**
-     * 获取商品亲民价
-     *
-     * @return
-     */
-    public BigDecimal getQinminPrice() throws YosException {
-        if (qinminprice.floatValue() < 0) {
-            SQLFactory sqlFactory = new SQLFactory(this, "商品亲民价格查询");
-            sqlFactory.addParameter("siteid", controller.siteid);
-            sqlFactory.addParameter("itemid", itemid);
-            Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-            if (rows.isNotEmpty()) {
-                qinminprice = rows.get(0).getBigDecimal("price");
-            } else {
-                //throw new YosException("找不到商品等级价格信息itemid：" + itemid);
-                qinminprice =BigDecimal.ZERO;
-            }
-        }
-        return qinminprice;
-    }
-
     /**
      * 商品等级价格
      *

src/custom/beans/itemprice/SQL/商品亲民价格查询.sql

@@ -1,5 +0,0 @@
-select t1.pricegrade,t1.price
-from sa_itemprice t1
-where t1.siteid = $siteid$
-  and t1.itemid = $itemid$
-  and t1.pricegrade = 6

src/custom/restcontroller/sale/favorites/favorites.java

@@ -133,35 +133,16 @@ public class favorites 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)) {
-                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.getContractprice();
-                        }
-
-                    }else{
-                        price = itemPrice.getContractprice();
-                    }
-                }else{
-                    price = itemPrice.getContractprice();
-                }
-                row.put("gradeprice", price);
-                row.put("price", itemPrice.getContractprice());
+                row.put("gradeprice", 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);
                 }
             }
             //定制信息

src/custom/restcontroller/sale/itemgroup/SQL/查询授权范围内的商品组商品.sql

@@ -1,4 +1,4 @@
-SELECT t1.sa_itemgroupid,max(if(t1.siteid='ccyosg',(if(ifnull(t8.price,0)!=0 && t8.price<=t7.price,t8.price,t7.price)),t7.price)) maxprice,min(if(t1.siteid='ccyosg',(if(ifnull(t8.price,0)!=0 && t8.price<=t7.price,t8.price,t7.price)),t7.price)) minprice
+SELECT t1.sa_itemgroupid,max(t7.price) maxprice,min(t7.price) minprice
 FROM sa_itemgroupmx t1
          LEFT JOIN plm_item t2 ON t1.itemno = t2.itemno
     AND t1.siteid = t2.siteid
@@ -9,6 +9,5 @@ FROM sa_itemgroupmx t1
          LEFT JOIN plm_unit t6 ON t6.unitid = t2.unitid
     AND t6.siteid = t2.siteid
          left join sa_itemprice t7 on t2.itemid = t7.itemid and t7.pricegrade = $pricegrade$
-         left join sa_itemprice t8 on t2.itemid = t8.itemid and t8.pricegrade =6
 where t5.itemclassid in $itemclassid$ and t1.siteid=$siteid$ and ifnull(t2.isonsale,0)=1
 group by t1.sa_itemgroupid

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

@@ -250,26 +250,9 @@ 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)) {
-                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();
-                    }
-                }else{
-                    price = itemPrice.getGraderateprice();
-                }
-                row.put("gradeprice", price);
-                row.put("price", itemPrice.getGraderateprice());
+                row.put("gradeprice", itemPrice.getContractprice());
             } else {
                 row.put("gradeprice", itemPrice.getMarketprice());
-                row.put("price", itemPrice.getMarketprice());
             }
         }
         RowsMap itemRowsMap = itemrows.toRowsMap("itemid");
@@ -962,35 +945,16 @@ 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)) {
-                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.getContractprice();
-                        }
-
-                    }else{
-                        price = itemPrice.getContractprice();
-                    }
-                }else{
-                    price = itemPrice.getContractprice();
-                }
-                row.put("gradeprice", price);
-                row.put("price",itemPrice.getContractprice());
+                row.put("gradeprice", 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);
                 }
             }
 

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -322,35 +322,18 @@ public class ShoppingCart extends Controller {
                         row.put("gradeprice", itemPrice.getPromotionPrice(content.getLongValue("sa_promotionid")));
                     }
                 } else {
-                    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.getContractprice();
-                            }
-
-                        }else{
-                            price = itemPrice.getContractprice();
-                        }
-                    }else{
-                        price = itemPrice.getContractprice();
-                    }
                     if (row.getBoolean("iscustomsize") && row.getLong("pricingmetod") == 1) {
-                        row.put("gradeprice", price.multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
-                        row.put("price", itemPrice.getContractprice().multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
+                        row.put("gradeprice", itemPrice.getContractprice().multiply(row.getBigDecimal("length").multiply(row.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP)));
                     } else {
-                        row.put("gradeprice", price);
-                        row.put("price", itemPrice.getContractprice());
+                        row.put("gradeprice", itemPrice.getContractprice());
                     }
                 }
+
 //                row.put("gradeprice", istool == 0 ?itemPrice.getContractprice():itemPrice.getMarketprice());
             } catch (Exception e) {
                 e.printStackTrace();
                 row.put("oldprice", 0);
                 row.put("gradeprice", 0);
-                row.put("price", 0);
             }
             row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             //定制信息

src/custom/restcontroller/webmanage/role/SQL/应用授权选择.sql

@@ -5,5 +5,4 @@ from sys_system t1
          inner join sys_systemapp t4 on t3.systemmoduleid = t4.systemmoduleid and t4.isused = 1 and t4.isneedauth = 1
 where t1.isused = 1
   and $where$
-  and exists(select optionid from sys_systemapp_options where systemappid = t4.systemappid)
- and t4.systemappid in $systemappid$
+  and exists(select optionid from sys_systemapp_options where systemappid = t4.systemappid)

src/custom/restcontroller/webmanage/role/role.java

@@ -1,6 +1,5 @@
 package restcontroller.webmanage.role;
 
-import beans.version.Version;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
@@ -221,7 +220,6 @@ public class role extends Controller {
         }
         SQLFactory appselectsql = new SQLFactory(this, "应用授权选择", pageSize, pageNumber, pageSorting);
         appselectsql.addParameter_SQL("where", where);
-        appselectsql.addParameter_in("systemappid",  Version.getApps(this));
         Rows approws = dbConnect.runSqlQuery(appselectsql);
         return getSucReturnObject().setData(approws).toString();
     }

src/custom/restcontroller/webmanage/sale/itempriceadjust/ExportExcel.java

@@ -111,7 +111,7 @@ public class ExportExcel {
         sheet.setColumnWidth((short) 4, (short) 8500);
         sheet.setColumnWidth((short) 5, (short) 8500);
         sheet.setColumnWidth((short) 6, (short) 8500);
-        sheet.setColumnWidth((short) 7, (short) 8500);
+
 
     }
 
@@ -130,7 +130,6 @@ public class ExportExcel {
         sheet.setColumnWidth((short) 5, (short) 8500);
         sheet.setColumnWidth((short) 6, (short) 8500);
         sheet.setColumnWidth((short) 7, (short) 8500);
-        sheet.setColumnWidth((short) 8, (short) 8500);
 
     }
 
@@ -166,7 +165,7 @@ public class ExportExcel {
         cellStyle2.setWrapText(true);
 
         /*第一行*/
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
 
         /*第一行塞值*/
         row = sheet.createRow(0);
@@ -174,7 +173,7 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle4);
         cell.setCellValue("商品调价单导入");
         /*第二行*/
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 6));
         /*第二行塞值*/
         row = sheet.createRow(1);
         cell = row.createCell(0);// ID
@@ -212,9 +211,7 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle2);
         cell.setCellValue("五级调整价(必填,价格不变时填原价)");
 
-        cell = row.createCell(7);
-        cell.setCellStyle(cellStyle2);
-        cell.setCellValue("亲民价(非必填)");
+
 
 
         /*第四行塞值*/
@@ -248,9 +245,7 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle3);
         cell.setCellValue("100");
 
-        cell = row.createCell(7);
-        cell.setCellStyle(cellStyle3);
-        cell.setCellValue("100");
+
 
 
     }
@@ -281,7 +276,7 @@ public class ExportExcel {
 
 
         /*第一行*/
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));
 
         /*第一行塞值*/
         row = sheet.createRow(0);
@@ -289,7 +284,7 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle3);
         cell.setCellValue("商品调价单导入");
         /*第二行*/
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 8));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
         /*第二行塞值*/
         row = sheet.createRow(1);
         cell = row.createCell(0);// ID
@@ -326,11 +321,8 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle2);
         cell.setCellValue("五级调整价(必填,价格不变时填原价)");
 
-        cell = row.createCell(7);
-        cell.setCellStyle(cellStyle2);
-        cell.setCellValue("亲民价(非必填)");
 
-        cell = row.createCell(8);
+        cell = row.createCell(7);
         cell.setCellStyle(cellStyle2);
         cell.setCellValue("错误信息");
 

src/custom/restcontroller/webmanage/sale/itempriceadjust/Itempriceadjust.java

@@ -185,10 +185,7 @@ public class Itempriceadjust extends Controller {
             sqlFactory.addParameter("userid", userid);
             sqlFactory.addParameter("price", row.getBigDecimal("price"));
             sqlFactory.addParameter("pricegrade", pricegrade);
-            if(!(pricegrade.equals("6") && row.getBigDecimal("price").compareTo(BigDecimal.ZERO)==0)){
-                sqlList.add(sqlFactory.getSQL());
-            }
-
+            sqlList.add(sqlFactory.getSQL());
         }
         sqlFactory = new SQLFactory(this, "商品价格调整单审核");
         sqlFactory.addParameter("siteid", siteid);

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -140,8 +140,6 @@ public class ItempriceadjustItemprice extends Controller {
             row.put("price4", row.getBigDecimal("price4"));
             row.put("oldprice5", row.getBigDecimal("oldprice5"));
             row.put("price5", row.getBigDecimal("price5"));
-            row.put("oldprice6", row.getBigDecimal("oldprice6"));
-            row.put("price6", row.getBigDecimal("price6"));
         }
         return getSucReturnObject().setData(rows).toString();
     }
@@ -273,7 +271,6 @@ public class ItempriceadjustItemprice extends Controller {
             keys.add("price3");
             keys.add("price4");
             keys.add("price5");
-            keys.add("price6");
 
             HashMap<String, CellType> cellMap = new HashMap<>();
             cellMap.put("itemno", CellType.STRING);
@@ -283,7 +280,6 @@ public class ItempriceadjustItemprice extends Controller {
             cellMap.put("price3", CellType.STRING);
             cellMap.put("price4", CellType.STRING);
             cellMap.put("price5", CellType.STRING);
-            cellMap.put("price6", CellType.STRING);
             Rows rows = e.getSheetRows(0, keys, cellMap, 3);
 
             ArrayList<String> itemnoList = rows.toArrayList("itemno", false);
@@ -360,17 +356,6 @@ public class ItempriceadjustItemprice extends Controller {
                     rowserr.add(row);
                     continue;
                 }
-                if(StringUtils.isBlank("price6")){
-                    row.put("price6",0);
-                }else{
-                    if(!isNumeric(row.getString("price6"))){
-                        iserr = true;
-                        row.put("msg", "亲民价不为数字格式，请检查");
-                        rowserr.add(row);
-                        continue;
-                    }
-                }
-
                 rowssuc.add(row);
 
             }
@@ -402,7 +387,7 @@ public class ItempriceadjustItemprice extends Controller {
                         Rows itemPriceRows = itemPriceRowsMap.get(row.getString("itemid"));
                         pricegrade = itemPriceRows.toRowsMap("pricegrade");
                     }
-                    for (int i = 1; i <= 6; i++) {
+                    for (int i = 1; i <= 5; i++) {
 //                        if (pricegrade.containsKey(String.valueOf(i)) || !row.getString("price" + i).equals("0")) {
                         sqlFactoryupload = new SQLFactory(this, "商品调价单商品价格明细新增");
                         long sa_itempriceadjust_itempriceid = createTableID("sa_itempriceadjust_itemprice");
@@ -444,7 +429,6 @@ public class ItempriceadjustItemprice extends Controller {
                 map.put("price3", "调整价3");
                 map.put("price4", "调整价4");
                 map.put("price5", "调整价5");
-                map.put("price6", "亲民价");
                 map.put("msg", "错误信息");
                 ArrayList<String> colNameList = new ArrayList<String>();
                 HashMap<String, Class> keytypemap = new HashMap<String, Class>();
@@ -455,7 +439,6 @@ public class ItempriceadjustItemprice extends Controller {
                 colNameList.add("price3");
                 colNameList.add("price4");
                 colNameList.add("price5");
-                colNameList.add("price6");
                 colNameList.add("msg");
                 keytypemap.put("itemno", String.class);
                 keytypemap.put("remarks", String.class);
@@ -464,7 +447,6 @@ public class ItempriceadjustItemprice extends Controller {
                 keytypemap.put("price3", BigDecimal.class);
                 keytypemap.put("price4", BigDecimal.class);
                 keytypemap.put("price5", BigDecimal.class);
-                keytypemap.put("price6", BigDecimal.class);
                 keytypemap.put("msg", String.class);
                 rowserr.setFieldList(colNameList);
                 rowserr.setFieldTypeMap(keytypemap);
@@ -508,7 +490,6 @@ public class ItempriceadjustItemprice extends Controller {
         sheet.setDefaultColumnStyle(4, style);
         sheet.setDefaultColumnStyle(5, style);
         sheet.setDefaultColumnStyle(6, style);
-        sheet.setDefaultColumnStyle(7, style);
 
         ExportExcel.setBatchDetailSheetColumn1(sheet);// 设置工作薄列宽
         XSSFCellStyle titleCellStyle1 = ExportExcel.createTitleCellStyle1(xssfFWorkbook);
@@ -679,7 +660,7 @@ public class ItempriceadjustItemprice extends Controller {
                 } else {
                     datarow.createCell(i1).setCellValue(row.getString((String) keylist.get(i1)));
                 }
-                if (i1 == 8) {
+                if (i1 == 7) {
                     datarow.getCell(i1).setCellStyle(xssfCellStyle1);
                 }
             }

src/custom/restcontroller/webmanage/sale/itempriceadjust/SQL/商品调价单商品明细列表情查询.sql

@@ -17,9 +17,7 @@ SELECT t1.sa_itempriceadjust_itemsid,
        t5.oldprice oldprice4,
        t5.price    price4,
        t6.oldprice oldprice5,
-       t6.price    price5,
-       t9.oldprice oldprice6,
-       t9.price price6
+       t6.price    price5
 FROM sa_itempriceadjust_items t1
          LEFT JOIN sa_itempriceadjust_itemprice t2 ON t1.sa_itempriceadjust_itemsid = t2.sa_itempriceadjust_itemsid
     AND t1.siteid = t2.siteid
@@ -36,9 +34,6 @@ FROM sa_itempriceadjust_items t1
          LEFT JOIN sa_itempriceadjust_itemprice t6 ON t1.sa_itempriceadjust_itemsid = t6.sa_itempriceadjust_itemsid
     AND t1.siteid = t6.siteid
     AND t6.pricegrade = 5
-         LEFT JOIN sa_itempriceadjust_itemprice t9 ON t1.sa_itempriceadjust_itemsid = t9.sa_itempriceadjust_itemsid
-    AND t1.siteid = t9.siteid
-    AND t9.pricegrade = 6
          LEFT JOIN plm_item t7 ON t7.siteid = t1.siteid
     AND t7.itemid = t1.itemid
          left join plm_unit t8 on t7.siteid = t8.siteid and t7.unitid = t8.unitid

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

@@ -153,7 +153,7 @@ public class OrderItems extends Controller {
             ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, itemid);
             if (!item.containsKey("defaultprice")) {
                 defaultprice = orderItemsHelper.getDefaultprice(itemPrice);
-                price = orderItemsHelper.getPrice(orderRows.get(0), itemPrice, item, itemRowsMap,siteid);
+                price = orderItemsHelper.getPrice(orderRows.get(0), itemPrice, item, itemRowsMap);
                 saleprice = orderItemsHelper.getSalePrice(orderRows.get(0), itemPrice,item,itemRowsMap);
             } else {
                 defaultprice = item.getBigDecimalValue("defaultprice");
@@ -762,8 +762,6 @@ public class OrderItems extends Controller {
             }
             row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             row.put("contractprice", 0);
-            ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, row.getLong("itemid"));
-            row.put("price1",itemPrice.getGraderateprice());
             //处理日期字段空的情况
             row.putIfAbsent("needdate", "");
             row.putIfAbsent("deliverydate", "");
@@ -1239,26 +1237,9 @@ 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"))) {
-                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);
-                row.put("price1", itemPriceRowsMap.get(row.getLong("itemid")).getGraderateprice());
+                row.put("price", itemPriceRowsMap.get(row.getLong("itemid")).getPrice());
             } else {
                 row.put("price", 0);
-                row.put("price1", 0);
             }
 
             row = customScheme.setScheme(row, "width");

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

@@ -756,39 +756,13 @@ public class OrderItemsHelper extends BaseClass {
 
     }
 
-    public BigDecimal getPrice(Row orderRow, ItemPrice itemPrice, JSONObject item, RowsMap itemRowsMap,String siteid) throws YosException {
+    public BigDecimal getPrice(Row orderRow, ItemPrice itemPrice, JSONObject item, RowsMap itemRowsMap) throws YosException {
         String type = orderRow.getString("type");
         Long sa_promotionid = orderRow.getLong("sa_promotionid");
         BigDecimal price;
         switch (type) {
             case "促销订单":
                 price = itemPrice.getPromotionPrice(sa_promotionid);
-                if (itemRowsMap.containsKey(item.getString("itemid"))) {
-                    if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
-                        if (itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize") && itemRowsMap.get(item.getString("itemid")).get(0).getLong("pricingmetod") == 1) {
-                            price = price.multiply(item.getBigDecimalValue("length").multiply(item.getBigDecimalValue("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP));
-                        }
-
-                    }
-                }
-                break;
-            case "标准订单":
-                if(siteid.equalsIgnoreCase("ccyosg")){
-                    if(itemPrice.getQinminPrice().compareTo(BigDecimal.ZERO)>0){
-                        if(itemPrice.getQinminPrice().compareTo(itemPrice.getGraderateprice())<=0){
-                            price =itemPrice.getQinminPrice();
-                            item.put("remarks","亲民价;"+item.getStringValue("remarks"));
-                        }else{
-                            price = itemPrice.getGraderateprice();
-                        }
-
-                    }else{
-                        price = itemPrice.getGraderateprice();
-                    }
-                }else{
-                    price = itemPrice.getGraderateprice();
-                }
-
                 if (itemRowsMap.containsKey(item.getString("itemid"))) {
                     if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
                         if (itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize") && itemRowsMap.get(item.getString("itemid")).get(0).getLong("pricingmetod") == 1) {