|
@@ -32,10 +32,7 @@ import restcontroller.webmanage.executorService.Executor;
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
+import java.util.*;
|
|
|
|
|
|
import static beans.order.Order.*;
|
|
|
|
|
@@ -1665,7 +1662,9 @@ public class Order extends Controller {
|
|
|
jsonObject.put("balance", jsonObject.getBigDecimalValue("balance").subtract(amount1));
|
|
|
}
|
|
|
JSONObject cashbillPay = Accountbalance.createCashbillPay(this, pay_enterpriseid, jsonObject.getLong("sa_accountclassid"), entity, true);
|
|
|
- sqlList.addAll(cashbillPay.getJSONArray("sqlList").toJavaList(String.class));
|
|
|
+// sqlList.addAll(cashbillPay.getJSONArray("sqlList").toJavaList(String.class));
|
|
|
+ ArrayList<String> sqlList2= (ArrayList<String>) cashbillPay.getJSONArray("sqlList").toJavaList(String.class);
|
|
|
+ dbConnect.runSqlUpdate(sqlList2);
|
|
|
sa_cashbillidList.add(cashbillPay.getLong("sa_cashbillid"));
|
|
|
|
|
|
|
|
@@ -1702,7 +1701,9 @@ public class Order extends Controller {
|
|
|
if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount.add(costamount))) {
|
|
|
CashbillEntity entity = getCashbillEntity(amount, sa_orderid, "订单提交", sonum, "由" + sonum + "订单提交时自动产生");
|
|
|
JSONObject cashbillPay = Accountbalance.createCashbillPay(this, pay_enterpriseid, sa_accountclassid, entity, true);
|
|
|
- sqlList.addAll(cashbillPay.getJSONArray("sqlList").toJavaList(String.class));
|
|
|
+// sqlList.addAll(cashbillPay.getJSONArray("sqlList").toJavaList(String.class));
|
|
|
+ ArrayList<String> sqlList2= (ArrayList<String>) cashbillPay.getJSONArray("sqlList").toJavaList(String.class);
|
|
|
+ dbConnect.runSqlUpdate(sqlList2);
|
|
|
sa_cashbillidList.add(cashbillPay.getLong("sa_cashbillid"));
|
|
|
|
|
|
//定制费用
|