Merge branch 'fix/charge_tips' into 'master'

充值提示

See merge request !16

common/constDef.go

@@ -107,6 +107,7 @@ const (
 	MSG_ID_BUY_FROM_FAMILY     MsgIdType = 167 // 请向本家族代理购买钻石
 	MSG_ID_NEED_JOIN_FAMILY    MsgIdType = 168 // 请加入代理的家族后进行购买
 	MSG_ID_SET_FAMILY_NAMEPL   MsgIdType = 169 // 等级不够不能修改家族铭牌
+	MSG_ID_CHARGE_NO_AREA      MsgIdType = 181 // 充值（代理转账，用户给代理充值），失败，不是本区域用户
 
 	ADD_GROUP_FAILED    AddGroupResultType = 0
 	ADD_GROUP_DONE      AddGroupResultType = 1

domain/service/diamond_s/diamond.go

@@ -38,7 +38,7 @@ func (this *DiamondService) CheckDealerTransferFamilyLimit(dealerId, userId uint
 		return err
 	}
 	if dealerArea != area {
-		return bizerr.DealerCannotSaleToOtherArea
+		return myerr.WrapErr(res_m.GetErrByLanguage(model.Db, common.MSG_ID_CHARGE_NO_AREA, lang, bizerr.DealerCannotSaleToOtherArea))
 	}
 
 	// 代理、用户是否加入了家族

route/middleHandle.go

@@ -102,6 +102,12 @@ func LoggerHandle(c *gin.Context) {
 	c.Set(mycontext.APP_VERSION, appVersion)
 	c.Set(mycontext.URL, reqUri)
 	c.Set(mycontext.METHOD, method)
+	lang := header.Get(mycontext.LANGUAGE)
+	c.Set(mycontext.LANGUAGE, lang)
+	carrier := header.Get(mycontext.CARRIER)
+	c.Set(mycontext.CARRIER, carrier)
+	timezone := header.Get(mycontext.TIMEZONE)
+	c.Set(mycontext.TIMEZONE, timezone)
 
 	userId, _ := req.GetUserId(c)