|
@@ -606,13 +606,19 @@ public class Order extends Controller {
|
|
|
for (Object object : jsonArray) {
|
|
|
JSONObject jsonObject = (JSONObject) object;
|
|
|
Long id = jsonObject.getLong("sa_accountclassid");
|
|
|
- Rows accountbalanceRows = dbConnect.runSqlQuery("SELECT balance from sa_accountbalance WHERE sa_accountclassid=" + id + " and sys_enterpriseid="+row.getLong("sys_enterpriseid"));
|
|
|
- if(accountbalanceRows.isNotEmpty()){
|
|
|
- jsonObject.put("realbalance",accountbalanceRows.get(0).getBigDecimal("balance"));
|
|
|
+ Rows accountbalanceRows = dbConnect.runSqlQuery("SELECT balance from sa_accountbalance WHERE sa_accountclassid=" + id + " and sys_enterpriseid=" + row.getLong("sys_enterpriseid"));
|
|
|
+ if (accountbalanceRows.isNotEmpty()) {
|
|
|
+ jsonObject.put("realbalance", accountbalanceRows.get(0).getBigDecimal("balance"));
|
|
|
}
|
|
|
}
|
|
|
// System.err.println(jsonArray);
|
|
|
- row.put("sa_accountclassinfos",jsonArray);
|
|
|
+ row.put("sa_accountclassinfos", jsonArray);
|
|
|
+ //查询定制费用
|
|
|
+ sql = "SELECT ifnull(sum(costamount),0) costamount from sa_order_cost WHERE sa_orderid=" + sa_orderid;
|
|
|
+ BigDecimal costamount = dbConnect.runSqlQuery(0, sql).getBigDecimal("costamount");
|
|
|
+ row.put("costamount", costamount);
|
|
|
+
|
|
|
+
|
|
|
return getSucReturnObject().setData(row).toString();
|
|
|
}
|
|
|
|