Przeglądaj źródła

添加促销订单账户默认促销方案的账户

hu 2 lat temu
rodzic
commit
9d7030f5ad

+ 12 - 1
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -301,6 +301,7 @@ public class Order extends Controller {
             }else{
                 sqlFactory.addParameter("sa_accountclassid", beans.order.Order.getDefaultAccount(siteid, type));
             }
+
         }
 
         //品牌ID
@@ -384,7 +385,17 @@ public class Order extends Controller {
         if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("整装工程")) {
             sqlList1.addAll(updateAccountclassinfos(sa_orderid, 69, sys_enterpriseid));
         } else {
-            sqlList1.addAll(updateAccountclassinfos(sa_orderid, beans.order.Order.getDefaultAccount(siteid, type), sys_enterpriseid));
+            if(type.equals("促销订单")){
+                Rows accountclassRows = dbConnect.runSqlQuery("select sa_accountclassid from sa_promotion where siteid='"+siteid+"' and sa_promotionid="+content.getLongValue("sa_promotionid"));
+                if(!accountclassRows.isEmpty()){
+                    sqlList1.addAll(updateAccountclassinfos(sa_orderid, accountclassRows.get(0).getLong("sa_accountclassid"), sys_enterpriseid));
+                }else{
+                    sqlList1.addAll(updateAccountclassinfos(sa_orderid, beans.order.Order.getDefaultAccount(siteid, type), sys_enterpriseid));
+                }
+            }else{
+                sqlList1.addAll(updateAccountclassinfos(sa_orderid, beans.order.Order.getDefaultAccount(siteid, type), sys_enterpriseid));
+            }
+
         }
 
         dbConnect.runSqlUpdate(sqlList1);