|
|
@@ -139,34 +139,32 @@ public class OrderItems extends Controller {
|
|
|
}
|
|
|
Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
|
|
|
RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
|
|
|
- String customproperties="";
|
|
|
+ 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=customproperties+customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value"))+",";
|
|
|
+ customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
|
+ } 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("description").equals("spec")){
|
|
|
- customproperties=customproperties+customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value"))+",";
|
|
|
+ if(!customschemeItem.getString("value").equals("spec")){
|
|
|
+ customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
}else{
|
|
|
- customproperties=customproperties+",尺寸:"+item.getString("length")+"*"+item.getString("width");
|
|
|
+ customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
}
|
|
|
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- sqlFactory.addParameter("customproperties", customproperties);
|
|
|
+ sqlFactory.addParameter("customproperties", customproperties.toJSONString().replace("[", "").replace("]", ""));
|
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
|
sqlFactory.addParameter("userid", userid);
|
|
|
sqlFactory.addParameter("username", username);
|
|
|
@@ -299,6 +297,9 @@ public class OrderItems extends Controller {
|
|
|
}
|
|
|
}
|
|
|
dbConnect.runSqlUpdate(sqlList);
|
|
|
+ for (String str:sqlList) {
|
|
|
+ System.out.println(str);
|
|
|
+ }
|
|
|
//重新排序
|
|
|
updateRowNo(sa_orderid);
|
|
|
//居间费设置
|
