|
|
@@ -902,8 +902,11 @@ public class OrderItems extends Controller {
|
|
|
RowsMap brandRowsMap = Brand.getBrandRowsMap(this, ids);
|
|
|
//价格
|
|
|
HashMap<Long, ItemPrice> itemPriceRowsMap = ItemPrice.getItemPrice(this, sys_enterpriseid, ids);
|
|
|
+ Rows sizecustomizedschemes=dbConnect.runSqlQuery("select * from sa_sizecustomizedscheme where siteid='"+siteid+"' ");
|
|
|
+ RowsMap sizecustomizedschemesRowsMap=sizecustomizedschemes.toRowsMap("sa_sizecustomizedschemeid");
|
|
|
+ Rows sizeschemedetails=dbConnect.runSqlQuery("select * from sa_sizeschemedetail where siteid='"+siteid+"' ");
|
|
|
+ RowsMap sizeschemedetailsRowsMap=sizeschemedetails.toRowsMap("sa_sizecustomizedschemeid");
|
|
|
for (Row row : rows) {
|
|
|
-
|
|
|
row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
|
|
|
row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
|
|
|
row.put("brand", brandRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
|
|
|
@@ -912,6 +915,39 @@ public class OrderItems extends Controller {
|
|
|
} else {
|
|
|
row.put("price", 0);
|
|
|
}
|
|
|
+ if(row.getLong("widthschemeid")!=0){
|
|
|
+ if(sizecustomizedschemesRowsMap.containsKey(row.getString("widthschemeid"))){
|
|
|
+ if(sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).isNotEmpty()){
|
|
|
+ row.put("widthtype",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getString("type"));
|
|
|
+ row.put("widthmin",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("min"));
|
|
|
+ row.put("widthmax",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("max"));
|
|
|
+ row.put("widthdecimalplaces",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if(sizeschemedetailsRowsMap.containsKey(row.getString("widthschemeid"))){
|
|
|
+ row.put("widthschemedetails",sizeschemedetailsRowsMap.get(row.getString("widthschemeid")));
|
|
|
+ }else{
|
|
|
+ row.put("widthschemedetails",new JSONArray());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(row.getLong("lengthschemeid")!=0){
|
|
|
+ if(sizecustomizedschemesRowsMap.containsKey(row.getString("lengthschemeid"))){
|
|
|
+ if(sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).isNotEmpty()){
|
|
|
+ row.put("lengthtype",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getString("type"));
|
|
|
+ row.put("lengthmin",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("min"));
|
|
|
+ row.put("lengthmax",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("max"));
|
|
|
+ row.put("lengthdecimalplaces",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if(sizeschemedetailsRowsMap.containsKey(row.getString("lengthschemeid"))){
|
|
|
+ row.put("lengthschemedetails",sizeschemedetailsRowsMap.get(row.getString("lengthschemeid")));
|
|
|
+ }else{
|
|
|
+ row.put("lengthschemedetails",new JSONArray());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
return getSucReturnObject().setData(rows).toString();
|