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

controllers/marketing/marketing.go

@@ -23,8 +23,9 @@ func (c *MarketingController) Constructor() {
 func (c *MarketingController) GetMarketingList() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pageSize")
-
-	marketings, err := c.serv.GetMarketingList(page, pageSize)
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	marketings, err := c.serv.GetMarketingList(caseIDs, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/card/card.go

@@ -250,6 +250,13 @@ func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) (
 				return nil, err
 			}
 			cards[inx].CustomerCard = cCards
+		} else {
+			// 主管
+			num, err := m.GetCustomerCardVerifyNum(card.CardId)
+			if err != nil {
+				return nil, err
+			}
+			cards[inx].UsedCount = num
 		}
 		share, err := m.GetCardShareByCardID(card.CardId)
 		if err != nil {
@@ -260,6 +267,13 @@ func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) (
 	return cards, err
 }
 
+// GetCustomerCardVerifyNum 获取卡核销数量
+func (m *CardDAO) GetCustomerCardVerifyNum(cardid string) (int, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("verify_status<>?", models.VERIFY_USEABLE).Find(&customerCards)
+	return len(customerCards), err
+}
+
 // GetCaseUsableCardCount 获取案场可用卡数量
 func (m *CardDAO) GetCaseUsableCardCount(caseid, userid string) (int, error) {
 	var Coupons []CaseUsableCard
@@ -275,9 +289,23 @@ func (m *CardDAO) GetCustomerCardByCardAndUser(cardid, userid string) ([]model.T
 	return customerCards, err
 }
 
+// 案场可用卡信息
+type CardDetailWithSales struct {
+	model.TaCouponCard `xorm:"extends"`
+	CustomerCard       []SalesWithCustomerCardNum
+}
+
+// SalesWithCustomerCardNum
+type SalesWithCustomerCardNum struct {
+	RealName   string
+	SalesId    string
+	ReceiveNum int
+	UsedNum    int
+}
+
 // GetCardDetail 获取卡详情
-func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
-	var card = new(CaseUsableCard)
+func (m *CardDAO) GetCardDetail(cardid string) (*CardDetailWithSales, error) {
+	var card = new(CardDetailWithSales)
 	sql := `select * from ta_coupon_card where card_id=? and status>?`
 	_, err := m.db.Sql(sql, cardid, models.STATUS_DEL).Get(card)
 	if err != nil {
@@ -286,7 +314,12 @@ func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
 	if card == nil || card.CardId == "" {
 		return nil, errors.New("无卡信息")
 	}
-	ccards, err := m.GetCustomerCardByCard(cardid)
+	num, err := m.GetCustomerCardVerifyNum(card.CardId)
+	if err != nil {
+		return nil, err
+	}
+	card.UsedCount = num
+	ccards, err := m.GetCustomerCardByCardWithRealName(cardid)
 	if err != nil {
 		return nil, err
 	}
@@ -294,6 +327,41 @@ func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
 	return card, nil
 }
 
+// GetSalesCardByCard 根据卡获取领取的用户信息
+func (m *CardDAO) GetSalesCardByCard(cardid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
+// GetCustomerCardByCardWithRealName 根据卡获取领取的用户信息
+func (m *CardDAO) GetCustomerCardByCardWithRealName(cardid string) ([]SalesWithCustomerCardNum, error) {
+	var customerCards []SalesWithCustomerCardNum
+	sql := `SELECT
+			b.real_name,
+			a.sales_id,
+			count(1) AS receive_num,
+			sum(
+				CASE
+				WHEN a.verify_status = 'useable' THEN
+					0
+				ELSE
+					1
+				END
+			) AS used_num
+		FROM
+			ta_customer_card a
+		INNER JOIN sys_user b ON a.sales_id = b.user_id
+		WHERE
+			a.card_id = ?
+		AND a. STATUS > ?
+		GROUP BY
+			b.real_name,
+			a.sales_id`
+	err := m.db.Sql(sql, cardid, models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
 // GetCustomerCardByCard 根据卡获取领取的用户信息
 func (m *CardDAO) GetCustomerCardByCard(cardid string) ([]model.TaCustomerCard, error) {
 	var customerCards []model.TaCustomerCard

models/constant.go

@@ -172,3 +172,7 @@ const (
 	QRCODE_TYPE_COURSE = "course"
 	QRCODE_TYPE_PRIZE  = "prize"
 )
+
+const (
+	ADMIN_ID = "1"
+)

models/coupon/coupon.go

@@ -344,8 +344,8 @@ func (m *CouponDAO) GetCustomerCouponByCouponAndUser(couponid, userid string) ([
 }
 
 // GetCouponDetail 获取优惠券详情
-func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetail, error) {
-	var coupon = new(CaseCouponDetail)
+func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetailWithRealName, error) {
+	var coupon = new(CaseCouponDetailWithRealName)
 	sql := `select * from ta_coupon where coupon_id=? and status>?`
 	_, err := m.db.Sql(sql, couponid, models.STATUS_DEL).Get(coupon)
 	if err != nil {
@@ -354,7 +354,7 @@ func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetail, error)
 	if coupon == nil || coupon.CouponId == "" {
 		return nil, errors.New("无优惠券信息")
 	}
-	cCoupons, err := m.GetCustomerCouponByCoupon(couponid)
+	cCoupons, err := m.GetCustomerCouponByCouponWithRealName(couponid)
 	if err != nil {
 		return nil, err
 	}
@@ -369,6 +369,16 @@ func (m *CouponDAO) GetCustomerCouponByCoupon(couponid string) ([]model.TaCustom
 	return customerCoupons, err
 }
 
+// GetCustomerCouponByCouponWithRealName 根据优惠券与用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCouponWithRealName(couponid string) ([]SalesWithCustomerCouponNum, error) {
+	var customerCoupons []SalesWithCustomerCouponNum
+	sql := `select b.real_name,a.sales_id,count(1) as receive_num,sum(case when a.status=1 then 0 when a.status=2 then 1 end) as used_num
+	 from ta_customer_coupon a inner join sys_user b on a.sales_id = b.user_id where a.coupon_id=? and a.status>?
+	 GROUP BY b.real_name,a.sales_id`
+	err := m.db.Sql(sql, couponid, models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
 // GetCustomerCouponByUser 根据用户获取领取的用户信息
 func (m *CouponDAO) GetCustomerCouponByUser(caseid, userid string) ([]model.TaCustomerCoupon, error) {
 	var customerCoupons []model.TaCustomerCoupon

models/coupon/types.go

@@ -20,13 +20,28 @@ type CouponInfo struct {
 	ChannelId      string
 }
 
-// CaseUsableCoupon 案场可用优惠券信息
+// CaseCouponDetail 案场可用优惠券信息
 type CaseCouponDetail struct {
 	model.TaCoupon `xorm:"extends"`
 	CustomerCoupon []model.TaCustomerCoupon
 	Share          *model.TaCouponShare
 }
 
+// CaseCouponDetailWithRealName
+type CaseCouponDetailWithRealName struct {
+	model.TaCoupon `xorm:"extends"`
+	CustomerCoupon []SalesWithCustomerCouponNum
+	Share          *model.TaCouponShare
+}
+
+// SalesWithCustomerCouponNum
+type SalesWithCustomerCouponNum struct {
+	RealName   string
+	SalesId    string
+	ReceiveNum int
+	UsedNum    int
+}
+
 // CustomerCoupon 用户优惠券
 type CustomerCoupon struct {
 	model.TaCustomerCoupon `xorm:"extends"`

models/luckdraw/luckdraw.go

@@ -123,6 +123,10 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
 	_, err = m.SaveRecord(record)
+	if err != nil {
+		utils.LogError("保存中奖纪录失败：", err)
+		return nil, nil, err
+	}
 	// var detail = model.TaPrizeDetail{}
 	// if len(details) > 0 {
 	// 	// 更新中奖纪录明细
@@ -145,6 +149,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		prize.Remainder = prize.Remainder - 1
 		err = m.UpdateStock(prize)
 		if err != nil {
+			utils.LogError("更新库存失败：", err)
 			return nil, nil, err
 		}
 		stockprizes, err := m.GetPrizeStock(id)
@@ -254,7 +259,7 @@ func (m *LuckDrawDao) UpdateLuckDrawEndDate(id string) error {
 	cols := []string{
 		"end_date",
 	}
-	_, err := m.db.Update(luckdraw, cols, "id=?", id)
+	_, err := m.db.Cols(cols...).Where("id=?", id).Update(luckdraw)
 	return err
 }
 
@@ -270,7 +275,7 @@ func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
 	cols := []string{
 		"remainder",
 	}
-	_, err := m.db.Update(prize, cols, "id=?", prize.Id)
+	_, err := m.db.Cols(cols...).Where("id=?", prize.Id).Update(prize)
 	return err
 }
 
@@ -320,7 +325,7 @@ func (m *LuckDrawDao) UpdatePrizeDetail(detail model.TaPrizeDetail) error {
 		"receive_id",
 		"receive_date",
 	}
-	_, err := m.db.Update(detail, cols, "id=?", detail.Id)
+	_, err := m.db.Cols(cols...).Where("id=?", detail.Id).Update(detail)
 	return err
 }
 
@@ -332,7 +337,7 @@ func (m *LuckDrawDao) UpdateRecord(record *LuckInfo) error {
 		"status",
 		"writeoff_date",
 	}
-	_, err := m.db.Update(record, cols, "id=?", record.Id)
+	_, err := m.db.Cols(cols...).Where("id=?", record.Id).Update(record)
 	return err
 }
 

models/marketing/marketing.go

@@ -5,6 +5,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/go-xorm/xorm"
@@ -49,11 +50,13 @@ type MarketingInfo struct {
 }
 
 // GetMarketingList 查询所有
-func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo, error) {
+func (m *MarketingDAO) GetMarketingList(caseids string, page int, pageSize int) ([]MarketingInfo, error) {
 
 	var news []MarketingInfo
 	//sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
-	sql := `SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id where sa.status != -1 order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql := `SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa 
+	LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id 
+	where sa.status != -1 and sa.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
@@ -61,9 +64,9 @@ func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo
 }
 
 // GetMarketingCount 获取总数
-func (m *MarketingDAO) GetMarketingCount() (int64, error) {
+func (m *MarketingDAO) GetMarketingCount(caseids string) (int64, error) {
 	var total []int64
-	sql := `select count(*) as total from sys_activity where status>` + strconv.Itoa(models.STATUS_DEL)
+	sql := `select count(*) as total from sys_activity where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Cols("total").Find(&total)
 	if err != nil {
 

models/system/user.go

@@ -41,7 +41,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 	sql := `select user.*,c.user_type_names from sys_user user left join (
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		INNER join td_user_type b on a.type_id = b.type_id
-		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '0' and
+		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
@@ -60,7 +60,7 @@ func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
 	sql := `select user.*,c.user_type_names from sys_user user left join (
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		INNER join td_user_type b on a.type_id = b.type_id
-		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '0' and
+		group by a.user_id) c on user.user_id = c.user_id where user.user_id != '` + models.ADMIN_ID + `' and
 		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_case where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 

service/card/card.go

@@ -358,7 +358,7 @@ func (s *CardServ) GetCardByIDWithCheck(cardID string) (*card.CardInfo, error) {
 }
 
 // GetCardWithCustomer 获取体验卡明细
-func (s *CardServ) GetCardWithCustomer(cardid string) (*card.CaseUsableCard, error) {
+func (s *CardServ) GetCardWithCustomer(cardid string) (*card.CardDetailWithSales, error) {
 	if cardid == "" {
 		return nil, errors.New("没有卡信息！")
 	}

service/cases/cases.go

@@ -106,6 +106,21 @@ func (s *CaseServ) SaveCase(caseinfo model.SysCase) (*model.SysCase, error) {
 			utils.LogError("保存案场信息失败: " + err.Error())
 			return nil, errors.New("保存案场信息失败")
 		}
+		// 新增管理员对应案场
+		if newInfo.CreateUser != "1" {
+			var userCase = model.SysUserCase{
+				CaseId:    newInfo.CaseId,
+				UserId:    models.ADMIN_ID,
+				CaseName:  newInfo.CaseName,
+				IsBelong:  0,
+				IsCreated: 0,
+			}
+			err = s.userdao.SaveUserCase(userCase)
+			if err != nil {
+				utils.LogError("保存案场信息失败: " + err.Error())
+				return nil, errors.New("保存案场信息失败")
+			}
+		}
 		// 新增案场配置信息
 		var conf = model.SysCaseConf{
 			CaseId:   newInfo.CaseId,

service/coupon/coupon.go

@@ -402,7 +402,7 @@ func (s *CouponServ) GetCouponBySendType(sendtype string) ([]model.TaCoupon, err
 }
 
 // GetCouponWithCustomer 获取优惠券明细
-func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponDetail, error) {
+func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponDetailWithRealName, error) {
 	if couponid == "" {
 		return nil, errors.New("没有券信息！")
 	}

service/luckdraw/luckdraw.go

@@ -37,6 +37,7 @@ func (s *LuckdrawServ) GetLuckDraw(id string) (*luckdraw.LuckDraw, error) {
 func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuckdrawPrize, *model.TaPrizeDetail, error) {
 	prize, prizeDetail, err := s.dao.LuckDraw(id, user)
 	if err != nil {
+		utils.LogError("抽奖失败：", err)
 		return nil, nil, err
 	}
 	return prize, prizeDetail, nil

service/marketing/marketing.go

@@ -31,7 +31,7 @@ func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 }
 
 // GetMarketingList 获取活动列表
-func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]interface{}, error) {
+func (s *MarketingServ) GetMarketingList(caseids string, page int, pageSize int) (map[string]interface{}, error) {
 
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
@@ -40,13 +40,13 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 		page = 1
 	}
 
-	list, err := s.dao.GetMarketingList(page, pageSize)
+	list, err := s.dao.GetMarketingList(caseids, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
 
-	total, err := s.dao.GetMarketingCount()
+	total, err := s.dao.GetMarketingCount(caseids)
 
 	return map[string]interface{}{
 		"list":     list,