Browse Source

订单查询优化

shenjingwei 1 tuần trước cách đây
mục cha
commit
709231f941

+ 4 - 4
src/custom/restcontroller/crm/agent/custorder/Custorder.java

@@ -19,7 +19,7 @@ public class Custorder extends Controller {
     @API(title = "美大CRM_经销商_客户订单列表查询", type = API.Type.PageQuery, apiversion = R.ID2026031410293201.v1.class)
     @API(title = "美大CRM_经销商_客户订单列表查询", type = API.Type.PageQuery, apiversion = R.ID2026031410293201.v1.class)
     public String sa_custorder_querylist() throws YosException {
     public String sa_custorder_querylist() throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder").setTableAlias("t1");
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder").setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t1.sa_customersid=t2.sa_customersid", "address");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t1.sa_customersid=t2.sa_customersid", "address", "community", "name", "phonenumber");
         querySQL.addJoinTable(JOINTYPE.left, "sa_store", "t3", "t1.sa_storeid=t3.sa_storeid", "storeno", "storename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_store", "t3", "t1.sa_storeid=t3.sa_storeid", "storeno", "storename");
 
 
         querySQL.setWhere("sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere("sys_enterpriseid", sys_enterpriseid);
@@ -49,7 +49,7 @@ public class Custorder extends Controller {
     public String sa_custorder_querymain() throws YosException {
     public String sa_custorder_querymain() throws YosException {
         long sa_custorderid = content.getLongValue("sa_custorderid");
         long sa_custorderid = content.getLongValue("sa_custorderid");
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder", "*").setTableAlias("t1");
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder", "*").setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t1.sa_customersid=t2.sa_customersid", "address", "community");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t1.sa_customersid=t2.sa_customersid", "address", "community", "name", "phonenumber");
         querySQL.addJoinTable(JOINTYPE.left, "sa_store", "t3", "t1.sa_storeid=t3.sa_storeid", "storeno", "storename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_store", "t3", "t1.sa_storeid=t3.sa_storeid", "storeno", "storename");
         querySQL.setWhere("sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere("sys_enterpriseid", sys_enterpriseid);
         querySQL.setUniqueid(sa_custorderid);
         querySQL.setUniqueid(sa_custorderid);
@@ -92,7 +92,7 @@ public class Custorder extends Controller {
             insertSQL.setValue("ispaid", 0);// 付款状态,待付款
             insertSQL.setValue("ispaid", 0);// 付款状态,待付款
             insertSQL.setValue("amount", amount);// 订单金额
             insertSQL.setValue("amount", amount);// 订单金额
             insertSQL.setValue("sys_enterpriseid", sys_enterpriseid);// 合作企业档案ID
             insertSQL.setValue("sys_enterpriseid", sys_enterpriseid);// 合作企业档案ID
-            insertSQL.setValue("sa_customersid", sa_customersid);// 合作企业档案ID
+            insertSQL.setValue("sa_customersid", sa_customersid);// 客户信息 ID
             insertSQL.setUniqueid(sa_custorderid);
             insertSQL.setUniqueid(sa_custorderid);
             SQLList.add(insertSQL);
             SQLList.add(insertSQL);
             SQLList.add(SQLFactory.createUpdateSQL(this, "sa_customers").setValue("status", "正式").setWhere("sys_enterpriseid", sys_enterpriseid).setUniqueid(sa_customersid));
             SQLList.add(SQLFactory.createUpdateSQL(this, "sa_customers").setValue("status", "正式").setWhere("sys_enterpriseid", sys_enterpriseid).setUniqueid(sa_customersid));
@@ -215,7 +215,7 @@ public class Custorder extends Controller {
             updateSQL.setSiteid(siteid);
             updateSQL.setSiteid(siteid);
             updateSQL.setWhere("sa_custorderid", sa_custorderid);
             updateSQL.setWhere("sa_custorderid", sa_custorderid);
             updateSQL.setUniqueid(sa_custorderitemsid);
             updateSQL.setUniqueid(sa_custorderitemsid);
-            updateSQL.setValue("remarks",remarks);
+            updateSQL.setValue("remarks", remarks);
             sqlist.add(updateSQL);
             sqlist.add(updateSQL);
         }
         }
 
 

+ 1 - 2
src/custom/restcontroller/sale/accessoryorder/accessoryorder.java

@@ -110,10 +110,9 @@ public class accessoryorder extends Controller {
                 "name");
                 "name");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         querySQL.setWhere(where);
-        querySQL.setWhere("t1.sys_enterpriseid = $sys_enterpriseid$");
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere("t1.deleted=0 and t1.type='配件订单'");
         querySQL.setWhere("t1.deleted=0 and t1.type='配件订单'");
         querySQL.setWhere("((t1.createflag=1 and t1.status!='新建') or t1.createflag=0)");
         querySQL.setWhere("((t1.createflag=1 and t1.status!='新建') or t1.createflag=0)");
-        querySQL.addParameter("sys_enterpriseid", sys_enterpriseid);
         return querySQL;
         return querySQL;
     }
     }
 
 

+ 4 - 5
src/custom/restcontroller/sale/order/Order.java

@@ -90,8 +90,8 @@ public class Order extends Controller {
         }
         }
 
 
         SQLFactory sqlFactory2 = new SQLFactory(this, "查询最新的快递信息");
         SQLFactory sqlFactory2 = new SQLFactory(this, "查询最新的快递信息");
-        sqlFactory2.addParameter_in("sa_orderid",sa_orderids);
-        RowsMap expressformrowsMap2=dbConnect.runSqlQuery(sqlFactory2).toRowsMap("sa_orderid");
+        sqlFactory2.addParameter_in("sa_orderid", sa_orderids);
+        RowsMap expressformrowsMap2 = dbConnect.runSqlQuery(sqlFactory2).toRowsMap("sa_orderid");
 
 
         RowsMap ContactsRowsMap = beans.order.Order.getContactsRowsMap(this, rows.toArrayList("rec_contactsid", new ArrayList<>()));
         RowsMap ContactsRowsMap = beans.order.Order.getContactsRowsMap(this, rows.toArrayList("rec_contactsid", new ArrayList<>()));
         for (Row row : rows) {
         for (Row row : rows) {
@@ -143,10 +143,9 @@ public class Order extends Controller {
         querySQL.setCondition("t1.sonum", "t1.remarks");
         querySQL.setCondition("t1.sonum", "t1.remarks");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         querySQL.setWhere(where);
-        querySQL.setWhere("t1.sys_enterpriseid = $sys_enterpriseid$");
-        querySQL.setWhere("t1.deleted=0");
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
+        querySQL.setWhere("t1.deleted", 0);
         querySQL.setWhere("((t1.createflag=1 and t1.status!='新建') or t1.createflag=0)");
         querySQL.setWhere("((t1.createflag=1 and t1.status!='新建') or t1.createflag=0)");
-        querySQL.addParameter("sys_enterpriseid", sys_enterpriseid);
         return querySQL;
         return querySQL;
     }
     }
 
 

+ 3 - 4
src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -162,8 +162,8 @@ public class accessoryorder extends Controller {
         }
         }
 
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询最新的快递信息");
         SQLFactory sqlFactory = new SQLFactory(this, "查询最新的快递信息");
-        sqlFactory.addParameter_in("sa_orderid",rows.toArrayList("sa_orderid"));
-        RowsMap expressformrowsMap2=dbConnect.runSqlQuery(sqlFactory).toRowsMap("sa_orderid");
+        sqlFactory.addParameter_in("sa_orderid", rows.toArrayList("sa_orderid"));
+        RowsMap expressformrowsMap2 = dbConnect.runSqlQuery(sqlFactory).toRowsMap("sa_orderid");
 
 
 
 
         //查询区域信息
         //查询区域信息
@@ -446,8 +446,7 @@ public class accessoryorder extends Controller {
         querySQL.setWhere(where);
         querySQL.setWhere(where);
         querySQL.setCondition("t1.sonum", "t2.enterprisename", "t2.abbreviation", "t1.remarks");
         querySQL.setCondition("t1.sonum", "t2.enterprisename", "t2.abbreviation", "t1.remarks");
         querySQL.setWhere("t1.deleted=0 and t1.type='配件订单'");
         querySQL.setWhere("t1.deleted=0 and t1.type='配件订单'");
-        querySQL.setWhere("(t1.status!='新建' or t1.createuserid =$userid$ or t1.createflag=1)");
-        querySQL.addParameter("userid", userid);
+        querySQL.setWhere("(t1.status!='新建' or t1.createuserid=" + userid + " or t1.createflag=1)");
 
 
         return querySQL;
         return querySQL;
     }
     }

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

@@ -1221,7 +1221,7 @@ public class Order extends Controller {
         querySQL.setWhere(where);
         querySQL.setWhere(where);
         querySQL.setWhere("t1.deleted=0 and t1.type!='配件订单'");
         querySQL.setWhere("t1.deleted=0 and t1.type!='配件订单'");
         querySQL.setWhere("(t1.status!='新建' or t1.createuserid =$userid$ or t1.createflag=1)");
         querySQL.setWhere("(t1.status!='新建' or t1.createuserid =$userid$ or t1.createflag=1)");
-        querySQL.addParameter("userid", userid);
+        querySQL.setParamValue("userid", userid);
         return querySQL;
         return querySQL;
     }
     }
 
 

+ 1 - 2
src/custom/restcontroller/webmanage/sale/order/OrderFeeCostPlan.java

@@ -304,8 +304,7 @@ public class OrderFeeCostPlan extends Controller {
          */
          */
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sys_datafunction_params");
         DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sys_datafunction_params");
         deleteSQL.setWhere("sys_datafunctionid", sys_datafunctionid);
         deleteSQL.setWhere("sys_datafunctionid", sys_datafunctionid);
-        deleteSQL.setWhere("param not in $params$");
-        deleteSQL.addParameter("params", ps);
+        deleteSQL.setWhere("param", Op.NOT_IN, ps);
         paramSqlList.add(deleteSQL.getSQL());
         paramSqlList.add(deleteSQL.getSQL());
 
 
         dbConnect.runSqlUpdate(paramSqlList);
         dbConnect.runSqlUpdate(paramSqlList);