sys config upgrade

go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -2,8 +2,8 @@ package order_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/cent_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/lib_redis"
 	// "fmt"
 	"strconv"
@@ -113,8 +113,8 @@ func (self *OrderController) Create() {
 	if wxUId == 76 {
 		totalPrice = 1
 	}
-	freight := base_config.GetFreight()
-	if totalPrice >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if totalPrice >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 
@@ -246,8 +246,8 @@ func (self *OrderController) MultipleCreate() {
 		totalPrice += product.Price * cNums
 		CreateOrderDetails(product, order, cNums, wxUser.Depart)
 	}
-	freight := base_config.GetFreight()
-	if totalPrice >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if totalPrice >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 	order.TotalPrice = totalPrice
@@ -329,8 +329,8 @@ func (self *OrderController) MultShopCreate() {
 		totalPrice += product.Price * cNums
 		CreateOrderDetails(product, order, cNums, wxUser.Depart)
 	}
-	freight := base_config.GetFreight()
-	if totalPrice >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if totalPrice >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 	order.TotalPrice = totalPrice
@@ -407,9 +407,9 @@ func (self *OrderController) MultCentCreate() {
 	}
 
 	//订单合法性判断
-	freight := base_config.GetFreight()
-	if totalPrice < base_config.GetOrderLimit() {
-		self.ReturnError(403, []string{apps.OrderNotEnough[0], fmt.Sprintf("订单金额不能低于%d积分", base_config.GetOrderLimit()/int64(100))}, "", nil)
+	freight := sys_config.GetFreight()
+	if totalPrice < sys_config.GetOrderLimit() {
+		self.ReturnError(403, []string{apps.OrderNotEnough[0], fmt.Sprintf("订单金额不能低于%d积分", sys_config.GetOrderLimit()/int64(100))}, "", nil)
 	} else {
 		freight = int64(0)
 	}

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

@@ -2,7 +2,6 @@ package pay_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/cent_model"
 	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/lib_redis"
@@ -147,8 +146,8 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 		totalCoupon := int64(0)
 		userLeftBalanceCount := balance_model.GetUserTotalBalance(wxUId)
 		tp := order.TotalPrice
-		freight := base_config.GetFreight()
-		if tp >= base_config.GetOrderLimit() {
+		freight := sys_config.GetFreight()
+		if tp >= sys_config.GetOrderLimit() {
 			freight = int64(0)
 		}
 		tp += freight
@@ -201,8 +200,8 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 			order.Source = source
 			order.Save()
 			if order.Source == order_model.SOURCE_XCX { //小程序微信支付
-				freight := base_config.GetFreight()
-				if order.TotalPrice >= base_config.GetOrderLimit() {
+				freight := sys_config.GetFreight()
+				if order.TotalPrice >= sys_config.GetOrderLimit() {
 					freight = int64(0)
 				}
 				order.TotalPrice += freight
@@ -370,8 +369,8 @@ func (self *PayController) payCentExchange(oId, returnUrl, source, remark string
 	//直接抵扣积分，积分不够则报错
 	userLeftCent := cent_model.GetCentTotalBalance(wxUId)
 	tp := order.TotalPrice
-	freight := base_config.GetFreight()
-	if tp >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if tp >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 	tp += freight

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

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"fohow.com/apps"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/base_config"
+	"fohow.com/apps/models/sys_config"
 	"github.com/astaxie/beego"
 	"strings"
 )
@@ -14,7 +14,7 @@ func (self *PayController) CreateBalanceOrder() {
 
 	//校验兑换提货券数量，为正整数
 	//count, _ := self.GetInt64("count") //兑换数量
-	count := base_config.GetBuyCash()
+	count := sys_config.GetBuyCash()
 
 	if count <= 0 {
 		self.ReturnError(403, apps.RechargeCountWrong, "", nil)
@@ -37,8 +37,8 @@ func (self *PayController) CreateBalanceOrder() {
 		self.ReturnError(403, apps.PayWayNoMatch, "", nil)
 	}
 	tp := int64(0)
-	if count == base_config.GetBuyCash() {
-		tp = base_config.GetSendCash()
+	if count == sys_config.GetBuyCash() {
+		tp = sys_config.GetSendCash()
 	} else {
 		tp = count
 	}

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

@@ -5,7 +5,7 @@ import (
 	"fohow.com/apps"
 	"fohow.com/apps/helpers"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/base_config"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/apps/models/user_model"
 	"fohow.com/cache"
 	"github.com/astaxie/beego"
@@ -63,9 +63,9 @@ func ApplySuccessInviterBenefit(wxUser *user_model.WxUser, shopId int64, source
 	}
 	//本人充值16800--发放4200提货券
 	rId := fmt.Sprintf("shop-apply-%d", shopId)
-	c := base_config.GetUserCash()
-	if shopApply.Total == base_config.GetAgentApply() {
-		c = base_config.GetAgentCash()
+	c := sys_config.GetUserCash()
+	if shopApply.Total == sys_config.GetAgentApply() {
+		c = sys_config.GetAgentCash()
 	}
 	benefitWxUser := GetInviter(wxUser)
 	if benefitWxUser == nil || benefitWxUser.Id == int64(1) {
@@ -85,10 +85,10 @@ func ApplySuccessInviterBenefit(wxUser *user_model.WxUser, shopId int64, source
 
 	//发放佣金  13800-4500 16800-5000
 	count := int64(0)
-	if shopApply.Total == base_config.GetUserApply() {
-		count = base_config.GetUserAward()
+	if shopApply.Total == sys_config.GetUserApply() {
+		count = sys_config.GetUserAward()
 	} else {
-		count = base_config.GetAgentAward()
+		count = sys_config.GetAgentAward()
 	}
 	if count > int64(0) {
 		remark := fmt.Sprintf("%s%s", wxUser.Nickname, "店长申请成功")

go/gopath/src/fohow.com/apps/controllers/user_controller/user_controller.go

@@ -2,8 +2,8 @@ package user_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/cent_model"
+	"fohow.com/apps/models/sys_config"
 	"strconv"
 
 	// "strconv"
@@ -411,9 +411,9 @@ func (self *UserController) ShopApplication() {
 	if wxUser.Rank > user_model.WX_USER_RANK_ONE {
 		self.ReturnError(403, apps.AlreadyShop, "", nil)
 	}
-	total := base_config.GetUserApply()
+	total := sys_config.GetUserApply()
 	if wxUser.Rank == user_model.WX_USER_RANK_ONE {
-		total = base_config.GetAgentApply()
+		total = sys_config.GetAgentApply()
 	}
 	k := fmt.Sprintf("%s%s", sms_model.SHOP_APPLICATION, mobile)
 	if cacheCode, ok := cache.Cache.Get(k).(string); ok {

go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

@@ -3,8 +3,8 @@ package helpers
 import (
 	"fmt"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/order_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/apps/models/user_model"
 	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
@@ -70,8 +70,8 @@ func NewSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 		if benefitWxUser != nil {
 			count := int64(0)
 			//读取上级配置收益比例
-			if balanceOrder.PaiedPrice >= base_config.GetBuyCash() {
-				be_total := balanceOrder.PaiedPrice * base_config.GetCashAward()
+			if balanceOrder.PaiedPrice >= sys_config.GetBuyCash() {
+				be_total := balanceOrder.PaiedPrice * sys_config.GetCashAward()
 				count = be_total / int64(100)
 			}
 			if count > 0 {

go/gopath/src/fohow.com/apps/helpers/recharge_helper.go

@@ -2,7 +2,7 @@ package helpers
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
 	"strings"
@@ -41,7 +41,7 @@ func PatchRechargeBalance(oId, totalFee int64, transactionId string) {
 	if wxUser != nil {
 		NewSendInviterBenefit(wxUser, order.OrderId, user_model.BALANCE_BENEFIT)
 	}
-	if totalFee >= base_config.GetBuyCash() && wxUser.ShowInviteMode != 1 {
+	if totalFee >= sys_config.GetBuyCash() && wxUser.ShowInviteMode != 1 {
 
 		//升级群主---0317手动升级群主
 		specialDepartStr := beego.AppConfig.String("SpecialDepart")