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

controllers/card/card.go

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

controllers/coupon/coupon.go

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

controllers/statistics/cardcoupon.go

@@ -150,6 +150,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 		"获取方式",
 		"微信昵称",
 		"手机号",
+		"销售",
 		"有效期",
 		"获取时间",
 		"使用时间",
@@ -197,6 +198,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 			receivetype,
 			item.CustomerName,
 			item.Phone,
+			item.SalesName,
 			item.EndDate.Format("2006-01-02 15:04:05"),
 			item.ReceiveDate.Format("2006-01-02 15:04:05"),
 			item.UsedDate.Format("2006-01-02 15:04:05"),

models/flashbuy/flashbuy.go

@@ -257,8 +257,10 @@ FROM
 	INNER JOIN sys_case c ON a.case_id = c.case_id
 	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
 	err := m.db.Sql(sql).Find(&customerDetail)
-	return &customerDetail[0], err
-
+	if len(customerDetail) > 0 {
+		return &customerDetail[0], err
+	}
+	return nil, err
 }
 
 // GetCustomerFlashBuy 获取用户抢购信息

models/luckdraw/luckdraw.go

@@ -295,6 +295,10 @@ func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *m
 		saveprizes = append(saveprizes, prizes[inx].TaLuckdrawPrize)
 		// 保存内定信息
 		if luckdraw.IsInternalDefault == models.BOOL_TRUE {
+			if len(prize.Defaults) > prize.Stock {
+				return errors.New("内置用户不能超过奖品数量！")
+			}
+
 			err := m.SaveLuckDrawDefault(prize.Defaults, prizes[inx].TaLuckdrawPrize)
 			if err != nil {
 				return err
@@ -487,12 +491,6 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 			utils.LogError("更新抽奖次数库存失败：", err)
 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 		}
-		// 更新参与人数
-		err = m.UpdateLuckDrawJoinedNum(id)
-		if err != nil {
-			utils.LogError("更新参与人数失败：", err)
-			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
-		}
 	}
 
 	// 判断是否内置用户
@@ -501,7 +499,6 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		utils.LogError("操作失败，请刷新后重试:", err)
 		return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
 	}
-
 	var prize = new(model.TaLuckdrawPrize)
 	if defaultPrize.Id != "" {
 		// 内置用户，直接中奖
@@ -513,14 +510,13 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 			return nil, nil, nil, errors.New("获取奖项失败！")
 		}
 		if len(prizes) == 0 {
-			err = m.UpdateLuckDrawEndDate(luckdraw.Id)
-			if err != nil {
-				utils.LogError("操作失败，请刷新后重试:", err)
-				return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
-			}
+			// err = m.UpdateLuckDrawEndDate(luckdraw.Id)
+			// if err != nil {
+			// 	utils.LogError("操作失败，请刷新后重试:", err)
+			// 	return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+			// }
 			return nil, nil, nil, errors.New("活动已结束！")
 		}
-
 		prize, err = m.GetWinning(prizes)
 		if err != nil {
 			utils.LogError("获取奖项失败:", err)
@@ -567,6 +563,13 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		utils.LogError("保存中奖纪录失败：", err)
 		return nil, nil, nil, err
 	}
+	// 更新参与人数
+	err = m.UpdateLuckDrawJoinedNum(id)
+	if err != nil {
+		utils.LogError("更新参与人数失败：", err)
+		return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
+	}
+
 	// 更新内置信息
 	err = m.UpdatePrizeDefault(defaultPrize.DefaultId, record.Id)
 	if err != nil {
@@ -599,7 +602,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 			utils.LogError("更新库存失败：", err)
 			return nil, nil, nil, err
 		}
-		stockprizes, err := m.GetPrizeStock(id)
+		stockprizes, err := m.GetPrizeStockAll(id)
 		if err != nil {
 			utils.LogError("更新库存失败:", err)
 			return nil, nil, nil, errors.New("操作失败，请刷新后重试！")
@@ -830,13 +833,20 @@ func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize,
 	var prizes []model.TaLuckdrawPrize
 	sql := `select a.remainder-(case when b.default_num is null then 0 else b.default_num end) as remainder,
 	a.* from ta_luckdraw_prize a 
-	left join (select prize_id,count(1) as default_num from ta_prize_default where luckdraw_id) b 
+	left join (select prize_id,count(1) as default_num from ta_prize_default where luckdraw_id=? and is_receive=0 group by prize_id) b 
 	on a.id=b.prize_id where a.luckdraw_id=? and a.status=? and (a.remainder-(case when b.default_num is null then 0 else b.default_num end)>0 or is_reality=0)`
-	err := m.db.Sql(sql, luckdrawid, models.STATUS_NORMAL).Find(&prizes)
+	err := m.db.Sql(sql, luckdrawid, luckdrawid, models.STATUS_NORMAL).Find(&prizes)
 	// err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).And("(remainder>0 or is_reality=0)").Find(&prizes)
 	return prizes, err
 }
 
+// GetPrizeStockAll 获取奖项
+func (m *LuckDrawDao) GetPrizeStockAll(luckdrawid string) ([]model.TaLuckdrawPrize, error) {
+	var prizes []model.TaLuckdrawPrize
+	err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).And("(remainder>0 or is_reality=0)").Find(&prizes)
+	return prizes, err
+}
+
 // GetPrizeByID 根据id获取奖品信息
 func (m *LuckDrawDao) GetPrizeByID(id string) (model.TaLuckdrawPrize, error) {
 	var prize = model.TaLuckdrawPrize{}

models/vipcard/vipcard.go

@@ -53,7 +53,7 @@ WHERE
 	}
 
 	if sellerName != "" {
-		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
+		sql = sql + ` and vcc.sales_name like '%` + sellerName + `%'`
 	}
 
 	if userName != "" {
@@ -83,7 +83,7 @@ WHERE
 	}
 
 	if sellerName != "" {
-		sql = sql + ` and tc.recommend_name like '%` + sellerName + `%'`
+		sql = sql + ` and vcc.sales_name like '%` + sellerName + `%'`
 	}
 
 	if userName != "" {

service/card/card.go

@@ -11,6 +11,7 @@ import (
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
@@ -41,7 +42,7 @@ func NewCardServ(ctx *utils.Context) *CardServ {
 }
 
 // GetCardList 获取卡列表
-func (s *CardServ) GetCardList(caseID, sendtype, usetype string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
+func (s *CardServ) GetCardList(caseID, sendtype, usetype, usedid string, pagenavi ...int) ([]model.TaCouponCard, int64, error) {
 	filters := []string{}
 	if caseID != "" {
 		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
@@ -72,15 +73,59 @@ func (s *CardServ) GetCardList(caseID, sendtype, usetype string, pagenavi ...int
 		if usetype != "" {
 			switch usetype {
 			case models.COUPONCARD_USETYPE_LUCKDRAW:
-				filters = append(filters, "card_id not in (select (case when resource_id is null then '' else resource_id end) from sys_activity_action where active_type='"+models.ActGiveCard+"') and used_count=0")
+				filters = append(filters,
+					`card_id not in (
+						SELECT
+						(
+							CASE
+							WHEN resource_id IS NULL THEN
+								''
+							ELSE
+								resource_id
+							END
+						)
+					FROM
+						sys_activity_action
+					WHERE
+						active_type = '`+models.ActGiveCard+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union 
+						SELECT
+							a.coupon_card_id
+						FROM
+						ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+						WHERE
+							a.coupon_card_type = '`+models.PRIZE_TYPE_CARD+`'
+							and a.luckdraw_id <> '`+usedid+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					) 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")
+				filters = append(filters, `card_id not in (
+					SELECT
+					a.coupon_card_id
+					FROM
+					ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+					WHERE
+					a.coupon_card_type = '`+models.PRIZE_TYPE_CARD+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union 
+					SELECT
+						(
+							CASE
+							WHEN resource_id IS NULL THEN
+								''
+							ELSE
+								resource_id
+							END
+						)
+					FROM
+						sys_activity_action
+					WHERE
+						active_type = '`+models.ActGiveCard+`'
+						and action_id<>'`+usedid+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+				) and used_count=0`)
 				break
 			}
 		}
 	}
-
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCardList(filters, limit)
 	if err != nil {
@@ -514,7 +559,10 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
 	if !isok {
 		return errors.New("log-error-该卡已被领取！")
 	}
-
+	salername := saler.RealName
+	if salername == "" {
+		salername = saler.UserName
+	}
 	// 领取
 	var customerCard = model.TaCustomerCard{
 		CustomerCardId:   utils.GetGUID(),
@@ -522,7 +570,7 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
 		CustomerCardName: card.CardName,
 		CustomerId:       customer.CustomerId,
 		SalesId:          saler.UserId,
-		SalesName:        saler.UserName,
+		SalesName:        salername,
 		StartDate:        card.StartDate,
 		EndDate:          card.EndDate,
 		CaseId:           card.CaseId,

service/coupon/coupon.go

@@ -9,6 +9,7 @@ import (
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
@@ -35,7 +36,7 @@ func NewCouponServ(ctx *utils.Context) *CouponServ {
 }
 
 // GetCouponList 获取优惠券列表
-func (s *CouponServ) GetCouponList(caseID, sendtype, usetype string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
+func (s *CouponServ) GetCouponList(caseID, sendtype, usetype, usedid string, pagenavi ...int) ([]model.TaCoupon, int64, error) {
 	filters := []string{}
 
 	if caseID != "" {
@@ -67,15 +68,58 @@ func (s *CouponServ) GetCouponList(caseID, sendtype, usetype string, pagenavi ..
 		if usetype != "" {
 			switch usetype {
 			case models.COUPONCARD_USETYPE_LUCKDRAW:
-				filters = append(filters, "coupon_id not in (select (case when resource_id is null then '' else resource_id end) from sys_activity_action where active_type='"+models.ActGiveCoupon+"') and used_count=0")
+				filters = append(filters, `coupon_id not in (
+					SELECT
+						(
+							CASE
+							WHEN resource_id IS NULL THEN
+								''
+							ELSE
+								resource_id
+							END
+						)
+					FROM
+						sys_activity_action
+					WHERE
+						active_type = '`+models.ActGiveCoupon+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union 
+					SELECT
+						a.coupon_card_id
+					FROM
+					ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+					WHERE
+						a.coupon_card_type = '`+models.PRIZE_TYPE_COUPON+`'
+						and a.luckdraw_id<>'`+usedid+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					) 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")
+				filters = append(filters, `coupon_id not in (
+					SELECT
+						a.coupon_card_id
+					FROM
+					ta_luckdraw_prize a inner join ta_luckdraw b on a.luckdraw_id = b.id
+					WHERE
+						a.coupon_card_type = '`+models.PRIZE_TYPE_COUPON+`' and b.status>`+strconv.Itoa(models.STATUS_DEL)+`
+					union
+					SELECT
+					(
+						CASE
+						WHEN resource_id IS NULL THEN
+							''
+						ELSE
+							resource_id
+						END
+					)
+				FROM
+					sys_activity_action
+				WHERE
+					active_type = '`+models.ActGiveCoupon+`'
+					and action_id<>'`+usedid+`' and status>`+strconv.Itoa(models.STATUS_DEL)+`
+				) and used_count=0`)
 				break
 			}
 		}
 	}
-
 	limit := utils.GetPageNaviLimit(pagenavi...)
 	res, total, err := s.dao.GetCouponList(filters, limit)
 	if err != nil {
@@ -557,14 +601,17 @@ func (s *CouponServ) ReceiveCoupon(id, saleid, serialcode string) error {
 		hs := int64(coupon.ValidDays * 24)
 		endDate = time.Now().Local().Add(time.Hour * time.Duration(hs))
 	}
-
+	salername := saler.RealName
+	if salername == "" {
+		salername = saler.UserName
+	}
 	// 领取
 	var customerCoupon = model.TaCustomerCoupon{
 		CouponId:           coupon.CouponId,
 		CustomerCouponName: coupon.CouponName,
 		CustomerId:         customer.CustomerId,
 		SalesId:            saler.UserId,
-		SalesName:          saler.UserName,
+		SalesName:          salername,
 		StartDate:          startDate,
 		EndDate:            endDate,
 		CaseId:             coupon.CaseId,

service/flashbuy/flashbuy.go

@@ -253,8 +253,8 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 	customerFlashBuy.CaseId = flashbuy.CaseId
 	customerFlashBuy.OrgId = flashbuy.OrgId
 	if flashbuy.ValidateType == models.FLASH_VALIDATE_DATE {
-		customerFlashBuy.ValidateStart = flashbuy.StartDate
-		customerFlashBuy.ValidateEnd = flashbuy.EndDate
+		customerFlashBuy.ValidateStart = flashbuy.ValidateStart
+		customerFlashBuy.ValidateEnd = flashbuy.ValidateEnd
 	} else {
 		customerFlashBuy.ValidateStart = time.Now().Local()
 		customerFlashBuy.ValidateEnd = time.Now().Local().AddDate(0, 0, flashbuy.ValidateDays)

service/luckdraw/luckdraw.go

@@ -236,7 +236,7 @@ func (s *LuckdrawServ) SaveLuckDraw(luckdraw *luckdraw.LuckDrawInfo) (*model.TaL
 	err = s.dao.SaveLuckDrawPrizes(luckdraw.Prizes, newInfo)
 	if err != nil {
 		utils.LogError("保存奖品信息失败: " + err.Error())
-		return nil, errors.New("保存奖品信息失败")
+		return nil, errors.New("保存奖品信息失败：" + err.Error())
 	}
 	return newInfo, nil
 }