2.1.0改bug

controllers/coupon/coupon.go

@@ -280,3 +280,12 @@ func (c *CouponController) GetCustomerCouponByCustomerAndSale() {
 	}
 	c.ResponseJSON(Coupons)
 }
+
+func (c *CouponController) GetSysCouponByCase() {
+	caseId := c.GetString(":caseId")
+	coupon, err := c.serv.GetSysCouponByCase(caseId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(coupon)
+}

controllers/flashbuy/flashbuy.go

@@ -7,8 +7,6 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/flashbuy"
 	"spaceofcheng/services/utils"
-
-	"github.com/astaxie/beego"
 )
 
 // CaseController 信息
@@ -31,7 +29,6 @@ func (c *FlashBuyController) GetFlashBuyList() {
 	}
 	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)

controllers/marketing/marketing.go

@@ -43,10 +43,12 @@ func (c *MarketingController) SaveMarketing() {
 	activityType := c.GetString("activityType")
 	activeType := c.GetString("activeType")
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
+	caseId := c.GetString("CaseId")
 
 	// 赋值
 	marketing.ActivityName = activityName
 	marketing.ActivityType = activityType
+	marketing.CaseId = caseId
 
 	newInfo, _, err := c.serv.SaveMarketing(marketing, activeType, resourceDesc)
 	if err != nil {

models/card/card.go

@@ -538,7 +538,7 @@ FROM
 WHERE
 	send_type = '` + models.GIVE_TYPE_SYSTEM + `'
 	and case_id = '` + caseid + `'
-	and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	and  status > ` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&card)
 	return card, err
 

models/coupon/coupon.go

@@ -586,3 +586,17 @@ func (m *CouponDAO) SaveCouponChannel(channelid, couponid string) error {
 	_, err := m.db.Insert(&couponChannel)
 	return err
 }
+
+func (m *CouponDAO) GetSysCouponByCase(caseid string) ([]model.TaCoupon, error) {
+	var coupon []model.TaCoupon
+	sql := `SELECT
+	* 
+FROM
+	ta_coupon 
+WHERE
+	send_type = '` + models.GIVE_TYPE_SYSTEM + `'
+	and case_id = '` + caseid + `'
+	and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&coupon)
+	return coupon, err
+}

models/flashbuy/flashbuy.go

@@ -8,8 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
-
 	"github.com/go-xorm/xorm"
 )
 
@@ -57,13 +55,12 @@ FROM
 	Where a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
 	if flashBuyName != "" {
-		sql += ` and a.flash_buy_name = '` + flashBuyName + `' `
+		sql += ` and a.flash_buy_name like '%` + flashBuyName + `%'`
 	}
 	if flashBuyStatus != "" {
 		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
 }
@@ -77,7 +74,7 @@ FROM
 	Where a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
 	if flashBuyName != "" {
-		sql += ` and a.flash_buy_name = '` + flashBuyName + `' `
+		sql += ` and a.flash_buy_name like '%` + flashBuyName + `%'`
 	}
 	if flashBuyStatus != "" {
 		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
@@ -166,7 +163,7 @@ WHERE
 	a.flash_buy_id = '` + flashBuyId + `' 
 	and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	if phone != "" {
-		sql += ` and b.phone = '` + phone + `'`
+		sql += ` and b.phone like '%` + phone + `%'`
 	}
 	sql += ` order by a.create_date desc  limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&customerFlashBuy)
@@ -188,7 +185,7 @@ WHERE
 	a.flash_buy_id = '` + flashBuyId + `' 
 	and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	if phone != "" {
-		sql += ` and b.phone = '` + phone + `'`
+		sql += ` and b.phone like '%` + phone + `%'`
 	}
 	err := m.db.Sql(sql).Find(&customerFlashBuy)
 	return len(customerFlashBuy), err

routers/common.go

@@ -269,6 +269,7 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "put:UpdateCoupon"),
 		beego.NSRouter("/coupon/:id/to/:users", &coupon.CouponController{}, "post:GiveCoupon"),
 		beego.NSRouter("/coupon/type/:type", &coupon.CouponController{}, "get:GetCouponBySendType"),
+		beego.NSRouter("/coupon/sys/:caseId", &coupon.CouponController{}, "get:GetSysCouponByCase"),
 
 		// 签到
 		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
@@ -280,7 +281,7 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByIDForAdmin"),
 		beego.NSRouter("/card/:id", &card.CardController{}, "put:UpdateCard"),
 		beego.NSRouter("/card/:id/to/:users", &card.CardController{}, "post:GiveCard"),
-		beego.NSRouter("/card/:caseId", &card.CardController{}, "get:GetSysCardList"),
+		beego.NSRouter("/card/sys/:caseId", &card.CardController{}, "get:GetSysCardList"),
 		// 赠送记录
 		beego.NSRouter("/record", &card.RecordController{}, "get:GetRecordList"),
 
@@ -329,7 +330,7 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
 		beego.NSRouter("/flashbuy", &flashbuy.FlashBuyController{}, "post:SaveFlashBuy"),
 		beego.NSRouter("/flashbuy/edit", &flashbuy.FlashBuyController{}, "put:SaveFlashBuy"),
-		beego.NSRouter("/flashbuy/:channelId", &flashbuy.FlashBuyController{}, "delete:DeleteFlashBuy"),
+		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "delete:DeleteFlashBuy"),
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
 		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
 		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),

service/coupon/coupon.go

@@ -691,3 +691,12 @@ func (s *CouponServ) GetCustomerCouponByCustomerAndSale(customerid string, page,
 		"page":     page,
 	}, nil
 }
+
+func (s *CouponServ) GetSysCouponByCase(caseid string) ([]model.TaCoupon, error) {
+	coupon, err := s.dao.GetSysCouponByCase(caseid)
+	if err != nil {
+		utils.LogError("获取系统赠送券失败: " + err.Error())
+		return nil, errors.New("获取系统赠送券失败")
+	}
+	return coupon, nil
+}

service/flashbuy/flashbuy.go

@@ -62,6 +62,18 @@ func (s *FlashBuyServ) GetFlashBuyById(flashBuyId string) (*model.TaFlashBuy, er
 func (s *FlashBuyServ) SaveFlashBuy(flashbuy model.TaFlashBuy) (*model.TaFlashBuy, error) {
 	var newFlashBuy *model.TaFlashBuy
 	var err error
+	if flashbuy.CaseId == "" {
+		return nil, utils.LogError("请选择所属案场！")
+	}
+	if flashbuy.FlashBuyName == "" {
+		return nil, utils.LogError("请输入活动标题！")
+	}
+	if flashbuy.FlashBuyInfo == "" {
+		return nil, utils.LogError("请输入活动描述！")
+	}
+	if flashbuy.ModelId == "" {
+		return nil, utils.LogError("请选择活动模板！")
+	}
 	if flashbuy.FlashBuyId == "" {
 		org := s.ctx.Get("org").(model.SysOrg)
 		flashbuy.OrgId = org.OrgId

service/marketing/marketing.go

@@ -109,14 +109,15 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 	var newInfo *model.SysActivity
 	var newWoke *model.SysActivityAction
 
-	user := s.ctx.Get("user").(model.SysUser)
+	// user := s.ctx.Get("user").(model.SysUser)
 
-	caseinfo, err := s.userdao.GetUserBelongCase(user.UserId)
-	if err != nil {
-		return nil, nil, err
-	}
-	activity.CaseId = caseinfo.CaseId
+	// caseinfo, err := s.userdao.GetUserBelongCase(user.UserId)
+	// if err != nil {
+	// 	return nil, nil, err
+	// }
+	// activity.CaseId = caseinfo.CaseId
 	// 存储 营销活动
+	var err error
 	newInfo, err = s.dao.AddMarketing(activity)
 	if err != nil {
 		return nil, nil, err