From bba0dc3d165b4b4aafdee68d322c1fa3b340692e Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 19 Oct 2021 09:26:08 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/orderman_ext.go | 4 +++-
 business/model/api.go                        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 126391571..4f93a6ca9 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -179,9 +179,11 @@ func (c *OrderManager) GetOrderInfo(ctx *jxcontext.Context, vendorOrderID string
 	sql += ` 
 		t1.*, t2.status waybill_status, t2.courier_name, t2.courier_mobile, t2.desired_fee,
 		CAST(t1.consignee_lng AS DECIMAL(15,6))/1000000 float_lng,
-		CAST(t1.consignee_lat AS DECIMAL(15,6))/1000000 float_lat
+		CAST(t1.consignee_lat AS DECIMAL(15,6))/1000000 float_lat,
+		ts.brand_id
 		FROM goods_order t1
 		LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id
+		LEFT JOIN store ts ON ts.id = IF(t1.jx_store_id = 0, t1.store_id, t1.jx_store_id)
 	`
 	if rorder.VendorUserID != "" {
 		sql += `
diff --git a/business/model/api.go b/business/model/api.go
index 729167b70..fc3b50dba 100644
--- a/business/model/api.go
+++ b/business/model/api.go
@@ -51,6 +51,7 @@ type GoodsOrderExt struct {
 	BadCommentCount    int             `json:"badCommentCount"`
 	JxIncome           int64           `json:"jxIncome"`           //预计收益
 	StoreDayOrderCount int             `json:"storeDayOrderCount"` //门店当天单量
+	BrandID            int             `orm:"column(brand_id)" json:"brandID"`
 
 	FloatLng float64 `json:"floatLng"`
 	FloatLat float64 `json:"floatLat"`