|
|
@@ -127,6 +127,36 @@ public class OrderItems extends Controller {
|
|
|
if (beans.order.Order.getDefaultIsRepeatValue(siteid, type)) {
|
|
|
sa_orderitemsid = createTableID("sa_orderitems");
|
|
|
sqlFactory = new SQLFactory(this, "订单商品明细_新增");
|
|
|
+ Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
|
|
|
+ RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
|
|
|
+ JSONArray customproperties=new JSONArray();
|
|
|
+ if (itemRowsMap.containsKey(item.getString("itemid"))) {
|
|
|
+ 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(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
|
|
|
+ for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
+ customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
|
+ if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
|
|
|
+ for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
+ if(!customschemeItem.getString("value").equals("spec")){
|
|
|
+ customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
+ }else{
|
|
|
+ customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ sqlFactory.addParameter("customproperties", customproperties.toJSONString().replace("[", "").replace("]", ""));
|
|
|
} else {
|
|
|
price1 = rows.get(0).getBigDecimal("price");
|
|
|
sa_orderitemsid = rows.get(0).getLong("sa_orderitemsid");
|
|
|
@@ -137,36 +167,8 @@ public class OrderItems extends Controller {
|
|
|
} else {
|
|
|
sqlFactory = new SQLFactory(this, "订单商品明细_更新");
|
|
|
}
|
|
|
- Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
|
|
|
- RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
|
|
|
- JSONArray customproperties=new JSONArray();
|
|
|
- if (itemRowsMap.containsKey(item.getString("itemid"))) {
|
|
|
- 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(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
|
|
|
- for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
- customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
- }
|
|
|
- }
|
|
|
- } else if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
|
- if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
|
|
|
- for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
- if(!customschemeItem.getString("value").equals("spec")){
|
|
|
- customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
- }else{
|
|
|
- customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }else{
|
|
|
- customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
- }
|
|
|
|
|
|
- }
|
|
|
- sqlFactory.addParameter("customproperties", customproperties.toJSONString().replace("[", "").replace("]", ""));
|
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
|
sqlFactory.addParameter("userid", userid);
|
|
|
sqlFactory.addParameter("username", username);
|