Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/card/card.go

@@ -38,7 +38,10 @@ func (c *CardController) ListByCase() {
 		pagesize = 10
 	}
 
-	list, total, err := c.serv.GetCardList(caseid, page, pagesize)
+	sendtype := c.GetString("sendtype")
+	usetype := c.GetString("usetype")
+
+	list, total, err := c.serv.GetCardList(caseid, sendtype, usetype, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/coupon/coupon.go

@@ -39,7 +39,10 @@ func (c *CouponController) ListByCase() {
 		pagesize = 10
 	}
 
-	list, total, err := c.serv.GetCouponList(caseID, page, pagesize)
+	sendtype := c.GetString("sendtype")
+	usetype := c.GetString("usetype")
+
+	list, total, err := c.serv.GetCouponList(caseID, sendtype, usetype, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/luckdraw/luckdraw.go

@@ -1,6 +1,7 @@
 package luckdraw
 
 import (
+	"encoding/json"
 	"errors"
 	"net/http"
 	"spaceofcheng/services/controllers"
@@ -10,6 +11,8 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/luckdraw"
 	"spaceofcheng/services/utils"
+
+	"github.com/astaxie/beego"
 )
 
 // LuckdrawController 应用
@@ -92,10 +95,16 @@ func (c *LuckDrawController) GetLuckDrawByID() {
 
 // SaveLuckDraw 保存抽奖信息
 func (c *LuckDrawController) SaveLuckDraw() {
+	jsnStr := c.GetString("info")
+	if jsnStr == "" {
+		c.ResponseError(errors.New("未接收到保存内容"))
+	}
 	info := luckdrawModel.LuckDrawInfo{}
-	if err := c.ParseForm(&info); err != nil {
+	if err := json.Unmarshal([]byte(jsnStr), &info); err != nil {
+		utils.LogError("抽奖数据转换失败: " + err.Error())
 		c.ResponseError(err)
 	}
+	beego.Error(info)
 	newinfo, err := c.serv.SaveLuckDraw(&info)
 	if err != nil {
 		c.ResponseError(err)

models/constant.go

@@ -215,3 +215,14 @@ const (
 	FLASH_VALIDATE_DAYS = "days"
 	FLASH_VALIDATE_DATE = "date"
 )
+
+const (
+	COUPONCARD_USETYPE_LUCKDRAW = "luckdraw"
+	COUPONCARD_USETYPE_SYS      = "sysactive"
+)
+
+const (
+	// 送券
+	ActGiveCoupon = "giveCoupon"
+	ActGiveCard   = "giveCard"
+)

models/luckdraw/luckdraw.go

@@ -54,7 +54,15 @@ func (m *LuckDrawDao) GetLuckDrawList(caseids, name, status string, page, pageSi
 		dao.And("name like '%" + name + "%'")
 	}
 	if status != "" {
-		dao.And("status=?", status)
+		query := `status=?`
+		switch status {
+		case strconv.Itoa(models.STATUS_NORMAL):
+			query = query + " and end_date>now()"
+			break
+		case strconv.Itoa(models.STATUS_EXPIRE):
+			query = "(" + query + " or end_date<=now())"
+		}
+		dao.And(query, status)
 	}
 	err := dao.Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&luckdraws)
 	return luckdraws, err
@@ -244,13 +252,14 @@ func (m *LuckDrawDao) SaveLuckDrawImgs(imgs []model.TaLuckdrawImg, luckdrawid st
 }
 
 // SaveLuckDrawDefault 保存内定信息
-func (m *LuckDrawDao) SaveLuckDrawDefault(defaults []model.TaPrizeDefault, luckdrawid string) error {
+func (m *LuckDrawDao) SaveLuckDrawDefault(defaults []model.TaPrizeDefault, prize model.TaLuckdrawPrize) error {
 	for inx, d := range defaults {
 		if d.DefaultId == "" {
 			defaults[inx].DefaultId = utils.GetGUID()
 			defaults[inx].Status = models.STATUS_NORMAL
 			defaults[inx].CreateDate = time.Now()
-			defaults[inx].LuckdrawId = luckdrawid
+			defaults[inx].LuckdrawId = prize.LuckdrawId
+			defaults[inx].PrizeId = prize.Id
 		}
 	}
 	_, err := m.db.Insert(defaults)
@@ -264,15 +273,19 @@ func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *m
 		if prize.Id == "" {
 			prizes[inx].LuckdrawId = luckdraw.Id
 			prizes[inx].Id = utils.GetGUID()
+			prizes[inx].Remainder = prize.Stock
 			prizes[inx].Status = models.STATUS_NORMAL
 		}
 		if prize.PrizeType == models.PRIZE_TYPE_COUPONCARD {
-			m.SavePrizeDetail(prize.TaLuckdrawPrize)
+			err := m.SavePrizeDetail(prizes[inx].TaLuckdrawPrize)
+			if err != nil {
+				return err
+			}
 		}
-		saveprizes = append(saveprizes, prize.TaLuckdrawPrize)
+		saveprizes = append(saveprizes, prizes[inx].TaLuckdrawPrize)
 		// 保存内定信息
 		if luckdraw.IsInternalDefault == models.BOOL_TRUE {
-			err := m.SaveLuckDrawDefault(prize.Defaults, prizes[inx].Id)
+			err := m.SaveLuckDrawDefault(prize.Defaults, prizes[inx].TaLuckdrawPrize)
 			if err != nil {
 				return err
 			}
@@ -309,6 +322,33 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) error {
 				Status:  models.STATUS_NORMAL,
 			}
 			details = append(details, d)
+			i = i + 1
+		}
+		m.db.Insert(details)
+	} else {
+		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 {
+			return errors.New("卡券已被使用！不允许保存！")
+		}
+		var details []model.TaPrizeDetail
+		i := 0
+		for i < card.TotalCount {
+			unix := time.Now().UnixNano()
+			random := utils.GetRand(5) + strconv.Itoa(int(unix))
+			url := `/` + prize.CouponCardId + `/` + beego.AppConfig.String("defaultShareUserID") + `/` + prize.CouponCardType + `/` + random + `/receive`
+			var d = model.TaPrizeDetail{
+				Id:      utils.GetGUID(),
+				PrizeId: prize.Id,
+				Url:     beego.AppConfig.String("clientShareURL") + url,
+				Status:  models.STATUS_NORMAL,
+			}
+			details = append(details, d)
+			i = i + 1
 		}
 		m.db.Insert(details)
 	}

models/model/sys_activity_action.go

@@ -6,4 +6,5 @@ type SysActivityAction struct {
 	ActiveType   string `xorm:"comment('赠送还是取消赠送之类的') VARCHAR(5)"`
 	ResourceType string `xorm:"VARCHAR(20)"`
 	ResourceDesc string `xorm:"VARCHAR(500)"`
+	ResourceId   string `xorm:"VARCHAR(500)"`
 }

service/card/card.go

@@ -40,7 +40,7 @@ func NewCardServ(ctx *utils.Context) *CardServ {
 }
 
 // GetCardList 获取卡列表
-func (s *CardServ) GetCardList(caseID string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
+func (s *CardServ) GetCardList(caseID, sendtype, usetype string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
 	filters := []string{}
 	if caseID != "" {
 		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
@@ -66,6 +66,19 @@ func (s *CardServ) GetCardList(caseID string, pagenavi ...int) ([]model.TaCoupon
 			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
 		}
 	}
+	if sendtype != "" {
+		filters = append(filters, "send_type='"+sendtype+"'")
+		if usetype != "" {
+			switch usetype {
+			case models.COUPONCARD_USETYPE_LUCKDRAW:
+				filters = append(filters, "card_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCard+"') and used_count=0")
+				break
+			case models.COUPONCARD_USETYPE_SYS:
+				filters = append(filters, "card_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_CARD+"') and used_count=0")
+				break
+			}
+		}
+	}
 
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCardList(filters, limit)

service/coupon/coupon.go

@@ -34,7 +34,7 @@ func NewCouponServ(ctx *utils.Context) *CouponServ {
 }
 
 // GetCouponList 获取优惠券列表
-func (s *CouponServ) GetCouponList(caseID string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
+func (s *CouponServ) GetCouponList(caseID, sendtype, usetype string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
 	filters := []string{}
 
 	if caseID != "" {
@@ -61,6 +61,19 @@ func (s *CouponServ) GetCouponList(caseID string, pagenavi ...int) ([]model.TaCo
 			"case_id in ('" + strings.Join(caseIDs, "','") + "')",
 		}
 	}
+	if sendtype != "" {
+		filters = append(filters, "send_type='"+sendtype+"'")
+		if usetype != "" {
+			switch usetype {
+			case models.COUPONCARD_USETYPE_LUCKDRAW:
+				filters = append(filters, "coupon_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCoupon+"') and used_count=0")
+				break
+			case models.COUPONCARD_USETYPE_SYS:
+				filters = append(filters, "coupon_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_COUPON+"') and used_count=0")
+				break
+			}
+		}
+	}
 
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCouponList(filters, limit)

service/marketing/marketing.go

@@ -102,7 +102,7 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 	if activeType == events.ActGiveCard {
 		cardID := res["giftValue"].(string)
 		if cardID == "" {
-			return nil, nil, errors.New("未指定赠送券内容")
+			return nil, nil, errors.New("未指定赠送卡内容")
 		}
 	}
 
@@ -127,7 +127,7 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, re
 	woke.ActiveType = activeType
 	woke.ResourceDesc = resourceDesc
 	woke.ResourceType = "占位符"
-
+	woke.ResourceId = res["giftValue"].(string)
 	// 存储 活动动作
 	newWoke, err = s.wdao.AddWork(woke)
 	if err != nil {