|
@@ -118,6 +118,7 @@ public class OrderItems extends Controller {
|
|
|
|
|
|
|
|
BigDecimal price1 = new BigDecimal(0);
|
|
BigDecimal price1 = new BigDecimal(0);
|
|
|
SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_新增");
|
|
SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_新增");
|
|
|
|
|
+ JSONArray customproperties=new JSONArray();
|
|
|
if (sa_orderitemsid <= 0) {
|
|
if (sa_orderitemsid <= 0) {
|
|
|
Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid);
|
|
Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid);
|
|
|
if (rows.isEmpty()) {
|
|
if (rows.isEmpty()) {
|
|
@@ -129,7 +130,7 @@ public class OrderItems extends Controller {
|
|
|
sqlFactory = new SQLFactory(this, "订单商品明细_新增");
|
|
sqlFactory = new SQLFactory(this, "订单商品明细_新增");
|
|
|
Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
|
|
Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
|
|
|
RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
|
|
RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
|
|
|
- JSONArray customproperties=new JSONArray();
|
|
|
|
|
|
|
+
|
|
|
if (itemRowsMap.containsKey(item.getString("itemid"))) {
|
|
if (itemRowsMap.containsKey(item.getString("itemid"))) {
|
|
|
if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
|
|
if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
|
|
|
if(itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid")>0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
if(itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid")>0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
@@ -156,7 +157,7 @@ public class OrderItems extends Controller {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- sqlFactory.addParameter("customproperties", customproperties.toJSONString().replace("[", "").replace("]", ""));
|
|
|
|
|
|
|
+
|
|
|
} else {
|
|
} else {
|
|
|
price1 = rows.get(0).getBigDecimal("price");
|
|
price1 = rows.get(0).getBigDecimal("price");
|
|
|
sa_orderitemsid = rows.get(0).getLong("sa_orderitemsid");
|
|
sa_orderitemsid = rows.get(0).getLong("sa_orderitemsid");
|
|
@@ -167,8 +168,7 @@ public class OrderItems extends Controller {
|
|
|
} else {
|
|
} else {
|
|
|
sqlFactory = new SQLFactory(this, "订单商品明细_更新");
|
|
sqlFactory = new SQLFactory(this, "订单商品明细_更新");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+ sqlFactory.addParameter("customproperties", customproperties.toJSONString().replace("[", "").replace("]", ""));
|
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
|
sqlFactory.addParameter("userid", userid);
|
|
sqlFactory.addParameter("userid", userid);
|
|
|
sqlFactory.addParameter("username", username);
|
|
sqlFactory.addParameter("username", username);
|