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

.gitignore

@@ -2,4 +2,4 @@
 *.exe~
 *.test
 *.log
-common.log
+log

conf/db.conf

@@ -6,7 +6,7 @@ con_protocol = tcp
 
 ; 数据库地址，可以使用IP
 # db_addr      = 192.168.0.122
-db_addr      = 192.168.0.122
+db_addr      = localhost
 
 ; 端口
 db_port      = 3306

controllers/card/card.go

@@ -198,3 +198,15 @@ func (c *CardController) GetCustomerCardByID() {
 
 	c.ResponseJSON(card)
 }
+
+// GetCaseUsableCard 获取案场可用券
+func (c *CardController) GetCaseUsableCard() {
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	cards, err := c.serv.GetCaseUsableCard(page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(cards)
+}

controllers/coupon/coupon.go

@@ -210,3 +210,15 @@ func (c *CouponController) GetCustomerCouponByID() {
 
 	c.ResponseJSON(coupon)
 }
+
+// GetCaseUsableCoupon 获取案场可用券
+func (c *CouponController) GetCaseUsableCoupon() {
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	coupons, err := c.serv.GetCaseUsableCoupon(page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(coupons)
+}

controllers/goods/order.go

@@ -9,9 +9,6 @@ import (
 	"spaceofcheng/services/utils"
 	"strconv"
 	"time"
-
-	"github.com/astaxie/beego"
-	"github.com/tealeg/xlsx"
 )
 
 // GetOrderList 获取商品订单
@@ -154,94 +151,74 @@ func (c *GoodsController) GetOrdersByRecord() {
 		c.ResponseError(err)
 	}
 
-	file := xlsx.NewFile()
-	sheet, _ := file.AddSheet("Sheet1")
-	row := sheet.AddRow()
-	row.SetHeightCM(0.8) //设置每行的高度
-	cell := row.AddCell()
-	cell.Value = "归属案场"
-	cell = row.AddCell()
-	cell.Value = "商品分类"
-	cell = row.AddCell()
-	cell.Value = "商品名称"
-	cell = row.AddCell()
-	cell.Value = "商品规格"
-	cell = row.AddCell()
-	cell.Value = "下单人"
-	cell = row.AddCell()
-	cell.Value = "销售数量"
-	cell = row.AddCell()
-	cell.Value = "商品单价"
-	cell = row.AddCell()
-	cell.Value = "商品总价"
-	cell = row.AddCell()
-	cell.Value = "订单状态"
-	cell = row.AddCell()
-	cell.Value = "下单时间"
-	cell = row.AddCell()
-	cell.Value = "订单号"
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	excel.SetCell(excel.InsertRow(), []string{
+		"归属案场",
+		"商品分类",
+		"商品名称",
+		"商品规格",
+		"下单人",
+		"销售数量",
+		"商品单价",
+		"商品总价",
+		"订单状态",
+		"下单时间",
+		"订单号",
+	})
+
 	var amount float64
-	amount = 0
 	for _, order := range orders {
 		for _, good := range order.Goods {
-			row := sheet.AddRow()
-			row.SetHeightCM(0.8) //设置每行的高度
-			cell := row.AddCell()
-			cell.Value = order.CaseName
-			cell = row.AddCell()
-			cell.Value = good.TypeName
-			cell = row.AddCell()
-			cell.Value = good.GoodsName
-			cell = row.AddCell()
-			cell.Value = good.SpecName
-			cell = row.AddCell()
-			cell.Value = order.UserName
-			cell = row.AddCell()
-			cell.Value = strconv.Itoa(good.Number)
-			cell = row.AddCell()
-			cell.Value = good.Price
-			cell = row.AddCell()
+			row := excel.InsertRow()
+			excel.SetCell(row, []string{
+				order.CaseName,
+				good.TypeName,
+				good.GoodsName,
+				good.SpecName,
+				order.UserName,
+				strconv.Itoa(good.Number),
+				good.Price,
+				strconv.Itoa(good.Number),
+			})
+
 			price, err := strconv.ParseFloat(good.Price, 64)
 			if err != nil {
 				c.ResponseError(errors.New("金额类型不正确！"))
 			}
-			num, err := strconv.ParseFloat(strconv.Itoa(good.Number), 64)
-			if err != nil {
-				c.ResponseError(errors.New("金额类型不正确！"))
-			}
-			amount = amount + price*num
-			cell.Value = strconv.FormatFloat(price*num, 'f', -1, 64)
-			cell = row.AddCell()
-			var status = "未完成"
+			// num, err := strconv.ParseFloat(strconv.Itoa(good.Number), 64)
+			// if err != nil {
+			// 	c.ResponseError(errors.New("金额类型不正确！"))
+			// }
+			charge := price * float64(good.Number)
+			amount = amount + charge
+
+			excel.SetCell(row, strconv.FormatFloat(charge, 'f', -1, 64))
+
+			status := "未完成"
 			if order.Status == models.STATUS_NORMAL {
 				status = "已完成"
 			}
-			cell.Value = status
-			cell = row.AddCell()
-			cell.Value = order.CreateDate.Format("2006-01-02 15:04:05")
-			cell = row.AddCell()
-			cell.Value = order.OrdersNo
+			excel.SetCell(row, status)
+			excel.SetCell(row, order.CreateDate.Format("2006-01-02 15:04:05"))
+			excel.SetCell(row, order.OrdersNo)
 		}
 	}
-	row = sheet.AddRow()
-	row.SetHeightCM(0.8)
-	cell = row.AddCell()
-	cell.Value = "总规定次数"
-	cell = row.AddCell()
-	cell.Value = strconv.Itoa(record.Num)
-	cell = row.AddCell()
-	cell.Value = "实际使用总数"
-	cell = row.AddCell()
-	cell.Value = strconv.Itoa(record.ActrualNum)
-	cell = row.AddCell()
-	cell.Value = "总价"
-	cell = row.AddCell()
-	cell.Value = strconv.FormatFloat(amount, 'f', -1, 64)
-
-	excelpath := beego.AppConfig.String("excelpath") + utils.GetGUID() + ".xlsx"
-	err = file.Save(excelpath)
 
-	c.ResponseJSON(orders)
+	excel.SetCell(excel.InsertRow(), []string{
+		"总规定次数",
+		strconv.Itoa(record.Num),
+		"实际使用总数",
+		strconv.Itoa(record.ActrualNum),
+		"总价",
+		strconv.FormatFloat(amount, 'f', -1, 64),
+	})
+
+	c.SaveToExcel("订单月记录.xlsx", excel)
 }
 
 // GetCustomerOrders 获取用户订单

log/common.log

@@ -0,0 +1,11 @@
+2018/09/14 16:15:08 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
+2018/09/14 16:15:08 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/14 16:20:29 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
+2018/09/14 16:20:29 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/14 16:21:28 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
+2018/09/14 16:21:28 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/14 17:38:13 [E] 获取用户信息失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FROM
+			sys_user t
+		JOIN sys_user_type s ON t.user_id = s.user_id
+		JOIN td_use' at line 4
+2018/09/14 18:49:55 [E] 解析 Token 失败: token contains an invalid number of segments

models/card/card.go

@@ -10,6 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 	"github.com/yl10/kit/guid"
 )
@@ -108,7 +110,7 @@ func (m *CardDAO) AddCard(card *model.TaCouponCard) error {
 	return nil
 }
 
-// UpdateCard 更新优惠券
+// UpdateCard 更新体验卡
 func (m *CardDAO) UpdateCard(card *model.TaCouponCard, cols []string) error {
 	if card.CardId == "" {
 		return errors.New("无卡信息")
@@ -222,6 +224,7 @@ type CaseUsableCard struct {
 func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
 	var cards []CaseUsableCard
 	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	beego.Error(sql)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
 	if userid != "" {
 		for inx, card := range cards {
@@ -235,6 +238,14 @@ func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) (
 	return cards, err
 }
 
+// GetCaseUsableCardCount 获取案场可用卡数量
+func (m *CardDAO) GetCaseUsableCardCount(caseid, userid string) (int, error) {
+	var Coupons []CaseUsableCard
+	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now()`
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+	return len(Coupons), err
+}
+
 // GetCustomerCardByCardAndUser 根据卡与用户获取领取的用户信息
 func (m *CardDAO) GetCustomerCardByCardAndUser(cardid, userid string) ([]model.TaCustomerCard, error) {
 	var customerCards []model.TaCustomerCard
@@ -275,7 +286,7 @@ func (m *CardDAO) GetCustomerCardByUser(caseid, userid string) ([]model.TaCustom
 	return customerCards, err
 }
 
-// GetCardWithCustomer 获取优惠券明细
+// GetCardWithCustomer 获取体验卡明细
 func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
 	var card = new(CaseUsableCard)
 	sql := `select * from ta_card where coupin_id=?`
@@ -284,7 +295,7 @@ func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
 		return nil, err
 	}
 	if card == nil || card.CardId == "" {
-		return nil, errors.New("无优惠券信息")
+		return nil, errors.New("无体验卡信息")
 	}
 	var customerCopons []model.TaCustomerCard
 	sql = `select * from ta_customer_card where card_id = ? and status>?`
@@ -324,7 +335,7 @@ func (m *CardDAO) GetCardByCustomer(orgid, customerid string) ([]CustomerCardWit
 // GetCustomerCardByID 获取我的体验卡详情
 func (m *CardDAO) GetCustomerCardByID(id string) (*CustomerCardWithShare, error) {
 	if id == "" {
-		return nil, errors.New("无优惠券信息")
+		return nil, errors.New("无体验卡信息")
 	}
 	var customerCard = new(CustomerCardWithShare)
 	sql := `select * from ta_customer_card where status>? and customer_card_id=?`

models/coupon/coupon.go

@@ -305,6 +305,15 @@ func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize in
 	return Coupons, err
 }
 
+// GetCaseUsableCouponCount 获取案场可用优惠券数量
+func (m *CouponDAO) GetCaseUsableCouponCount(caseid, userid string) (int, error) {
+	var Coupons []CaseCouponDetail
+	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now()`
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+
+	return len(Coupons), err
+}
+
 // GetCustomerCouponByCouponAndUser 根据优惠券与用户获取领取的用户信息
 func (m *CouponDAO) GetCustomerCouponByCouponAndUser(couponid, userid string) ([]model.TaCustomerCoupon, error) {
 	var customerCoupons []model.TaCustomerCoupon
@@ -450,3 +459,8 @@ func (m *CouponDAO) VerifyCustomerCoupon(id string) error {
 	_, err := m.db.Cols(cols...).Where("customer_coupon_id=?", id).Update(customerCoupon)
 	return err
 }
+
+// ReceiveCoupon 领取优惠券
+func (m *CouponDAO) ReceiveCoupon(couponid string) {
+
+}

models/model/ta_customer_card.go

@@ -19,4 +19,5 @@ type TaCustomerCard struct {
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	OrgId            string    `xorm:"VARCHAR(64)"`
 	VerifyStatus     string    `xorm:"VARCHAR(32)"`
+	SerialCode       string    `xorm:"VARCHAR(64)"`
 }

models/model/ta_customer_coupon.go

@@ -18,4 +18,5 @@ type TaCustomerCoupon struct {
 	UseDate            time.Time `xorm:"DATETIME"`
 	CaseId             string    `xorm:"VARCHAR(64)"`
 	OrgId              string    `xorm:"VARCHAR(64)"`
+	SerialCode         string    `xorm:"VARCHAR(64)"`
 }

models/system/user.go

@@ -405,7 +405,6 @@ type UserWithType struct {
 	model.SysUser `xorm:"extends"`
 	TypeId        string
 	TypeName      string
-	CaseId        string
 }
 
 // GetUserWithTypeByID 获取用户类型
@@ -413,8 +412,7 @@ func (m *UserDAO) GetUserWithTypeByID(userID string) ([]UserWithType, error) {
 	query := `
 		SELECT
 			t.*, m.type_id,
-			m.type_name,
-			m.case_id
+			m.type_name
 		FROM
 			sys_user t
 		JOIN sys_user_type s ON t.user_id = s.user_id

routers/wechat.go

@@ -53,10 +53,12 @@ func getWechatRoutes() beego.LinkNamespace {
 		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
 
 		// 优惠券
+		beego.NSRouter("/coupon", &coupon.CouponController{}, "get:GetCaseUsableCoupon"),
 		beego.NSRouter("/coupon/:id", &coupon.CouponController{}, "get:GetCouponByID"),
 		beego.NSRouter("/coupon/detail/:id", &coupon.CouponController{}, "get:GetCouponWithCustomer"),
 
 		// 卡
+		beego.NSRouter("/card", &card.CardController{}, "get:GetCaseUsableCard"),
 		beego.NSRouter("/card/:id", &card.CardController{}, "get:GetCardByID"),
 		beego.NSRouter("/card/detail/:id", &card.CardController{}, "get:GetCardWithCustomer"),
 	)

service/card/card.go

@@ -6,6 +6,8 @@ import (
 	"spaceofcheng/services/models/card"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/system"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"strings"
 	"time"
@@ -18,6 +20,7 @@ type CardServ struct {
 	ctx     *utils.Context
 	dao     *card.CardDAO
 	custDao *customer.CustomerDAO
+	userDao *system.UserDAO
 }
 
 // NewCardServ 初始化
@@ -26,6 +29,7 @@ func NewCardServ(ctx *utils.Context) *CardServ {
 		ctx:     ctx,
 		dao:     card.NewCardDAO(ctx),
 		custDao: customer.NewCustomerDAO(ctx),
+		userDao: system.NewUserDAO(ctx),
 	}
 }
 
@@ -214,15 +218,15 @@ func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *c
 	endDate := card.EndDate
 
 	// 检查用户是否已经有了该券
-	custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
-	if err != nil {
-		utils.LogError("校验客户卡失败: " + err.Error())
-		return errors.New("校验客户卡失败")
-	}
+	// custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
+	// if err != nil {
+	// 	utils.LogError("校验客户卡失败: " + err.Error())
+	// 	return errors.New("校验客户卡失败")
+	// }
 
-	if custcardS != nil && len(custcardS) > 0 {
-		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
-	}
+	// if custcardS != nil && len(custcardS) > 0 {
+	// 	return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
+	// }
 
 	// 放入我的卡券
 	custcard := model.TaCustomerCard{
@@ -309,3 +313,49 @@ func (s *CardServ) GetCustomerCardByID(id string) (*card.CustomerCardWithShare,
 	}
 	return card, nil
 }
+
+// GetCaseUsableCard 获取案场可用卡
+func (s *CardServ) GetCaseUsableCard(page, pageSize int) (map[string]interface{}, error) {
+
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.UserId == "" {
+		return nil, errors.New("您没有权限查看数据")
+	}
+	userTypes, err := s.userDao.GetUserWithTypeByID(customer.UserId)
+	if err != nil {
+		utils.LogError("获取用户信息失败: " + err.Error())
+		return nil, errors.New("获取用户信息失败")
+	}
+	if len(userTypes) == 0 {
+		return nil, errors.New("您没有权限查看数据")
+	}
+	caseinfo, err := s.userDao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		return nil, errors.New("您没有案场信息！")
+	}
+	var userid = ""
+	if userTypes[0].TypeId != models.USERTYPE_MANAGER {
+		userid = customer.UserId
+	}
+	coupons, err := s.dao.GetCaseUsableCard(caseinfo.CaseId, userid, page, pageSize)
+	if err != nil {
+		return nil, errors.New("获取数据失败！")
+	}
+	total, err := s.dao.GetCaseUsableCardCount(caseinfo.CaseId, userid)
+	if err != nil {
+		utils.LogError("获取商品规格失败: " + err.Error())
+		return nil, errors.New("获取商品规格失败")
+	}
+	return map[string]interface{}{
+		"list":     coupons,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}

service/coupon/coupon.go

@@ -6,12 +6,12 @@ import (
 	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/system"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
-
 	"github.com/yl10/kit/guid"
 )
 
@@ -20,6 +20,7 @@ type CouponServ struct {
 	ctx     *utils.Context
 	dao     *coupon.CouponDAO
 	custDao *customer.CustomerDAO
+	userDao *system.UserDAO
 }
 
 // NewCouponServ 初始化
@@ -28,6 +29,7 @@ func NewCouponServ(ctx *utils.Context) *CouponServ {
 		ctx:     ctx,
 		dao:     coupon.NewCouponDAO(ctx),
 		custDao: customer.NewCustomerDAO(ctx),
+		userDao: system.NewUserDAO(ctx),
 	}
 }
 
@@ -269,15 +271,15 @@ func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp
 	}
 
 	// 检查用户是否已经有了该券
-	custCPS, err := s.dao.CheckCustCoupon(to.CustomerId, cp.CouponId, startDate, endDate)
-	if err != nil {
-		utils.LogError("校验客户优惠券失败: " + err.Error())
-		return errors.New("校验客户优惠券失败")
-	}
-	beego.Error(custCPS)
-	if custCPS != nil && len(custCPS) > 0 {
-		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
-	}
+	// custCPS, err := s.dao.CheckCustCoupon(to.CustomerId, cp.CouponId, startDate, endDate)
+	// if err != nil {
+	// 	utils.LogError("校验客户优惠券失败: " + err.Error())
+	// 	return errors.New("校验客户优惠券失败")
+	// }
+	// beego.Error(custCPS)
+	// if custCPS != nil && len(custCPS) > 0 {
+	// 	return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
+	// }
 
 	// 放入我的卡券
 	custCP := model.TaCustomerCoupon{
@@ -404,4 +406,48 @@ func (s *CouponServ) GetCustomerCouponByID(id string) (*coupon.CustomerCouponWit
 	return coupon, nil
 }
 
-//
+// GetCaseUsableCoupon 获取案场可用券
+func (s *CouponServ) GetCaseUsableCoupon(page, pageSize int) (map[string]interface{}, error) {
+
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.UserId == "" {
+		return nil, errors.New("您没有权限查看数据")
+	}
+	userTypes, err := s.userDao.GetUserWithTypeByID(customer.UserId)
+	if err != nil {
+		utils.LogError("获取用户信息失败: " + err.Error())
+		return nil, errors.New("获取用户信息失败")
+	}
+	if len(userTypes) > 0 {
+		return nil, errors.New("您没有权限查看数据")
+	}
+	caseinfo, err := s.userDao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		return nil, errors.New("您没有案场信息！")
+	}
+	var userid = ""
+	if userTypes[0].TypeId != models.USERTYPE_MANAGER {
+		userid = customer.UserId
+	}
+	coupons, err := s.dao.GetCaseUsableCoupon(caseinfo.CaseId, userid, page, pageSize)
+	if err != nil {
+		return nil, errors.New("获取数据失败！")
+	}
+	total, err := s.dao.GetCaseUsableCouponCount(caseinfo.CaseId, userid)
+	if err != nil {
+		utils.LogError("获取商品规格失败: " + err.Error())
+		return nil, errors.New("获取商品规格失败")
+	}
+	return map[string]interface{}{
+		"list":     coupons,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}

service/goods/orders.go

@@ -284,15 +284,16 @@ func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
 					return errors.New("下单人状态不正确, 不能下单")
 				}
 
-				if ut.CaseId == caseID {
-					info.UserType = ut.TypeId
+				info.UserType = ut.TypeId
 
-					// 下单人姓名 - 姓名不存在则用昵称
-					info.UserName = ut.RealName
-					if info.UserName == "" {
-						info.UserName = cust.CustomerName
-					}
+				// 下单人姓名 - 姓名不存在则用昵称
+				info.UserName = ut.RealName
+				if info.UserName == "" {
+					info.UserName = cust.CustomerName
 				}
+				// if ut.CaseId == caseID {
+
+				// }
 			}
 		}