Merge branch 'master' into develop

* master:
  after pay controller -verify pay result edit
  add agent  apply function
  add agent  apply function

# Conflicts:
#	go/gopath/src/fohow.com/libs/wx_mp/pay.go

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

@@ -140,7 +140,8 @@ func (self *PayController) wxPayExchangeAsync() {
 	order := order_model.GetOrderById(orderId, false)
 	payCode := pay_model.GetPayConfigByDepart(order.Depart, true)
 	// 签名校验参数
-	if !wx_mp.VerifyPayResult(params, payCode) && !wx_mp.VerifyGzhPayResult(params, payCode) {
+	//&& !wx_mp.VerifyGzhPayResult(params, payCode)
+	if !wx_mp.VerifyPayResult(params, payCode) {
 		beego.BeeLogger.Error("VerifyPayResult not pass")
 		self.Ctx.WriteString(wx_mp.MapToXmlString(notifyResponse))
 		return

go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -710,7 +710,7 @@ func UpdateSaleNums(saleProducts map[int64]int64) bool {
 
 	for pId, nums := range saleProducts {
 
-		beego.BeeLogger.Error("pId,Nums %d--%d", pId, nums)
+		//beego.BeeLogger.Error("pId,Nums %d--%d", pId, nums)
 
 		product := product_model.GetProductById(pId, true)
 		if product == nil {

go/gopath/src/fohow.com/libs/wx_mp/pay.go

@@ -344,8 +344,8 @@ func VerifyPayResult(payResult *PayResult, payCode string) bool {
 		beego.BeeLogger.Error("transfer xmlstruct to map err=[%s]", err)
 		return false
 	}
-	beego.BeeLogger.Warn("*****params: %v", params)
-	beego.BeeLogger.Warn("*****sign: %s", sign)
+	//beego.BeeLogger.Warn("*****params: %v", params)
+	//beego.BeeLogger.Warn("*****sign: %s", sign)
 	mchSign := mch.Sign(params, mechantInfo.ApiKey, nil)
 	// beego.BeeLogger.Warn("*****mch sign: %s", mchSign)
 	return sign == mchSign