From 7c4c652e5a6f22568fe89e6f6167580df6a2f1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                |  3 ---
 business/partner/purchase/mtwm/store_sku2.go | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index cfd440aa8..b32cdd699 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2492,7 +2492,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 	_, lat2 := jxutils.ConvertDistanceToLogLat(lng, lat, float64(maxRadius), 0)
 	lng1 := lng - (lng2 - lng)
 	lat1 := lat - (lat2 - lat)
-	fmt.Println("test33", lng1, lng2, lat1, lat2)
 	// globals.SugarLogger.Debugf("%f,%f,%f,%f\n", lng1, lng2, lat1, lat2)
 	sql := `
 	SELECT t1.*,
@@ -2509,13 +2508,11 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2),
 		model.YES,
 	}
-	fmt.Println("test22", sqlParams)
 	var storeList1 []*Store4User
 	if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
 		var storeList2 []*Store4User
 		for _, v := range storeList1 {
 			distance := jxutils.Point2StoreDistance(lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
-			fmt.Println("test11111", distance, lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
 			if distance > 0 || (lng == jxutils.IntCoordinate2Standard(v.Lng) && lat == jxutils.IntCoordinate2Standard(v.Lat)) {
 				v.Distance = distance
 				storeList2 = append(storeList2, v)
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index 4cc9ea279..a1e95fee9 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -246,7 +246,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		syncType = "更新商品"
 	}
 	for i, storeSku := range storeSkuList {
-		isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
+		// isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
 		foodData := make(map[string]interface{})
 		foodDataList[i] = foodData
 		foodData[mtwmapi.KeyAppFoodCode] = utils.Int2Str(storeSku.SkuID)
@@ -258,9 +258,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		foodData["skus"] = skus
 		foodData["name"] = utils.LimitUTF8StringLen(utils.FilterEmoji(storeSku.SkuName), mtwmapi.MaxSkuNameCharCount)
 		foodData["description"] = storeSku.Comment
-		if isNeedUpdatePrice {
-			foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
-		}
+		// if isNeedUpdatePrice {
+		foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
+		// }
 		foodData["min_order_count"] = 1
 		foodData["unit"] = storeSku.Unit
 		foodData["box_num"] = 1
@@ -291,9 +291,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 			// foodData["tag_id"] = utils.Int64ToStr(defVendorCatID)
 		}
 		skus[0]["spec"] = jxutils.ComposeSkuSpec(storeSku.SpecQuality, storeSku.SpecUnit)
-		if isNeedUpdatePrice {
-			skus[0]["price"] = foodData["price"]
-		}
+		// if isNeedUpdatePrice {
+		skus[0]["price"] = foodData["price"]
+		// }
 		skus[0]["stock"] = stockCount2Mtwm(model.MaxStoreSkuStockQty)
 		if storeSku.Upc != "" {
 			skus[0]["upc"] = storeSku.Upc