新增促销价格

src/custom/beans/itemprice/ItemPrice.java

@@ -82,9 +82,9 @@ public class ItemPrice extends BaseClass {
         sqlFactory1.addParameter("itemid", itemid);
         sqlFactory1.addParameter("sys_enterpriseid", this.sys_enterpriseid);
         Rows priceAdjustrows = dbConnect.runSqlQuery(sqlFactory1.getSQL());
-        BigDecimal priceAdjust= new BigDecimal(0);
-        if(!priceAdjustrows.isEmpty()){
-            priceAdjust=priceAdjustrows.get(0).getBigDecimal("priceadjustment");
+        BigDecimal priceAdjust = new BigDecimal(0);
+        if (!priceAdjustrows.isEmpty()) {
+            priceAdjust = priceAdjustrows.get(0).getBigDecimal("priceadjustment");
         }
         return ((priceAdjust.divide(new BigDecimal(100))).add(new BigDecimal(1))).multiply(price);
     }
@@ -171,9 +171,16 @@ public class ItemPrice extends BaseClass {
         }
 
 
+        return contractprice;
+    }
 
+    public BigDecimal getPromotionPrice(long sa_promotionid) throws YosException {
 
-        return contractprice;
+        Rows rows = dbConnect.runSqlQuery("SELECT price from sa_promotion_itemprice WHERE sa_promotionid = " + sa_promotionid + " and siteid='" + controller.siteid + "' and itemid='" + itemid + "'");
+        if (rows.isNotEmpty()) {
+            return rows.get(0).getBigDecimal("price");
+        }
+        return marketprice;
     }
 
     /**

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

@@ -49,16 +49,17 @@ public class OrderItems extends Controller {
     public String insertOrUpdate() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
         Long sys_enterpriseid = content.getLong("sys_enterpriseid");
-        Long sa_contractid = content.getLongValue("sa_contractid");
+//        Long sa_contractid = content.getLongValue("sa_contractid");
         Rows orderRows = getOrderRows(this, sa_orderid);
         if (orderRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("数据不存在，无法添加").toString();
         }
 
-        sa_contractid = orderRows.get(0).getLong("sa_contractid");
+//        sa_contractid = orderRows.get(0).getLong("sa_contractid");
 
         String type = orderRows.get(0).getString("type");
         JSONArray items = content.getJSONArray("items");
+        Long sa_promotionid=orderRows.get(0).getLong("sa_promotionid");
 
 
         ArrayList<String> sqlList = new ArrayList<>();
@@ -130,11 +131,14 @@ public class OrderItems extends Controller {
             ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, itemid);
             if (!item.containsKey("defaultprice")) {
                 switch (type) {
-                    case "项目订单":
-                        defaultprice = itemPrice.getContractprice(sa_contractid);
-                        break;
-                    case "工具订单":
-                        defaultprice = itemPrice.getMarketprice();
+//                    case "项目订单":
+//                        defaultprice = itemPrice.getContractprice(sa_contractid);
+//                        break;
+//                    case "工具订单":
+//                        defaultprice = itemPrice.getMarketprice();
+//                        break;
+                    case "促销订单":
+                        defaultprice = itemPrice.getPromotionPrice(sa_promotionid);
                         break;
                     default:
                         defaultprice = itemPrice.getContractprice();