Merge branch 'develop' into feature/app_dev

* develop:
  增加搜索关键字推荐

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_balance_controller.go

@@ -42,7 +42,7 @@ func (self *PayController) wxPayBalance(orderId string) {
 	beego.BeeLogger.Debug("pay.total_price(%d)", totalPrice)
 	//获取预支付信息/v1/pay/:target:string/async/:payway:string
 	notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), BALANCE_TARGET, balance_model.PAY_WAY_TYPE_SERVICE_WXPAY) // balance "service_wxpay"
-	body := "FOHOW玖玖-购买提货券"
+	body := "凤凰菁选-购买提货券"
 	payData := wx_mp.GetPayData(wxUser.Openid, balanceOrder.OrderId, totalPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 	//返回数据
 	type PayData struct {

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_cashcz_controller.go

@@ -37,7 +37,7 @@ func (self *PayController) wxPayCashcz(orderId string) {
 	}
 	//获取预支付信息/v1/pay/:target:string/async/:payway:string
 	notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), CASH_TARGET, balance_model.PAY_WAY_TYPE_RECHARGE_WXPAY) // rechargeCashOrder "recharge_wxpay"
-	body := "FOHOW玖玖-余额充值"
+	body := "凤凰菁选-余额充值"
 	payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 	payData := wx_mp.GetPayData(wxUser.Openid, reCashOrder.OrderId, reCashOrder.TotalPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -243,7 +243,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 				}
 				order.TotalPrice += freight
 				notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
-				body := fmt.Sprintf("FOHOW玖玖-购买商品")
+				body := fmt.Sprintf("凤凰菁选-购买商品")
 				//获取paycode
 				payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, false)
 
@@ -279,7 +279,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 			} else { //公众号微信支付
 
 				notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
-				body := fmt.Sprintf("FOHOW玖玖-购买商品")
+				body := fmt.Sprintf("凤凰菁选-购买商品")
 				wxGzh := user_model.GetWxUserGzhByWxUIdAndAppId(wxUser.Id, beego.AppConfig.String("WxMPAppId"), false)
 				if wxGzh == nil {
 					self.ReturnError(403, apps.NoExist, "", nil)
@@ -302,7 +302,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 		if source == order_model.SOURCE_XCX { //小程序微信支付
 
 			notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
-			body := fmt.Sprintf("FOHOW玖玖-购买商品")
+			body := fmt.Sprintf("凤凰菁选-购买商品")
 			payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 			payData := wx_mp.GetPayData(wxUser.Openid, order.OrderId, order.PaiedPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 
@@ -329,7 +329,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 		} else { //公众号微信支付
 
 			notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
-			body := fmt.Sprintf("FOHOW玖玖-购买商品")
+			body := fmt.Sprintf("凤凰菁选-购买商品")
 			wxGzh := user_model.GetWxUserGzhByWxUIdAndAppId(wxUser.Id, beego.AppConfig.String("WxMPAppId"), false)
 			if wxGzh == nil {
 				self.ReturnError(403, apps.NoExist, "", nil)

go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/tmpl_controller.go

@@ -24,7 +24,7 @@ func (self *RailsadminController) SendTemplate() {
 	item.LastUpdatedAt = time.Now()
 	go item.Save()
 	s := item.MsgType                         //模板：0 订单待支付提醒 1新项目通知 2提货通知
-	wxGongzhonghaoId := item.WxGongzhonghaoId //微信公众号ID，1：FOHOW玖玖
+	wxGongzhonghaoId := item.WxGongzhonghaoId //微信公众号ID，1：凤凰菁选
 
 	DEFAULTGONGZHONGHAO := int64(1)
 	if beego.BConfig.RunMode == beego.DEV {

go/gopath/src/fohow.com/conf/app.conf

@@ -51,7 +51,7 @@ WxFohowAndroAppSecret = "da2882779e983e2acfb573d01cb1fb7d"
 JsSDKConfigTicketAppId = "wxbddd1caf692557c4"
 JsSDKConfigTicketAppSecret = "315e368b472ac4aa6d4fc500d184f5eb"
 
-#FOHOW玖玖测试公众号
+#凤凰菁选测试公众号
 WxMPAppId = "wxbddd1caf692557c4"
 WxMPAppSecret = "be6cb03f9a8c13a557728616a9e6039c"
 
@@ -95,10 +95,10 @@ Gzh_MessageTemplateId_OpenPrize= "lAYZ7E3LUadQkgRjmZ6TvyQhHmUvhc6drP6lUiSl8ug"
 Gzh_MessageTemplateId_DealUnpay= "dEgLLsKVf_hBqh21nQLpAYmR6t0GNR83JXBqw-Jtc8E"
 Gzh_MessageTemplateId_NewProject= "iJxsToxHLL0vxb7srmaGRfdfLeu7zdisn4wON8M9lsw"
 
-#抽奖中奖到FOHOW玖玖下单秘钥
+#抽奖中奖到凤凰菁选下单秘钥
 RabbitOrderProductKey = "1234567890123456"
 
-#正式项目474、测试项目1054筹中筹项目到FOHOW玖玖下单
+#正式项目474、测试项目1054筹中筹项目到凤凰菁选下单
 CzcOrderProductKey = "1234567890123456"
 
 # 到第五创查询号码是否已经注册
@@ -179,7 +179,7 @@ WxFohowAndroAppSecret = "315e368b472ac4aa6d4fc500d184f5eb"
 JsSDKConfigTicketAppId = "wx2479f58240be58aa"
 JsSDKConfigTicketAppSecret = "d9243f828f3c9dac198a539981a578b8"
 
-#FOHOW玖玖正式公众号
+#凤凰菁选正式公众号
 WxMPAppId = "wx2479f58240be58aa"
 WxMPAppSecret = "d9243f828f3c9dac198a539981a578b8"
 
@@ -226,10 +226,10 @@ Gzh_MessageTemplateId_OpenPrize= "4qHdrmeippr6u_R5ser5Op_cEJqdDnP0HofD8Y1tl2k"
 Gzh_MessageTemplateId_DealUnpay= "EMWYRXVPtY_jd5EI2ijhWktN3fHoAqMqMNlHQ-hGhpQ"
 Gzh_MessageTemplateId_NewProject= "qafnEW-3Yq9eKPA0FJm_a9auyOJuYWpGAKxzJOjc_TM"
 
-#抽奖中奖到FOHOW玖玖下单秘钥
+#抽奖中奖到凤凰菁选下单秘钥
 RabbitOrderProductKey = "d283aa400af464c7"
 
-#正式项目474、测试项目1054筹中筹项目到FOHOW玖玖下单
+#正式项目474、测试项目1054筹中筹项目到凤凰菁选下单
 CzcOrderProductKey = "4bfeada662c250ae"
 
 # 到第五创查询号码是否已经注册