From 566c8225336f91b9ca1e8a68e981316b7dcaaa67 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 22 Apr 2021 14:23:32 +0800
Subject: [PATCH] aa

---
 business/model/api.go           | 3 +++
 business/model/dao/dao_order.go | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/business/model/api.go b/business/model/api.go
index 3c2c812d9..d892f992c 100644
--- a/business/model/api.go
+++ b/business/model/api.go
@@ -52,6 +52,9 @@ type GoodsOrderExt struct {
 
 	FloatLng float64 `json:"floatLng"`
 	FloatLat float64 `json:"floatLat"`
+
+	MarketManPhone string `json:"marketManPhone"` //市場負責人電話
+	MarketManName  string `json:"marketManName"`
 }
 
 type OrderSkuExt struct {
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index d030d4845..d78de685d 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -776,7 +776,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price,
 	t2.status waybill_status, t2.courier_name, t2.courier_mobile,
 	t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at,
-	t5.pay_percentage, t5.old_pay_percentage, t6.vendor_pay_percentage,
+	t5.pay_percentage, t5.old_pay_percentage, t5.market_man_phone, tu.name market_man_name,
+	t6.vendor_pay_percentage,
 	city.name city_name, district.name district_name`, model.DefaultEarningPricePercentage)
 	if isIncludeSku {
 		sql += `,
@@ -793,7 +794,9 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	LEFT JOIN store t5 ON t5.id = IF(t1.jx_store_id <> 0, t1.jx_store_id, t1.store_id)
 	LEFT JOIN store_map t6 ON t6.store_id = t5.id AND t6.deleted_at = '1970-01-01 00:00:00' AND t6.vendor_id = t1.vendor_id
 	LEFT JOIN place city ON city.code = t5.city_code
-	LEFT JOIN place district ON district.code = t5.district_code`
+	LEFT JOIN place district ON district.code = t5.district_code
+	LEFT JOIN user tu ON mobile = t5.market_man_phone	
+	`
 	if isIncludeSku {
 		sql += `
 		JOIN order_sku t3 ON t3.vendor_order_id = t1.vendor_order_id AND t3.vendor_id = t1.vendor_id`