eganwu 2 лет назад
Родитель
Сommit
ed802bc1c6

+ 7 - 1
src/custom/restcontroller/webmanage/saletool/custorder/CustOrder.java

@@ -95,9 +95,14 @@ public class CustOrder extends Controller {
                 , "province", "city", "county", "address");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t4", "t4.sys_enterpriseid=t1.sys_enterpriseid and t4.siteid=t1.siteid"
                 , "enterprisename");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_store", "t5", "t5.sa_storeid=t1.sa_storeid and t5.siteid=t1.siteid"
+                , "storename", "longitude", "latitude", "sale_phonenmber", "service_phonenmber");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_hr", "t6", "t6.sys_enterprise_hrid=t5.leader_hrid and t6.siteid=t5.siteid");
         querySQL.addQueryFields("itemname", "t2.name");
         querySQL.addQueryFields("delivery_name", "t3.name");
         querySQL.addQueryFields("delivery_phonenumber", "t3.phonenumber");
+        querySQL.addQueryFields("store_address", "CONCAT(t5.province,t5.city,t5.county,t5.address)");
+        querySQL.addQueryFields("leader_phonenumber", "t6.phonenumber");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("sa_custorderid", sa_custorderid);
         Rows rows = querySQL.query();
@@ -109,7 +114,8 @@ public class CustOrder extends Controller {
         detailRow.putIfAbsent("paytime", "");
         detailRow.put("transaction_id", detailRow.getJSONObject("wechatpayorder").getStringValue("transaction_id"));
         detailRow.put("out_trade_no", detailRow.getJSONObject("wechatpayorder").getStringValue("out_trade_no"));
-        detailRow.put("attinfos", Attachment.get(this, "sa_fadid", detailRow.getLong("sa_fadid")));
+        detailRow.put("attinfos", Attachment.get(this, "sa_fad", detailRow.getLong("sa_fadid")));
+        detailRow.put("attinfos_store", Attachment.get(this, "sa_store", detailRow.getLong("sa_storeid")));
 
         return getSucReturnObject().setData(detailRow).toString();
     }

+ 1 - 0
src/custom/restcontroller/webmanage/saletool/custorder/CustOrderHelper.java

@@ -64,6 +64,7 @@ public class CustOrderHelper extends BaseClass {
         insertSQL.setValue("sys_enterpriseid", controller.content.getLongValue("sys_enterpriseid"));
         insertSQL.setValue("status", "待付款");
         insertSQL.setValue("name", controller.username);
+        insertSQL.setValue("sa_storeid", controller.content.getLongValue("sa_storeid"));
         insertSQL.setValue("phonenumber", controller.getUser(controller.userid).getString("phonenumber"));
         insertSQL.setValue("ispaid", "0");
         return insertSQL;