From 2b38cbf75023552e931b2052d45a76af0269a371 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 23 Jul 2019 09:32:32 +0800
Subject: [PATCH] - up

---
 business/model/dao/store.go               | 10 +++++-----
 business/partner/delivery/dada/waybill.go |  2 +-
 business/partner/delivery/mtps/waybill.go |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index cbd7fe08f..813a05b21 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -34,11 +34,11 @@ type StoreDetail struct {
 type StoreDetail2 struct {
 	model.Store
 
-	VendorID         int `orm:"column(vendor_id)" json:"vendorID"`
-	CourierStoreName string
-	VendorStoreID    string `orm:"column(vendor_store_id)"`
-	DistrictName     string
-	CityName         string
+	VendorID         int    `orm:"column(vendor_id)" json:"vendorID"`
+	CourierStoreName string `json:"courierStoreName"`
+	VendorStoreID    string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
+	DistrictName     string `json:"districtName"`
+	CityName         string `json:"cityName"`
 }
 
 func (s *StoreDetail) GetPricePerentage(price int) (pricePercentage int) {
diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go
index 237f5be3a..e29fdda12 100644
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -131,7 +131,7 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop
 	}
 	shopInfo = &dadaapi.ShopInfo{
 		OriginShopID:   utils.Int2Str(storeDetail.ID),
-		StationName:    storeDetail.Name,
+		StationName:    storeDetail.CourierStoreName,
 		CityName:       cityName,
 		AreaName:       districtName,
 		StationAddress: storeDetail.Address,
diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index 52e1877e0..1a33c733c 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -130,7 +130,7 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
 	}
 	shopInfo := &mtpsapi.ShopInfo{
 		ShopID:         utils.Int2Str(storeDetail.ID),
-		ShopName:       storeDetail.Name,
+		ShopName:       storeDetail.CourierStoreName,
 		Category:       mtpsapi.ShopCategoryFruit,
 		SecondCategory: mtpsapi.ShopCategoryFruitFruit,
 		ContactName:    storeDetail.PayeeName,