门店电话修改

business/jxstore/misc/misc.go

@@ -294,6 +294,7 @@ func Init() {
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
 		jdsCookie = configs[0].Value
+		api.JdShopAPI.SetCookieWithStr(jdsCookie)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
@@ -315,7 +316,6 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	api.JdShopAPI.SetCookieWithStr(jdsCookie)
 }
 
 func syncStoreSku() {

business/partner/purchase/ebai/store.go

@@ -383,7 +383,13 @@ func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} {
 	// 	// params["phone"] = tel     // 外卖客服联系电话，这个有时能修改，有时不能修改，暂时统一不改
 	// 	params["ivr_phone"] = tel // 订单提醒电话
 	// }
-	params["ivr_phone"] = model.VendorStoreTel //统一改为这个电话
+	phone := ""
+	if store.MarketManPhone != "" {
+		phone = store.MarketManPhone
+	} else {
+		phone = model.VendorStoreTel
+	}
+	params["ivr_phone"] = phone //统一改为这个电话
 	if store.VendorStoreID != "" {
 		params["baidu_shop_id"] = store.VendorStoreID
 	}

business/partner/purchase/jd/store.go

@@ -138,11 +138,17 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err = dao.GetRows(db, &stores, sql, model.VendorIDJD, utils.DefaultTimeValue, storeID); err == nil {
 		for _, store := range stores {
 			a := getAPI(store.VendorOrgCode)
+			phone := ""
+			if store.MarketManPhone != "" {
+				phone = store.MarketManPhone
+			} else {
+				phone = model.VendorStoreTel
+			}
 			storeParams := &jdapi.OpStoreParams{
 				StationNo: store.VendorStoreID,
 				Operator:  userName,
-				Phone:     model.VendorStoreTel,
-				Mobile:    store.Tel1,
+				Phone:     phone,
+				Mobile:    store.Tel2,
 			}
 			if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
 				storeParams.OutSystemID = utils.Int2Str(int(store.ID))

business/partner/purchase/mtwm/store.go

@@ -130,12 +130,18 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		// }
 	}
 	// openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus)
+	phone := ""
+	if storeDetail.MarketManPhone != "" {
+		phone = storeDetail.MarketManPhone
+	} else {
+		phone = model.VendorStoreTel
+	}
 	params := map[string]interface{}{
 		"name":           name,                //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM),
 		"address":        storeDetail.Address, // 美团好像地址也不能改的?
 		"longitude":      jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Longitude)),
 		"latitude":       jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Latitude)),
-		"phone":          model.VendorStoreTel,
+		"phone":          phone,
 		"shipping_fee":   remoteStoreInfo.ShippingFee,
 		"shipping_time":  remoteStoreInfo.ShippingTime,
 		"open_level":     remoteStoreInfo.OpenLevel,

conf/app.conf

@@ -443,73 +443,3 @@ yinbaoAppKey = "682628966212343269"
 yinbaoAppID = "18C0E0867E467DBC26EFF5E957B02EC4"
 
 aliUpcAppCode = "00a6eefba0204d3fa310ac0ee7a6fc54"
-
-[prod3]
-EnableDocs = false
-
-jdOrgCode = "320406"
-jdToken  = "77e703b7-7997-441b-a12a-2e522efb117a"
-jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
-jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
-
-jd2OrgCode = "349454"
-jd2Token  = "29e0e567-c475-433a-aff0-37176ee8d8a7"
-jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
-jd2Secret = "1097abd7ef09427099b4922784af123a"
-
-jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
-jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
-jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
-
-elmIsProd = true
-elmToken  = ""
-elmAppKey = "KLRDcOZGrk"
-elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
-
-ebaiSource = "34665"
-ebaiSecret = "c3db75b754ea2d89"
-
-mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
-mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
-
-dadaIsProd      = true
-dadaCallbackURL = "http://callback.jxc4.com/dadadelivery/msg"
-dadaSourceID    = "6660"
-
-weixinAppID  = "wx2bb99eb5d2c9b82c"
-weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
-weixinMiniAppID2  = "wx4b5930c13f8b1170"
-weixinMiniSecret2 = "2a57228a716ce991a52739f0ff41111d"
-
-yinbaoAppKey = "682628966212343269"
-yinbaoAppID = "18C0E0867E467DBC26EFF5E957B02EC4"
-
-aliUpcAppCode = "00a6eefba0204d3fa310ac0ee7a6fc54"
-
-wxpayNotifyURL = "http://callback.jxc4.com/wxpay/msg/"
-
-tonglianPayAppID = "00183083"
-tonglianPayKey = "18048531223"
-tonglianPayCusID = "56065105499TVAH"
-tonglianPayNotifyURL = "http://callback.jxc4.com/tonglian/msg/"
-
-dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
-
-enableStoreWrite = false
-enableJdStoreWrite = false
-enableEbaiStoreWrite = false
-enableMtwmStoreWrite = false
-enableWscStoreWrite = false
-enableYbStoreWrite = false 
-
-disableWeimob = false
-weimobCallbackURL = "http://callback.jxc4.com/weimob"
-
-dingdingAgentID = 733555444
-dingdingAppKey = "dingrn2ujlpa4ler2x4d"
-dingdingSecret = "I4ZC1BH1_xwpE_NaXeYZkWgCIfbp39rne9JYObmdN3NINetA6ghf-a4jQ9YXa2n7"
-
-dingdingQRCodeAppKey = "dingoacnwcbkbwhktccmmg"
-dingdingQRCodeSecret = "qizpI-k5a_5O9q7XVGRiqB4RDvbZ5qBTCzlxDVZwYxRQoyJoeg6LLrORDFLoLChc"
-
-dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg"