Merge branch 'develop'

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

@@ -269,6 +269,7 @@ func (self *OrderController) GetCartList() {
 		item.UseQuan = product.UseQuan
 		item.ProductName = product.Name
 		item.Pv = product.Pv
+		item.Silver = product.Silver
 	}
 	count := int64(0)
 	total := int64(0)

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

@@ -21,7 +21,6 @@ import (
 	"github.com/uuid"
 
 	"fohow.com/apps"
-	"fohow.com/apps/helpers"
 	// "fohow.com/apps/controllers/user_controller"
 	// "fohow.com/apps/models/activity_model"
 	// "fohow.com/apps/models/order_model"
@@ -166,7 +165,7 @@ func (self *PermitController) XcxLogin() {
 		}
 		wxUser = new(user_model.WxUser).QuickCreate(key.Openid, key.Unionid, ip, user.Id, inviteId, introUserId, depart)
 		//赠送积分
-		go helpers.SendCent(wxUser.Id, inviteId)
+		//go helpers.SendCent(wxUser.Id, inviteId)
 	}
 	//self.SetSession(apps.XcxSessionKey, key.SessionKey)
 	sessionKey := lib_redis.GetKeySessionKey(wxUser.Id)

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

@@ -38,6 +38,7 @@ type Cart struct {
 	Package         bool           `orm:"-"     json:"package"`
 	UseQuan         bool           `orm:"-"     json:"use_quan"`
 	Pv              int64          `orm:"-"     json:"pv"`           // pv
+	Silver          int64          `orm:"-"     json:"silver"`       // silver
 	PackageList     []*ProductItem `orm:"-"     json:"package_list"` // varchar(255)
 }