wangfei 6 年前
父节点
当前提交
1dda339503
共有 5 个文件被更改,包括 8 次插入10 次删除
  1. 2
    2
      conf/db.conf
  2. 1
    1
      controllers/vipcard/vipcard.go
  3. 1
    0
      models/model/ta_case_key.go
  4. 4
    3
      routers/common.go
  5. 0
    4
      service/course/order.go

+ 2
- 2
conf/db.conf 查看文件

5
 con_protocol = tcp
5
 con_protocol = tcp
6
 
6
 
7
 ; 数据库地址,可以使用IP
7
 ; 数据库地址,可以使用IP
8
-# db_addr      = 192.168.0.122
9
-db_addr      = localhost
8
+db_addr      = 192.168.0.122
9
+# db_addr      = localhost
10
 
10
 
11
 ; 端口
11
 ; 端口
12
 db_port      = 3306
12
 db_port      = 3306

+ 1
- 1
controllers/vipcard/vipcard.go 查看文件

48
 }
48
 }
49
 
49
 
50
 // userCharge 用户激活vip卡
50
 // userCharge 用户激活vip卡
51
-func (c *VipcardController) userCharge() {
51
+func (c *VipcardController) UserCharge() {
52
 	vipCode := c.GetString(":vipCardChildCode")
52
 	vipCode := c.GetString(":vipCardChildCode")
53
 	tel := c.GetString(":tel")
53
 	tel := c.GetString(":tel")
54
 	var createUser = c.Context.Get("user").(model.SysUser)
54
 	var createUser = c.Context.Get("user").(model.SysUser)

+ 1
- 0
models/model/ta_case_key.go 查看文件

7
 type TaCaseKey struct {
7
 type TaCaseKey struct {
8
 	KeyId      string    `xorm:"not null pk VARCHAR(64)"`
8
 	KeyId      string    `xorm:"not null pk VARCHAR(64)"`
9
 	LockNum    string    `xorm:"VARCHAR(50)"`
9
 	LockNum    string    `xorm:"VARCHAR(50)"`
10
+	LockNo     int       `xorm:"SMALLINT(11)"`
10
 	Status     int       `xorm:"SMALLINT(6)"`
11
 	Status     int       `xorm:"SMALLINT(6)"`
11
 	CreateDate time.Time `xorm:"DATETIME"`
12
 	CreateDate time.Time `xorm:"DATETIME"`
12
 	OrgId      string    `xorm:"VARCHAR(64)"`
13
 	OrgId      string    `xorm:"VARCHAR(64)"`

+ 4
- 3
routers/common.go 查看文件

10
 	"spaceofcheng/services/controllers/message"
10
 	"spaceofcheng/services/controllers/message"
11
 	"spaceofcheng/services/controllers/system"
11
 	"spaceofcheng/services/controllers/system"
12
 	"spaceofcheng/services/controllers/user"
12
 	"spaceofcheng/services/controllers/user"
13
+	"spaceofcheng/services/controllers/vipcard"
13
 
14
 
14
 	"github.com/astaxie/beego"
15
 	"github.com/astaxie/beego"
15
 )
16
 )
145
 		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "delete:DeleteChannel"),
146
 		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "delete:DeleteChannel"),
146
 
147
 
147
 		// vipcard VIP卡
148
 		// vipcard VIP卡
148
-		beego.NSRouter("/vipcard", &channel.ChannelController{}, "get:GetVipList"),
149
-		beego.NSRouter("/vipcard", &channel.ChannelController{}, "post:AddVipCard"),
150
-		beego.NSRouter("/vipcard/:vipCardChildCode", &channel.ChannelController{}, "put:userCharge"),
149
+		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "get:GetVipList"),
150
+		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "post:AddVipCard"),
151
+		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
151
 
152
 
152
 		// role 角色
153
 		// role 角色
153
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
154
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),

+ 0
- 4
service/course/order.go 查看文件

1
 package course
1
 package course
2
-
3
-func (s *CourseServ) Order() error {
4
-
5
-}