add test case

conf/db.conf

@@ -6,7 +6,7 @@ con_protocol = tcp
 
 ; 数据库地址，可以使用IP
 ; db_addr      = 47.101.36.130
-db_addr      = 192.168.0.122
+db_addr        = 192.168.0.122
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口

controllers/customerremark/customerremark.go

@@ -55,6 +55,15 @@ func (c *CustomerRemarkController) AddRemark() {
 	c.ResponseJSON(newRemark)
 }
 
+func (c *CustomerRemarkController) IsExist() {
+	recommendCode := c.GetString(":recommendCode")
+	num, err := c.dao.IsExist(recommendCode)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(num)
+}
+
 func (c *CustomerRemarkController) SearchCustomer() {
 	salesId := c.GetString(":salesId")
 	customerInfo := c.GetString(":customerInfo")

controllers/flashbuy/flashbuy.go

@@ -136,3 +136,11 @@ func (c *FlashBuyController) FlashBuy() {
 	}
 	c.ResponseJSON("恭喜您！抢购成功！")
 }
+
+func (c *FlashBuyController) GetFlashModelList() {
+	model, err := c.dao.GetFlashModelList()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(model)
+}

controllers/luckdraw/luckdraw.go

@@ -11,8 +11,6 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/luckdraw"
 	"spaceofcheng/services/utils"
-
-	"github.com/astaxie/beego"
 )
 
 // LuckdrawController 应用
@@ -104,7 +102,6 @@ func (c *LuckDrawController) SaveLuckDraw() {
 		utils.LogError("抽奖数据转换失败: " + err.Error())
 		c.ResponseError(err)
 	}
-	beego.Error(info)
 	newinfo, err := c.serv.SaveLuckDraw(&info)
 	if err != nil {
 		c.ResponseError(err)
@@ -122,6 +119,26 @@ func (c *LuckDrawController) DelLuckDraw() {
 	c.ResponseJSON("操作成功！")
 }
 
+// OpenLuckDraw 抽奖启用
+func (c *LuckDrawController) OpenLuckDraw() {
+	luckdrawid := c.GetString(":luckdrawid")
+	err := c.serv.OpenLuckDraw(luckdrawid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// StopLuckDraw 抽奖启用
+func (c *LuckDrawController) StopLuckDraw() {
+	luckdrawid := c.GetString(":luckdrawid")
+	err := c.serv.StopLuckDraw(luckdrawid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
 // GetUserByCode 根据code获取用户信息
 func (c *LuckDrawController) GetUserByCode() {
 	userRaw := c.Context.Get("customer")
@@ -131,7 +148,7 @@ func (c *LuckDrawController) GetUserByCode() {
 
 	user := userRaw.(model.TaCustomer)
 	luckdrawid := c.GetString(":id")
-	record, err := c.serv.GetUserLuckDrawByLuckDraw(user.CustomerId, luckdrawid)
+	record, err := c.serv.GetUserLuckDrawByLuckDraw(user, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户抽奖信息失败: " + err.Error())
 		c.ResponseError(errors.New("获取用户抽奖信息失败"))

models/constant.go

@@ -205,6 +205,7 @@ const (
 	NUMTYPE_REPART    = "repeat"
 	NUMTYPE_NOTREPART = "no_repeat"
 )
+
 const (
 	FLASH_BUY_ACTIVE   = "active"
 	FLASH_BUY_INACTIVE = "inactive"
@@ -226,3 +227,10 @@ const (
 	ActGiveCoupon = "giveCoupon"
 	ActGiveCard   = "giveCard"
 )
+
+// 抽奖次数间隔
+const (
+	INTERVAL_DAY   = "day"
+	INTERVAL_WEEK  = "week"
+	INTERVAL_MONTH = "month"
+)

models/customer/customer.go

@@ -282,7 +282,7 @@ 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 {
+	if _, err := m.db.Where("user_id = ?", userId).Get(userCase); err != nil {
 		return nil, err
 	}
 	return userCase, nil

models/customerremark/customerremark.go

@@ -128,3 +128,11 @@ FROM
 	return len(customerReceive), err
 
 }
+
+func (m *CustomerRemarkDAO) IsExist(recommendCode string) (int, error) {
+	var user []model.SysUser
+	sql := `select * from sys_user where recommend_code = '` + recommendCode + `' 
+	and status > ` + strconv.Itoa(models.STATUS_DEL)
+	err := m.db.Sql(sql).Find(&user)
+	return len(user), err
+}

models/flashbuy/flashbuy.go

@@ -275,3 +275,10 @@ func (m *FlashbuyDAO) SaveCustomerFlashBuy(cstFlashBuy model.TaCustomerFlashBuy)
 	_, err := m.db.Insert(cstFlashBuy)
 	return &cstFlashBuy, err
 }
+
+func (m *FlashbuyDAO) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	var model []model.TdFlashbuyModel
+	sql := `select * from td_flashbuy_model`
+	err := m.db.Sql(sql).Find(&model)
+	return model, err
+}

models/luckdraw/luckdraw.go

@@ -97,7 +97,7 @@ func (m *LuckDrawDao) GetLuckDrawRecordCount(id, tel string) (int, error) {
 		sql = sql + ` and b.phone=` + tel
 	}
 
-	err := m.db.Sql(sql).Find(&records)
+	err := m.db.Sql(sql, id).Find(&records)
 	return len(records), err
 }
 
@@ -110,7 +110,7 @@ func (m *LuckDrawDao) GetLuckDrawRecord(id, tel string, page, pageSize int) ([]R
 	}
 	sql = sql + ` ORDER BY a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 
-	err := m.db.Sql(sql).Find(&records)
+	err := m.db.Sql(sql, id).Find(&records)
 	return records, err
 }
 
@@ -329,7 +329,6 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) error {
 		var card model.TaCouponCard
 		_, err := m.db.Where("card_id=?", prize.CouponCardId).Get(&card)
 		if err != nil {
-			beego.Error(err)
 			return err
 		}
 		if card.UsedCount > 0 {
@@ -362,6 +361,19 @@ func (m *LuckDrawDao) UpdateLuckDraw(luckdraw model.TaLuckdraw, cols []string) e
 	return err
 }
 
+// UpdatePrizeDesc 更新奖品描述
+func (m *LuckDrawDao) UpdatePrizeDesc(prizes []PrizeWithDefaults) error {
+	for _, prize := range prizes {
+		_, err := m.db.Cols([]string{
+			"prize_desc",
+		}...).Where("id=?", prize.Id).Update(prize.TaLuckdrawPrize)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // GetLuckDraw 获取抽奖信息
 func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
 	if id == "" {
@@ -388,13 +400,13 @@ func (m *LuckDrawDao) GetLuckDraw(id string) (*LuckDraw, error) {
 }
 
 // AddCustomerLuckDraw 保存用户抽奖配置信息
-func (m *LuckDrawDao) AddCustomerLuckDraw(custLuckDraw *model.TaLuckdrawCustomer) (*model.TaLuckdrawCustomer, error) {
+func (m *LuckDrawDao) AddCustomerLuckDraw(custLuckDraw model.TaLuckdrawCustomer) (*model.TaLuckdrawCustomer, error) {
 	custLuckDraw.LuckdrawCustomerId = utils.GetGUID()
 	custLuckDraw.CreateDate = time.Now()
 	custLuckDraw.ShareNum = 0
-	custLuckDraw.SurplusNum = 0
+	custLuckDraw.ShareSurplusNum = 0
 	_, err := m.db.Insert(custLuckDraw)
-	return custLuckDraw, err
+	return &custLuckDraw, err
 }
 
 // LuckDraw 抽奖
@@ -441,33 +453,18 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	// 抽奖次数判断
 	if cstluckdrawSet.SurplusNum <= 0 {
 		return nil, nil, nil, errors.New("您的抽奖次数已用完！")
+	} else {
+		// 抽奖次数库存修改
+		err := m.UpdateCstLuckdrawSurplus(cstluckdrawSet)
+		if err != nil {
+			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+		}
+		// 更新参与人数
+		err = m.UpdateLuckDrawJoinedNum(id)
+		if err != nil {
+			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+		}
 	}
-	// 	userluckdraws, err := m.GetUserRecordByLuckDraw(user.CustomerId, id)
-	// 	if err != nil {
-	// 		utils.LogError("获取用户抽奖信息失败:", err)
-	// 		return nil, nil, nil, errors.New("获取用户抽奖信息失败！")
-	// 	}
-
-	// 	if len(userluckdraws) >= luckdraw.LuckdrawNum {
-	// 		return nil, nil, nil, errors.New("您的抽奖次数已用完！")
-	// 	}
-
-	// 判断人数是否已超过限制
-	// if luckdraw.JoinNum > 0 {
-	// 	usernum, err := m.GetLuckDrawCustomerNum(luckdraw.Id)
-	// 	if err != nil {
-	// 		utils.LogError("获取抽奖人员信息失败:", err)
-	// 		return nil, nil, nil, errors.New("获取抽奖人员信息失败！")
-	// 	}
-	// 	if luckdraw.JoinNum <= usernum {
-	// 		err = m.UpdateLuckDrawEndDate(luckdraw.Id)
-	// 		if err != nil {
-	// 			utils.LogError("操作失败，请刷新后重试:", err)
-	// 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
-	// 		}
-	// 		return nil, nil, nil, errors.New("活动已结束！")
-	// 	}
-	// }
 
 	// 判断是否内置用户
 	defaultPrize, err := m.GetPrizeDefaultByUser(id, user)
@@ -581,6 +578,37 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	return prize, &detail, record, err
 }
 
+// UpdateCstLuckdrawSurplus 更新用户抽奖剩余次数
+func (m *LuckDrawDao) UpdateCstLuckdrawSurplus(cstLuckDraw *model.TaLuckdrawCustomer) error {
+	sql := `update ta_luckdraw_customer set share_surplus_num = (case when surplus_num > share_surplus_num then share_surplus_num else share_surplus_num - 1 end),
+	surplus_num = surplus_num - 1 where luckdraw_customer_id = ? and surplus_num>0`
+	res, err := m.db.Exec(sql, cstLuckDraw.LuckdrawCustomerId)
+	if err != nil {
+		return err
+	}
+	len, _ := res.RowsAffected()
+	if len < 1 {
+		return errors.New("您没有剩余次数！")
+	}
+	return nil
+}
+
+// UpdateLuckDrawJoinedNum 更新抽奖参与人数
+func (m *LuckDrawDao) UpdateLuckDrawJoinedNum(id string) error {
+	var records []model.TaLuckdrawRecord
+	sql := `select DISTINCT user_id from ta_luckdraw_record where luckdraw_id=?`
+	err := m.db.Sql(sql, id).Find(&records)
+	if err != nil {
+		return err
+	}
+	if len(records) > 0 {
+		sql = `update ta_luckdraw set joined_num=? where id=?`
+		_, err = m.db.Exec(sql, len(records), id)
+		return err
+	}
+	return nil
+}
+
 // PrizeWithDefault 默认奖品
 type PrizeWithDefault struct {
 	DefaultId             string
@@ -845,6 +873,37 @@ func (m *LuckDrawDao) GetUserRecordByLuckDraw(userid string, luckdrawid string)
 	return records, err
 }
 
+// GetUserLuckDrawSet 获取用户抽奖设置
+func (m *LuckDrawDao) GetUserLuckDrawSet(customer model.TaCustomer, luckdrawid string) (*model.TaLuckdrawCustomer, error) {
+	var cstluckdraw = model.TaLuckdrawCustomer{}
+	_, err := m.db.Where("customer_id=?").And("luckdraw_id=?", luckdrawid).Get(&cstluckdraw)
+	if err != nil {
+		return nil, err
+	}
+	if cstluckdraw.CustomerId != "" {
+		return &cstluckdraw, nil
+	}
+	// 插入
+	luckdraw, err := m.GetLuckDrawByID(luckdrawid)
+	if err != nil {
+		return nil, err
+	}
+	surplusNum := luckdraw.LuckdrawNum
+	isnew := 0
+	if customer.Phone == "" {
+		isnew = 1
+	}
+	if luckdraw.JoinType == models.JOINTYPE_NEWUSER && isnew != 1 {
+		surplusNum = 0
+	}
+	cstluckdraw.CustomerId = customer.CustomerId
+	cstluckdraw.IsNew = isnew
+	cstluckdraw.LuckdrawId = luckdrawid
+	cstluckdraw.SurplusNum = surplusNum
+	newinfo, err := m.AddCustomerLuckDraw(cstluckdraw)
+	return newinfo, err
+}
+
 // GetUserLuckDrawByLuckDraw 获取用户的抽奖信息
 func (m *LuckDrawDao) GetUserLuckDrawByLuckDraw(userid string, luckdrawid string) (*model.TaLuckdrawRecord, error) {
 	var records []model.TaLuckdrawRecord
@@ -942,7 +1001,7 @@ func (m *LuckDrawDao) GetLuckDrawShareData(from, to, luckID, caseID string) ([]m
 // UpdateShareNum 分享增加抽奖次数
 func (m *LuckDrawDao) UpdateShareNum(luckdraw *LuckDraw, from string) error {
 	num := strconv.Itoa(luckdraw.ShareAddNum)
-	sql := `update ta_luckdraw_customer set share_num=share_num+` + num + `,surplus_num = surplus_num+` + num + ` where luckdraw_id=? and customer_id=?`
+	sql := `update ta_luckdraw_customer set share_num=share_num+` + num + `,share_surplus_num = share_surplus_num +` + num + ` ,surplus_num = surplus_num+` + num + ` where luckdraw_id=? and customer_id=?`
 	_, err := m.db.Exec(sql, luckdraw.Id, from)
 	return err
 }

models/model/ta_luckdraw_customer.go

@@ -10,6 +10,7 @@ type TaLuckdrawCustomer struct {
 	CustomerId         string    `xorm:"VARCHAR(64)"`
 	IsNew              int       `xorm:"TINYINT(1)"`
 	ShareNum           int       `xorm:"INT(11)"`
+	ShareSurplusNum    int       `xorm:"INT(11)"`
 	SurplusNum         int       `xorm:"INT(11)"`
 	CreateDate         time.Time `xorm:"DATETIME"`
 }

routers/common.go

@@ -204,8 +204,11 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("luckdraw/:luckdrawid", &luckdraw.LuckDrawController{}, "put:SaveLuckDraw"),
 		beego.NSRouter("luckdraw/:luckdrawid", &luckdraw.LuckDrawController{}, "delete:DelLuckDraw"),
 
-		beego.NSRouter("luckdraw/records/:luckdrawid", &luckdraw.LuckDrawController{}, "delete:GetLuckDrawRecordList"),
-		beego.NSRouter("luckdraw/share/:luckdrawid", &luckdraw.LuckDrawController{}, "delete:GetLuckDrawShareList"),
+		beego.NSRouter("luckdraw/:luckdrawid/open", &luckdraw.LuckDrawController{}, "put:OpenLuckDraw"),
+		beego.NSRouter("luckdraw/:luckdrawid/stop", &luckdraw.LuckDrawController{}, "put:StopLuckDraw"),
+
+		beego.NSRouter("luckdraw/records/:luckdrawid", &luckdraw.LuckDrawController{}, "get:GetLuckDrawRecordList"),
+		beego.NSRouter("luckdraw/share/:luckdrawid", &luckdraw.LuckDrawController{}, "get:GetLuckDrawShareList"),
 
 		// bodychecklist 体检列表
 		beego.NSRouter("bodychecklist", &bodychecklist.BodychecklistController{}, "get:GetBodyCheckList"),
@@ -330,5 +333,6 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		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"),
+		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
 	)
 }

routers/guest.go

@@ -6,6 +6,7 @@ import (
 	"spaceofcheng/services/controllers/cases"
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/customerremark"
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
@@ -66,5 +67,7 @@ func getGuestRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
 		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
 		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
+
+		beego.NSRouter("/customerremark/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
 	)
 }

routers/wechat.go

@@ -95,15 +95,15 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/user/luckdraw/record/:id", &luckdraw.LuckDrawController{}, "get:GetRecordByID"),
 
 		// 抢购
-		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
-		beego.NSRouter("/flashbuy/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
-		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
+		beego.NSRouter("/flashbuy/flash/:flashBuyId", &flashbuy.FlashBuyController{}, "get:GetFlashBuyById"),
+		beego.NSRouter("/flashbuy/customer/:customerId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyByCustomerId"),
+		beego.NSRouter("/flashbuy/customerFlash/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "get:GetCustomerFlashBuyId"),
 		beego.NSRouter("/flashbuy/:id", &flashbuy.FlashBuyController{}, "post:FlashBuy"),
 
 		// 客户备注
 		beego.NSRouter("/customerremark/record/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerReceiveRecord"),
 		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
-		beego.NSRouter("/customerremark/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
+		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
 		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
 	)
 }

service/customerremark/customerremark.go

@@ -80,3 +80,11 @@ func (s *CustomerRemarkServ) SearchCustomer(customerInfo, salesId string) (*mode
 	}
 	return &customer, nil
 }
+func (s *CustomerRemarkServ) IsExist(recommendCode string) (int, error) {
+	num, err := s.dao.IsExist(recommendCode)
+	if err != nil {
+		utils.LogError("获取推荐人失败: " + err.Error())
+		return 0, errors.New("获取推荐人失败")
+	}
+	return num, nil
+}

service/events/giveCard.go

@@ -56,7 +56,7 @@ var giveCard = func(e tinyevent.Event) error {
 		case ActGiveCoupon:
 			res := make(map[string]interface{})
 			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
-				utils.LogError("解析优惠券赠送规则失败: " + err.Error())
+				utils.LogError("解析体验卡赠送规则失败: " + err.Error())
 				continue
 			}
 

service/flashbuy/flashbuy.go

@@ -251,3 +251,12 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 
 	return nil
 }
+
+func (s *FlashBuyServ) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
+	model, err := s.dao.GetFlashModelList()
+	if err != nil {
+		utils.LogError("获取抢购活动模板失败: " + err.Error())
+		return nil, errors.New("获取抢购活动模板失败")
+	}
+	return model, nil
+}

service/luckdraw/luckdraw.go

@@ -166,6 +166,12 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 				utils.LogError("更新抽奖信息失败: " + err.Error())
 				return nil, errors.New("更新抽奖信息失败")
 			}
+
+			err = s.dao.UpdatePrizeDesc(luckdraw.Prizes)
+			if err != nil {
+				utils.LogError("更新抽奖信息失败: " + err.Error())
+				return nil, errors.New("更新抽奖信息失败")
+			}
 			return &luckdraw.TaLuckdraw, nil
 		}
 		var cols = []string{
@@ -460,8 +466,15 @@ func (s *LuckdrawServ) GetUserRecordByLuckDraw(userid string, luckdrawid string)
 	return record, nil
 }
 
-func (s *LuckdrawServ) GetUserLuckDrawByLuckDraw(userid string, luckdrawid string) (*model.TaLuckdrawRecord, error) {
-	record, err := s.dao.GetUserLuckDrawByLuckDraw(userid, luckdrawid)
+// GetUserLuckDrawByLuckDraw 获取用户抽奖信息
+func (s *LuckdrawServ) GetUserLuckDrawByLuckDraw(user model.TaCustomer, luckdrawid string) (*model.TaLuckdrawRecord, error) {
+	// 获取用户抽奖设置信息
+	_, err := s.dao.GetUserLuckDrawSet(user, luckdrawid)
+	if err != nil {
+		utils.LogError("获取用户抽奖设置失败: " + err.Error())
+		return nil, errors.New("获取用户抽奖设置失败")
+	}
+	record, err := s.dao.GetUserLuckDrawByLuckDraw(user.CustomerId, luckdrawid)
 	if err != nil {
 		utils.LogError("获取用户的抽奖信息失败: " + err.Error())
 		return nil, errors.New("获取用户的抽奖信息失败")