20221224180302添加收货人,收货人联系方式

src/custom/restcontroller/sale/order/Order.java

@@ -69,13 +69,15 @@ public class Order extends Controller {
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
 
+
         //查询数据：amount，defaultamount，qty
         ArrayList<Long> sa_orderids = rows.toArrayList("sa_orderid", new ArrayList<>());
         SQLFactory sqlFactory = new SQLFactory(this, "订单_查询数据");
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter_in("sa_orderid", sa_orderids);
         RowsMap dataRowsMap = dbConnect.runSqlQuery(sqlFactory).toRowsMap("sa_orderid");
-        //查询收货人信息
+
+        RowsMap ContactsRowsMap = beans.order.Order.getContactsRowsMap(this, rows.toArrayList("rec_contactsid", new ArrayList<>()));
         for (Row row : rows) {
             Rows dataRows = dataRowsMap.getOrDefault(row.getString("sa_orderid"), new Rows());
             if (dataRows.isNotEmpty()) {
@@ -84,6 +86,13 @@ public class Order extends Controller {
                 row.put("amount", 0);
                 row.put("qty", 0);
             }
+            //查询收货人信息
+            if(ContactsRowsMap.containsKey(row.getString("rec_contactsid"))){
+                row.put("contacts", ContactsRowsMap.get(row.getString("rec_contactsid")).get(0));
+            }else{
+                row.put("contacts", new Row());
+            }
+
         }
 
 
@@ -101,7 +110,7 @@ public class Order extends Controller {
     //查询订单列表(经销商)
     public QuerySQL queryList(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
-                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks");
+                "sa_orderid", "sonum", "status", "type", "billdate", "tradefield", "remarks","rec_contactsid");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t3", "t3.sa_brandid = t1.sa_brandid",
                 "brandname");

src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -145,6 +145,8 @@ public class accessoryorder extends Controller {
             Long id = row.getLong("sa_orderid");
             if(ContactsRowsMap.containsKey(row.getString("rec_contactsid"))){
                 row.put("contacts", ContactsRowsMap.get(row.getString("rec_contactsid")).get(0));
+            }else{
+                row.put("contacts", new Row());
             }
 
             if (OrderAmountRowsMap.get(id.toString()).isNotEmpty()) {