Browse Source

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

hu 2 years ago
parent
commit
7fc41f05a1
1 changed files with 10 additions and 1 deletions
  1. 10 1
      src/custom/restcontroller/webmanage/sale/order/Order.java

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

@@ -113,7 +113,16 @@ public class Order extends Controller {
             sqlFactory.addParameter("sa_accountclassid", "69");
             sqlList.addAll(updateAccountclassinfos(sa_orderid, 69, sys_enterpriseid));
         } else {
-            sqlFactory.addParameter("sa_accountclassid", beans.order.Order.getDefaultAccount(siteid, type));
+            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()){
+                    sqlFactory.addParameter("sa_accountclassid", accountclassRows.get(0).getLong("sa_accountclassid"));
+                }else{
+                    sqlFactory.addParameter("sa_accountclassid", beans.order.Order.getDefaultAccount(siteid, type));
+                }
+            }else{
+                sqlFactory.addParameter("sa_accountclassid", beans.order.Order.getDefaultAccount(siteid, type));
+            }
             sqlList.addAll(updateAccountclassinfos(sa_orderid, beans.order.Order.getDefaultAccount(siteid, type), sys_enterpriseid));
         }
         //品牌ID