abiao 2 роки тому
батько
коміт
e99a5a657c

+ 17 - 11
go/gopath/src/fohow.com/apps/models/balance_model/cash_balance.go

@@ -31,6 +31,12 @@ const (
 	CASH_SOURCE_PROJECT_LOAN      = "project_loan"
 	CASH_SOURCE_PROJECT_LOAN_NAME = "项目放款"
 
+	ORDER_FOOD      = "order_food"
+	ORDER_FOOD_NAME = "订餐扣费"
+
+	CANCEL_FOOD      = "cancel_food"
+	CANCEL_FOOD_NAME = "取消订餐"
+
 	CASH_SOURCE_EXTRACT_REJECT       = "extract_reject"  //拒绝提现
 	CASH_SOURCE_EXTRACT_REJECT_NAME  = "拒绝提现"            //拒绝提现
 	CASH_SOURCE_PRODUCT_BENEFIT      = "product_benefit" // 一级商品佣金
@@ -86,7 +92,7 @@ const (
 
 )
 
-//现金余额表
+// 现金余额表
 type CashBalance struct {
 	Id         int64     `orm:"column(id);pk"                                       json:"id"`        // int(11)
 	WxUId      int64     `orm:"column(wx_uid)"                                      json:"wx_uid"`    // int(11)
@@ -100,7 +106,7 @@ type CashBalance struct {
 	UpdatedAt  time.Time `orm:"column(updated_at);null;auto_now;type(datetime)"     json:"-"`         // datetime
 }
 
-//充值订单表
+// 充值订单表
 type RechargeCashOrder struct {
 	Id                int64     `orm:"column(id);pk"                                  json:"id"`         // int(11)
 	OrderId           string    `orm:"column(order_id)"                               json:"order_id"`   // varchar(64)
@@ -142,7 +148,7 @@ func (self *CashBalance) Create(wxUId, c int64, s, rId, remark string) (item *Ca
 	return item
 }
 
-//返回source名称
+// 返回source名称
 func (self *CashBalance) GetSourceName() string {
 	sourceName := ""
 	switch self.Source {
@@ -198,7 +204,7 @@ func (self *CashBalance) GetSourceName() string {
 	return sourceName
 }
 
-//获取某人的现金流列表
+// 获取某人的现金流列表
 func GetCashBalanceListByWxUId(wxUId, page, perPage int64, useCache bool) (list []*CashBalance) {
 	k := fmt.Sprintf("balance_model.GetCashBalanceListByWxUId(%d).page(%d).perPage(%d)", wxUId, page, perPage)
 	if useCache {
@@ -225,7 +231,7 @@ func GetCashBalanceListByWxUId(wxUId, page, perPage int64, useCache bool) (list
 	return list
 }
 
-//获取某人的现金流列表总条数
+// 获取某人的现金流列表总条数
 func GetCashBalanceCountByWxUId(wxUId int64) int64 {
 	item := new(CashBalance)
 	o := orm.NewOrm()
@@ -233,7 +239,7 @@ func GetCashBalanceCountByWxUId(wxUId int64) int64 {
 	return count
 }
 
-//账户进账总额
+// 账户进账总额
 func GetCashEnterBalance(wxUId int64) int64 {
 	type Ret struct {
 		Count int64
@@ -253,7 +259,7 @@ func GetCashEnterBalance(wxUId int64) int64 {
 	return ret.Count
 }
 
-//账户出账总额
+// 账户出账总额
 func GetCashOutBalance(wxUId int64) int64 {
 	type Ret struct {
 		Count int64
@@ -273,7 +279,7 @@ func GetCashOutBalance(wxUId int64) int64 {
 	return ret.Count
 }
 
-//账户余额
+// 账户余额
 func GetCashTotalBalance(wxUId int64) int64 {
 	type Ret struct {
 		Count int64
@@ -307,7 +313,7 @@ func GetCashBalanceByWxUIdAndRIdAndSource(wxUId int64, rId, source string) *Cash
 	return item
 }
 
-//创建充值订单
+// 创建充值订单
 func (self *RechargeCashOrder) Create(wxUId, uId, tp int64, payway string) (item *RechargeCashOrder) {
 	oId := createOrderId(ORDER_ID_PREFIX_CZCB)
 	item = &RechargeCashOrder{
@@ -366,7 +372,7 @@ func GetCashBalanceBySourceAndRId(source, rId string) *CashBalance {
 	return item
 }
 
-//获取某人的现金流列表
+// 获取某人的现金流列表
 func GetCasTohBalanceListByWxUId(wxUId, page, perPage int64, s string, useCache bool) (list []*CashBalance) {
 	k := fmt.Sprintf("balance_model.GetCashBalanceListByWxUId(%d).page(%d).perPage(%d)", wxUId, page, perPage)
 	if useCache {
@@ -393,7 +399,7 @@ func GetCasTohBalanceListByWxUId(wxUId, page, perPage int64, s string, useCache
 	return list
 }
 
-//获取某人的现金流列表总条数
+// 获取某人的现金流列表总条数
 func GetCashToBalanceCountByWxUId(wxUId int64, s string) int64 {
 	item := new(CashBalance)
 	o := orm.NewOrm()

+ 9 - 5
go/gopath/src/fohow.com/apps/models/balance_model/silver.go

@@ -60,7 +60,7 @@ func GetSilverById(id int64) *Silver {
 	return item
 }
 
-//获取某人的银豆流列表
+// 获取某人的银豆流列表
 func GetSilverListByWxUId(wxUId, page, perPage int64, useCache bool) (list []*Silver) {
 	k := fmt.Sprintf("silver_model.GetSilverList.wxUId(%d).page(%d).perPage(%d)", wxUId, page, perPage)
 	if useCache {
@@ -83,7 +83,7 @@ func GetSilverListByWxUId(wxUId, page, perPage int64, useCache bool) (list []*Si
 	return list
 }
 
-//获取某人的银豆流列表总条数
+// 获取某人的银豆流列表总条数
 func GetSilverCountByWxUId(wxUId int64) int64 {
 	item := new(Silver)
 	o := orm.NewOrm()
@@ -91,7 +91,7 @@ func GetSilverCountByWxUId(wxUId int64) int64 {
 	return count
 }
 
-//获取某个用户的余额
+// 获取某个用户的余额
 func GetUserTotalSilver(wxUId int64) int64 {
 	type Ret struct {
 		Count int64
@@ -111,7 +111,7 @@ func GetUserTotalSilver(wxUId int64) int64 {
 	return ret.Count
 }
 
-//获取某个source累计余额
+// 获取某个source累计余额
 func GetSilverCountBySource(wxUId int64, source string) int64 {
 	type Ret struct {
 		Count int64
@@ -194,7 +194,7 @@ func GetRefundSilverByRelateId(rId string, useCache bool) *Silver {
 	return item
 }
 
-//返回source名称
+// 返回source名称
 func (self *Silver) GetSourceName() string {
 	sourceName := ""
 	switch self.Source {
@@ -244,6 +244,10 @@ func (self *Silver) GetSourceName() string {
 		sourceName = CASH_SOURCE_DOLLAR_WIN_RETURN_NAME
 	case FX_CASH_SOURCE_PRODUCT_BENEFIT:
 		sourceName = FX_CASH_SOURCE_PRODUCT_BENEFIT_NAME
+	case ORDER_FOOD:
+		sourceName = ORDER_FOOD_NAME
+	case CANCEL_FOOD:
+		sourceName = CANCEL_FOOD_NAME
 		// case BALANCE_SOURCE_PART_REFUNDED:
 		// 	sourceName = BALANCE_SOURCE_PART_REFUNDED_NAME
 	}