Quellcode durchsuchen

add live award patch function

abiao vor 5 Jahren
Ursprung
Commit
5f4e50df96

+ 11 - 12
go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/live_award_controller.go

@@ -2,6 +2,7 @@ package railsadmin_controller
 
 import (
 	"fmt"
+	"fohow.com/apps"
 	"fohow.com/apps/models/balance_model"
 	"fohow.com/apps/models/cent_model"
 	"fohow.com/apps/models/live_model"
@@ -20,32 +21,30 @@ func (self *RailsadminController) LiveAward() {
 
 	beego.BeeLogger.Warn("LiveAward id:(%d)", id)
 
-	go PatchLiveAward(id)
-
-	self.ServeJSON()
-}
-
-func PatchLiveAward(id int64) {
 	LiveAward := live_model.GetLiveAwardById(id, true)
 	if LiveAward == nil {
 		beego.BeeLogger.Warn("----------------LiveAward not exist ")
-		return
+		self.ReturnError(404, apps.NoExist, "", nil)
 	}
 	if LiveAward.Status {
 		beego.BeeLogger.Warn("----------------LiveAward has patched ")
-		return
+		self.ReturnError(404, apps.HasPatched, "", nil)
 	}
 	wxUserId := LiveAward.WxUserId
 	wxUser := user_model.GetWxUserById(wxUserId, true)
 	if wxUser == nil {
-		return
+		self.ReturnError(404, apps.NoExist, "", nil)
 	}
 	if (LiveAward.Prod1 > 0 && LiveAward.Nums1 > 0) || (LiveAward.Prod2 > 0 && LiveAward.Nums2 > 0) || (LiveAward.Prod3 > 0 && LiveAward.Nums3 > 0) {
+
+		if len(LiveAward.Address) == 0 {
+			self.ReturnError(404, apps.AddressNotExist, "", nil)
+		}
 		//创建赠品订单
 		order := new(order_model.Order).CreateNew(wxUser.Id, wxUser.UserId,
 			int64(0), int64(0), order_model.ORDER_TYPE_LIVE, wxUser.Depart, order_model.SOURCE_XCX)
 		if order == nil {
-			return
+			self.ReturnError(404, apps.CreateOrderFail, "", nil)
 		}
 		totalPrice := int64(0)
 		if LiveAward.Prod1 > 0 && LiveAward.Nums1 > 0 {
@@ -83,7 +82,6 @@ func PatchLiveAward(id int64) {
 	}
 
 	orderId := fmt.Sprintf("live_award--%d", LiveAward.Id)
-
 	//赠送积分 or 代办费
 	if LiveAward.Cash > 0 {
 		totalCash := LiveAward.Cash
@@ -102,5 +100,6 @@ func PatchLiveAward(id int64) {
 	LiveAward.Status = true
 	LiveAward.Save()
 	beego.BeeLogger.Warn("----------------end patch live awards ---%d ", id)
-	return
+
+	self.ServeJSON()
 }

+ 1 - 0
go/gopath/src/fohow.com/apps/init.go

@@ -199,6 +199,7 @@ var (
 
 	OnlyNew        = []string{"onlyNew", "仅限新人购买"}
 	OrderNotEnough = []string{"orderNotEnough", "订单金额不满足"}
+	HasPatched     = []string{"hasPached", "已发放"}
 )
 
 type BaseController struct {