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

conf/sms.conf

@@ -1,7 +1,7 @@
 # 短信接口
-url = http://localhost:8080/sms
+url = http://micservice.ycjcjy.com/sms
 method = POST
 contentType = "application/json;charset=UTF-8"
 
 [captcha]
-code = 0107
+code = 0113

controllers/cases/key.go

@@ -7,6 +7,10 @@ func (c *CaseController) GetKeyList() {
 	pageSize, _ := c.GetInt("pagesize")
 	num := c.GetString("num")
 
+	if page < 1 {
+		page = 1
+	}
+
 	list, err := c.dao.GetKeysByCase(caseid, num, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)

log/common.log

@@ -5,3 +5,16 @@
 2018/08/20 15:46:35 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
 2018/08/20 15:49:09 [E] 获取客户列表失败: Error 1060: Duplicate column name 'user_id'
 2018/08/20 15:57:45 [E] 获取客户列表失败: sql: statement expects 2 inputs; got 1
+2018/08/20 19:25:08 [E] 短信发送失败: 400 
+2018/08/20 19:27:58 [E] 短信发送失败: 400 
+2018/08/20 19:28:52 [E] 短信发送失败: 400 
+2018/08/21 13:38:17 [E] 用户没有设置默认案场
+2018/08/21 13:38:17 [E] 您没有该案场的权限！
+2018/08/21 13:39:04 [E] 用户没有设置默认案场
+2018/08/21 13:39:04 [E] 您没有该案场的权限！
+2018/08/21 13:39:09 [E] 用户没有设置默认案场
+2018/08/21 13:39:09 [E] 您没有该案场的权限！
+2018/08/21 13:39:24 [E] 用户没有设置默认案场
+2018/08/21 13:39:24 [E] 您没有该案场的权限！
+2018/08/21 13:41:04 [E] 用户没有设置默认案场
+2018/08/21 13:41:04 [E] 您没有该案场的权限！

models/cases/area.go

@@ -68,6 +68,7 @@ func (m *CaseDAO) UpdateCaseArea(area model.SysCaseArea) error {
 		"area_name",
 		"area_icon",
 		"area_icon_white",
+		"order",
 	}
 	_, err := m.db.Cols(cols...).Where("area_id=?", area.AreaId).Update(area)
 	return err

models/cases/key.go

@@ -22,11 +22,26 @@ type CaseKeyInfo struct {
 // GetKeysByCase 根据案场获取钥匙信息
 func (m *CaseDAO) GetKeysByCase(caseid, num string, page, pageSize int) ([]CaseKeyInfo, error) {
 	var keys []CaseKeyInfo
-	dao := m.db.Where("case_id=?", caseid).Table("ta_case_key").And("status>" + strconv.Itoa(models.STATUS_DEL))
+	query := `
+		SELECT
+			t.*, s.customer_id,
+			s.customer_name
+		FROM
+			ta_case_key t
+		LEFT JOIN ta_case_key_use s ON t.key_id = s.key_id AND s.status != ?
+		WHERE
+			t.case_id = ?
+		AND t.status > ?
+	`
+
 	if num != "" {
-		dao.And("lock_num like '%" + num + "%'")
+		query += " AND t.lock_num like '%" + num + "%'"
 	}
-	err := dao.Limit(pageSize, (page-1)*pageSize).Find(&keys)
+
+	offset := (page - 1) * pageSize
+	query += " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
+
+	err := m.db.SQL(query, models.STATUS_NORMAL, caseid, models.STATUS_DEL).Find(&keys)
 	return keys, err
 }
 

models/constant.go

@@ -2,8 +2,14 @@ package models
 
 // 状态列表
 const (
-	STATUS_NORMAL = 1
-	STATUS_DEL    = -1
+	// 删除
+	STATUS_DEL = iota - 1
+
+	// 新录入
+	STATUS_READY
+
+	// 正常
+	STATUS_NORMAL
 )
 
 // 映射数据库的布尔型

models/goods/goods.go

@@ -1,7 +1,13 @@
 package goods
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"time"
+
+	"github.com/yl10/kit/guid"
 
 	"github.com/go-xorm/xorm"
 )
@@ -21,6 +27,68 @@ func NewGoodsDAO(ctx *utils.Context) *GoodsDAO {
 }
 
 // GetGoodsListOfCase 获取案场商品列表
-func (m *GoodsDAO) GetGoodsListOfCase() {
+// 暂时没涉及分页
+func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
+	var goodsList []GoodsWithSpec
+
+	sql := "select * from ta_goods where case_id = ? and status = ? order by t.type_id, t.create_date"
+	if err := m.db.SQL(sql, caseID, models.STATUS_NORMAL).Find(&goodsList); err != nil {
+		return nil, err
+	}
+
+	for inx, goods := range goodsList {
+		sql = `SELECT * FROM td_spec t
+			JOIN ta_goods_spec s ON t.spec_id = s.spec_id
+			WHERE t.status = ? AND s.goods_id = ?
+		`
+
+		var specs []SpecWithPrice
+		if err := m.db.SQL(sql, models.STATUS_DEL, goods.GoodsId).Find(&specs); err != nil {
+			return nil, err
+		}
+
+		goodsList[inx].Specs = specs
+	}
+
+	return goodsList, nil
+}
+
+// GetGoodsByID 依据ID 获取商品
+func (m *GoodsDAO) GetGoodsByID(id, caseID string) (*model.TaGoods, error) {
+	goods := new(model.TaGoods)
+	if _, err := m.db.Where("goods_id=?", id).And("case_id=?", caseID).Get(goods); err != nil {
+		return nil, err
+	}
+
+	return goods, nil
+}
+
+// UpdateGoods 更新商品
+func (m *GoodsDAO) UpdateGoods(goods *model.TaGoods, cols []string) error {
+	if _, err := m.db.Where("goods_id=?", goods.GoodsId).Cols(cols...).Update(goods); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// SaveGoods 保存商品
+func (m *GoodsDAO) SaveGoods(goods *model.TaGoods) error {
+	userRaw := m.ctx.Get("user")
+	if userRaw == nil {
+		return errors.New("登录异常, 请登出重试")
+	}
+	user := userRaw.(model.SysUser)
+
+	goods.GoodsId = guid.NewGUIDString()
+	goods.Status = models.STATUS_NORMAL
+	goods.CreateDate = time.Now().Local()
+	goods.CreateUser = user.UserId
+	goods.OrgId = user.OrgId
+
+	if _, err := m.db.Insert(goods); err != nil {
+		return err
+	}
 
+	return nil
 }

models/goods/orders.go

@@ -0,0 +1,48 @@
+package goods
+
+import (
+	"errors"
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strings"
+	"time"
+
+	"github.com/yl10/kit/guid"
+)
+
+// SaveOrders 下单
+func (m *GoodsDAO) SaveOrders(order *model.TaGoodsOrders) error {
+	if order.UserId == "" {
+		return errors.New("没有下单人信息")
+	}
+
+	caseID := order.CaseId
+	if caseID == "" {
+		return errors.New("没有指定案场")
+	}
+
+	caseInfo, err := m.getCaseByID(caseID)
+	if err != nil {
+		return err
+	}
+
+	order.OrdersId = guid.NewGUIDString()
+	order.OrgId = caseInfo.OrgId
+	order.CreateDate = time.Now().Local()
+	order.Status = models.STATUS_NORMAL
+
+	// 当前订单号的随机方式 = 时间 + 个人ID
+	order.OrdersNo = time.Now().Local().Format("20060102150405") + "-" + strings.Join(utils.GUIID2IntString(order.UserId), "")
+
+	return nil
+}
+
+func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {
+	cs := new(model.SysCase)
+	if _, err := m.db.Where("case_id=?", caseID).Get(cs); err != nil {
+		return nil, err
+	}
+
+	return cs, nil
+}

models/goods/types.go

@@ -0,0 +1,17 @@
+package goods
+
+import (
+	"spaceofcheng/services/models/model"
+)
+
+// SpecWithPrice 规格价格
+type SpecWithPrice struct {
+	model.TdSpec
+	GoodsPrice float32 `xorm:"FLOAT(8,2)"`
+}
+
+// GoodsWithSpec 含规格商品
+type GoodsWithSpec struct {
+	model.TaGoods
+	Specs []SpecWithPrice
+}

models/model/sys_wechat_conf.go

@@ -3,8 +3,7 @@ package model
 type SysWechatConf struct {
 	ConfId string `xorm:"VARCHAR(64)"`
 	OrgId  string `xorm:"VARCHAR(64)"`
-	Type   int    `xorm:"comment('wechat 微信公众号
-            mini 小程序') SMALLINT(6)"`
+	Type   int    `xorm:"comment('wechat 微信公众号  mini 小程序') SMALLINT(6)"`
 	Appid  string `xorm:"VARCHAR(50)"`
 	Secret string `xorm:"VARCHAR(50)"`
 	Token  string `xorm:"VARCHAR(50)"`

models/model/ta_account_change.go

@@ -5,23 +5,18 @@ import (
 )
 
 type TaAccountChange struct {
-	DetailId   string `xorm:"not null pk VARCHAR(64)"`
-	AccountId  string `xorm:"VARCHAR(64)"`
-	UserId     string `xorm:"VARCHAR(64)"`
-	UserName   string `xorm:"VARCHAR(50)"`
-	OrgId      string `xorm:"VARCHAR(64)"`
-	CaseId     string `xorm:"VARCHAR(64)"`
-	ChangeType string `xorm:"comment('integral 积分
-            amount 城币') VARCHAR(20)"`
-	ChangeSource string `xorm:"comment('vip vip卡充值
-            orders 订单消费
-            register 注册
-            perfect 完善资料
-            recommend 推荐') VARCHAR(20)"`
-	SourceId   string  `xorm:"VARCHAR(64)"`
-	SourceName string  `xorm:"VARCHAR(255)"`
-	Amount     float32 `xorm:"FLOAT(8,2)"`
-	FloatType  string  `xorm:"comment('+
+	DetailId     string  `xorm:"not null pk VARCHAR(64)"`
+	AccountId    string  `xorm:"VARCHAR(64)"`
+	UserId       string  `xorm:"VARCHAR(64)"`
+	UserName     string  `xorm:"VARCHAR(50)"`
+	OrgId        string  `xorm:"VARCHAR(64)"`
+	CaseId       string  `xorm:"VARCHAR(64)"`
+	ChangeType   string  `xorm:"comment('integral 积分 amount 城币') VARCHAR(20)"`
+	ChangeSource string  `xorm:"comment('vip vip卡充值 orders 订单消费 register 注册 perfect 完善资料 recommend 推荐') VARCHAR(20)"`
+	SourceId     string  `xorm:"VARCHAR(64)"`
+	SourceName   string  `xorm:"VARCHAR(255)"`
+	Amount       float32 `xorm:"FLOAT(8,2)"`
+	FloatType    string  `xorm:"comment('+
             -') VARCHAR(5)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 	CreateUser string    `xorm:"VARCHAR(64)"`

models/model/ta_channel.go

@@ -1,8 +1,14 @@
 package model
 
+import (
+	"time"
+)
+
 type TaChannel struct {
-	ChannelId   string `xorm:"not null pk VARCHAR(64)"`
-	ChannelName string `xorm:"VARCHAR(64)"`
-	CaseId      string `xorm:"VARCHAR(64)"`
-	OrgId       string `xorm:"VARCHAR(64)"`
+	ChannelId   string    `xorm:"not null pk VARCHAR(64)"`
+	ChannelName string    `xorm:"VARCHAR(64)"`
+	CaseId      string    `xorm:"VARCHAR(64)"`
+	OrgId       string    `xorm:"VARCHAR(64)"`
+	Status      int       `xorm:"SMALLINT(6)"`
+	CreateDate  time.Time `xorm:"DATETIME"`
 }

models/model/ta_cms_case_image.go

@@ -5,7 +5,6 @@ type TaCmsCaseImage struct {
 	CmsCaseId      string `xorm:"VARCHAR(64)"`
 	CaseImageUrl   string `xorm:"TEXT"`
 	Status         int    `xorm:"SMALLINT(6)"`
-	ImageType      string `xorm:"comment('cover：封面
-            detail：详情') VARCHAR(32)"`
-	Sort int `xorm:"INT(11)"`
+	ImageType      string `xorm:"comment('cover：封面 detail：详情') VARCHAR(32)"`
+	Sort           int    `xorm:"INT(11)"`
 }

models/model/ta_cms_images.go

@@ -6,7 +6,6 @@ import (
 
 type TaCmsImages struct {
 	ImageId           string    `xorm:"not null pk VARCHAR(64)"`
-	Title             string    `xorm:"VARCHAR(50)"`
 	LocationId        string    `xorm:"VARCHAR(64)"`
 	ImageUrl          string    `xorm:"VARCHAR(128)"`
 	ForwardType       string    `xorm:"comment('url：转跳链接，course：转跳课程') CHAR(32)"`
@@ -18,4 +17,5 @@ type TaCmsImages struct {
 	OrgId             string    `xorm:"VARCHAR(64)"`
 	CreateUser        string    `xorm:"VARCHAR(64)"`
 	CreateDate        time.Time `xorm:"DATETIME"`
+	Title             string    `xorm:"VARCHAR(50)"`
 }

models/model/ta_experience_card.go

@@ -1,25 +0,0 @@
-package model
-
-import (
-	"time"
-)
-
-type TaExperienceCard struct {
-	CardId     string    `xorm:"not null pk VARCHAR(64)"`
-	CardTypeId string    `xorm:"VARCHAR(64)"`
-	SendType   string    `xorm:"comment('0案场 1渠道') VARCHAR(32)"`
-	VideoUrl   string    `xorm:"TEXT"`
-	CoverUrl   string    `xorm:"TEXT"`
-	Price      float32   `xorm:"FLOAT(64)"`
-	StartDate  time.Time `xorm:"DATETIME"`
-	EndDate    time.Time `xorm:"DATETIME"`
-	TotalCount int       `xorm:"INT(11)"`
-	SentCount  int       `xorm:"INT(11)"`
-	UsedCount  int       `xorm:"INT(11)"`
-	Status     string    `xorm:"comment('private未发布 public发布 over过期') VARCHAR(32)"`
-	CaseId     string    `xorm:"VARCHAR(64)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	CreateDate time.Time `xorm:"DATETIME"`
-	CreateUser string    `xorm:"VARCHAR(64)"`
-	IsOver     int       `xorm:"TINYINT(1)"`
-}

models/model/ta_goods_orders.go

@@ -5,25 +5,24 @@ import (
 )
 
 type TaGoodsOrders struct {
-	OrdersId   string    `xorm:"not null pk VARCHAR(64)"`
-	OrdersNo   string    `xorm:"VARCHAR(32)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	CaseId     string    `xorm:"VARCHAR(64)"`
-	AreaId     string    `xorm:"VARCHAR(64)"`
-	AreaName   string    `xorm:"VARCHAR(50)"`
-	TableId    string    `xorm:"VARCHAR(64)"`
-	TableName  string    `xorm:"VARCHAR(50)"`
-	Amount     string    `xorm:"DECIMAL(8,2)"`
-	CreateDate time.Time `xorm:"DATETIME"`
-	Status     int       `xorm:"SMALLINT(6)"`
-	PayType    int       `xorm:"comment('vip VIP卡城币抵用
-            coupon 优惠券抵用') SMALLINT(6)"`
-	UserType     int    `xorm:"SMALLINT(6)"`
-	UserId       string `xorm:"VARCHAR(64)"`
-	UserName     string `xorm:"VARCHAR(50)"`
-	OrdersNum    int    `xorm:"INT(11)"`
-	Remark       string `xorm:"TEXT"`
-	IsPay        int    `xorm:"TINYINT(1)"`
-	ActualAmount string `xorm:"DECIMAL(8,2)"`
-	CouponAmount string `xorm:"DECIMAL(8,2)"`
+	OrdersId     string    `xorm:"not null pk VARCHAR(64)"`
+	OrdersNo     string    `xorm:"VARCHAR(32)"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
+	AreaId       string    `xorm:"VARCHAR(64)"`
+	AreaName     string    `xorm:"VARCHAR(50)"`
+	TableId      string    `xorm:"VARCHAR(64)"`
+	TableNo      string    `xorm:"VARCHAR(50)"`
+	Amount       string    `xorm:"DECIMAL(8,2)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	PayType      string    `xorm:"comment('vip VIP卡城币抵用 coupon 优惠券抵用') VARCHAR(20)"`
+	UserType     string    `xorm:"VARCHAR(20)"`
+	UserId       string    `xorm:"VARCHAR(64)"`
+	UserName     string    `xorm:"VARCHAR(50)"`
+	OrdersNum    int       `xorm:"INT(11)"`
+	Remark       string    `xorm:"TEXT"`
+	IsPay        int       `xorm:"TINYINT(1)"`
+	ActualAmount string    `xorm:"DECIMAL(8,2)"`
+	CouponAmount string    `xorm:"DECIMAL(8,2)"`
 }

models/model/ta_user_mapping.go

@@ -1,12 +1,10 @@
 package model
 
 type TaUserMapping struct {
-	MappingId string `xorm:"not null pk VARCHAR(64)"`
-	UserId    string `xorm:"VARCHAR(64)"`
-	UserType  string `xorm:"comment('customer 为会员
-            user 为后台用户') VARCHAR(50)"`
-	AccountType string `xorm:"comment('wechat 微信公众号
-            mini 小程序') VARCHAR(50)"`
+	MappingId   string `xorm:"not null pk VARCHAR(64)"`
+	UserId      string `xorm:"VARCHAR(64)"`
+	UserType    string `xorm:"comment('customer 为会员 user 为后台用户') VARCHAR(50)"`
+	AccountType string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(50)"`
 	Openid      string `xorm:"VARCHAR(200)"`
 	Uuid        string `xorm:"VARCHAR(200)"`
 	AccountInfo string `xorm:"TEXT"`

service/cases/key.go

@@ -25,14 +25,13 @@ func (s *CaseServ) GetKeysByCase(caseid, num string, page, pageSize int) (map[st
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
-		page = 1
-	}
+
 	keys, err := s.dao.GetKeysByCase(caseid, num, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
+
 	total, err := s.dao.GetCaseCount(caseid, num)
 	if err != nil {
 		beego.Error(err)

utils/captcha.go

@@ -80,10 +80,13 @@ func (c *CaptchaEngine) SendCaptcha(phone string) {
 func (c *CaptchaEngine) ValidCaptcha(phone, cap string) error {
 	theCap, ok := c.capList[phone]
 	if !ok {
-		return errors.New("未发送过该号码的验证码")
+		return errors.New("手机号无效或验证码已过期")
 	}
 
-	if time.Now().Local().Before(theCap.Expire) {
+	if time.Now().Local().After(theCap.Expire) {
+		// 注销
+		delete(c.capList, phone)
+
 		return errors.New("验证码已过期")
 	}
 
@@ -91,6 +94,9 @@ func (c *CaptchaEngine) ValidCaptcha(phone, cap string) error {
 		return errors.New("验证码不正确")
 	}
 
+	// 如果成功, 则注销
+	delete(c.capList, phone)
+
 	return nil
 }
 

utils/sms.go

@@ -47,7 +47,7 @@ func SendSMS(smsType, tel string, messages ...string) {
 		}
 
 		// 接口内容
-		paramsTpl := `{"code": "%s", "tel": "%s", "params": "[%s]"}`
+		paramsTpl := `{"code": "%s", "tel": "%s", "params": [%s]}`
 		// 发送消息
 		message := strings.Join(messages, `","`)
 		if message != "" {

utils/utils.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"net/http"
+	"strconv"
 	"strings"
 )
 
@@ -48,3 +49,22 @@ func StrSliceIndexOf(s []string, t string) int64 {
 
 	return -1
 }
+
+// GUIID2IntString guid 转 int 字符串
+func GUIID2IntString(id string) []string {
+	if id == "" {
+		return nil
+	}
+
+	res := make([]string, 0)
+	for _, part := range strings.Split(id, "-") {
+		sum := 0
+		for _, r := range []rune(part) {
+			sum += int(r)
+		}
+
+		res = append(res, strconv.Itoa(sum))
+	}
+
+	return res
+}

utils/utils_test.go

@@ -0,0 +1,48 @@
+package utils_test
+
+import (
+	"spaceofcheng/services/utils"
+	"strings"
+	"testing"
+)
+
+func TestStrSliceIndexOf(t *testing.T) {
+	cases := []map[string]interface{}{
+		map[string]interface{}{
+			"case":     []string{"a", "b", "c"},
+			"expected": int64(1),
+		},
+		map[string]interface{}{
+			"case":     []string{"aa", "bb", "cc"},
+			"expected": int64(-1),
+		},
+	}
+
+	for _, cs := range cases {
+		td := cs["case"].([]string)
+		ex := cs["expected"].(int64)
+
+		res := utils.StrSliceIndexOf(td, "b")
+
+		if ex != res {
+			t.Fatalf("TestStrSliceIndexOf case fail : %v", res)
+		}
+	}
+}
+
+func TestGUIID2IntString(t *testing.T) {
+	cases := []map[string]string{
+		map[string]string{
+			"case":     "3b2da085-8881-4029-9a3d-6d33caf870d0",
+			"expected": "553-217-207-305-861",
+		},
+	}
+
+	for _, cs := range cases {
+		res := utils.GUIID2IntString(cs["case"])
+		if strings.Join(res, "-") != cs["expected"] {
+			t.Fatalf("TestGUIID2IntString fail")
+		}
+	}
+
+}