2.1.0

controllers/flashbuy/flashbuy.go

@@ -1,9 +1,14 @@
 package flashbuy
 
 import (
+	"encoding/json"
+	"errors"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/flashbuy"
+	"spaceofcheng/services/utils"
+
+	"github.com/astaxie/beego"
 )
 
 // CaseController 信息
@@ -24,8 +29,9 @@ func (c *FlashBuyController) GetFlashBuyList() {
 		cases := c.Context.Get("cases").([]model.SysUserCase)
 		caseIDs = c.GetCaseIDs(cases)
 	}
-	flashBuyName := c.GetString("flashBuyName")
-	flashBuyStatus := c.GetString("flashBuyStatus")
+	flashBuyName := c.GetString("flashbuyname")
+	flashBuyStatus := c.GetString("flashbuystatus")
+	beego.Error(flashBuyStatus)
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	list, err := c.dao.GetFlashBuyList(caseIDs, flashBuyName, flashBuyStatus, page, pageSize)
@@ -78,11 +84,16 @@ func (c *FlashBuyController) GetCustomerFlashBuyId() {
 }
 
 func (c *FlashBuyController) SaveFlashBuy() {
-	flashbuy := model.TaFlashBuy{}
-	if err := c.ParseForm(&flashbuy); err != nil {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
+	info := model.TaFlashBuy{}
+	if err := json.Unmarshal([]byte(jsnStr), &info); err != nil {
+		utils.LogError("抢购数据转换失败: " + err.Error())
 		c.ResponseError(err)
 	}
-	newFlashBuy, err := c.dao.SaveFlashBuy(flashbuy)
+	newFlashBuy, err := c.dao.SaveFlashBuy(info)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/customer/customer.go

@@ -5,6 +5,7 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
@@ -281,9 +282,17 @@ func (m *CustomerDAO) GetSalesByRecommendCode(recommendCode string) (*model.SysU
 }
 
 func (m *CustomerDAO) GetSalesCaseById(userId string) (*model.SysUserCase, error) {
-	userCase := new(model.SysUserCase)
-	if _, err := m.db.Where("user_id = ?", userId).Get(userCase); err != nil {
+	var userCase []model.SysUserCase
+	sql := `SELECT
+	* 
+FROM
+	sys_user_case 
+WHERE
+	is_belong = 1 
+	AND user_id = '` + userId + `'and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&userCase)
+	if len(userCase) <= 0 {
 		return nil, err
 	}
-	return userCase, nil
+	return &userCase[0], err
 }

models/flashbuy/flashbuy.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -53,7 +55,7 @@ FROM
 	ta_flash_buy a
 	INNER JOIN sys_case b ON a.case_id = b.case_id
 	Where a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	and a.case_id in(` + strings.Replace(caseid, ",", "','", -1) + `')`
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
 	if flashBuyName != "" {
 		sql += ` and a.flash_buy_name = '` + flashBuyName + `' `
 	}
@@ -61,6 +63,7 @@ FROM
 		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
 	}
 	sql += ` order by a.start_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
+	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&flashBuy)
 	return flashBuy, err
 }
@@ -72,7 +75,7 @@ func (m *FlashbuyDAO) GetFlashBuyListCount(caseid, flashBuyName, flashBuyStatus
 FROM
 	ta_flash_buy a
 	Where a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	and a.case_id in(` + strings.Replace(caseid, ",", "','", -1) + `')`
+	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
 	if flashBuyName != "" {
 		sql += ` and a.flash_buy_name = '` + flashBuyName + `' `
 	}

routers/common.go

@@ -328,7 +328,7 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/flashbuy/customer/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyList"),
 		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
 		beego.NSRouter("/flashbuy", &flashbuy.FlashBuyController{}, "post:SaveFlashBuy"),
-		beego.NSRouter("/flashbuy", &flashbuy.FlashBuyController{}, "put:SaveFlashBuy"),
+		beego.NSRouter("/flashbuy/edit", &flashbuy.FlashBuyController{}, "put:SaveFlashBuy"),
 		beego.NSRouter("/flashbuy/:channelId", &flashbuy.FlashBuyController{}, "delete:DeleteFlashBuy"),
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
 		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),

service/flashbuy/flashbuy.go

@@ -63,6 +63,8 @@ func (s *FlashBuyServ) SaveFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBu
 	var newFlashBuy *model.TaFlashBuy
 	var err error
 	if flashbuy.FlashBuyId == "" {
+		org := s.ctx.Get("org").(model.SysOrg)
+		flashbuy.OrgId = org.OrgId
 		newFlashBuy, err = s.dao.AddNewFlashBuy(flashbuy)
 	} else {
 		err = s.dao.EditFlashBuy(flashbuy)