Quellcode durchsuchen

lsa老订单退回手工关闭无法退款修复v3

hu vor 2 Jahren
Ursprung
Commit
d98159dac2
1 geänderte Dateien mit 7 neuen und 3 gelöschten Zeilen
  1. 7 3
      src/custom/restcontroller/webmanage/sale/order/Order.java

+ 7 - 3
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1825,8 +1825,11 @@ public class Order extends Controller {
 
         if(StringUtils.isBlank(row.getString("sa_accountclassinfos"))){
             dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid,sa_accountclassid,sys_enterpriseid));
+            rows = getOrderRows(this, sa_orderid);
+            row = rows.get(0);
         }
-        rows = getOrderRows(this, sa_orderid);
+
+         System.out.println(rows.get(0).getString("sa_accountclassinfos"));
         BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
         ArrayList<String> sqlList = new ArrayList<>();
 
@@ -1913,8 +1916,9 @@ public class Order extends Controller {
 
         if(StringUtils.isBlank(row.getString("sa_accountclassinfos"))){
             dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid,sa_accountclassid,sys_enterpriseid));
+            rows = getOrderRows(this, sa_orderid);
+            row = rows.get(0);
         }
-        rows = getOrderRows(this, sa_orderid);
         BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
         ArrayList<String> sqlList = new ArrayList<>();
 
@@ -3005,8 +3009,8 @@ public class Order extends Controller {
         Long sa_accountclassid = orderRow.get(0).getLong("sa_accountclassid");
         if(StringUtils.isBlank(orderRow.get(0).getString("sa_accountclassinfos"))){
             dbConnect.runSqlUpdate(updateAccountclassinfos(sa_orderid,sa_accountclassid,sys_enterpriseid));
+            orderRow = getOrderRows(this, sa_orderid);
         }
-        orderRow = getOrderRows(this, sa_orderid);
         if (dbConnect.runSqlQuery("SELECT 1 from sa_dispatch t1 left join sa_dispatch_items t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid left join sa_orderitems t3 on t2.sa_orderitemsid=t3.sa_orderitemsid and t2.siteid=t3.siteid WHERE t1.status not in ('关闭','手工关闭') and t1.siteid='" + siteid + "' and t3.sa_orderid=" + sa_orderid).isNotEmpty()) {
             return getErrReturnObject().setErrMsg("存在未关闭的发货单,无法关闭").toString();
         }