vip卡

controllers/vipcard/vipcard.go

@@ -51,6 +51,7 @@ func (c *VipcardController) AddVipCard() {
 func (c *VipcardController) userCharge() {
 	vipCode := c.GetString(":vipCardChildCode")
 	tel := c.GetString(":tel")
+	var createUser = c.Context.Get("user").(model.SysUser)
 	vipChild, err := c.dao.GetVipChildByCode(vipCode)
 	if err != nil {
 		c.ResponseError(err)
@@ -63,12 +64,12 @@ func (c *VipcardController) userCharge() {
 	vipChild.CustomerId = customer.CustomerId
 	vipChild.CustomerTel = tel
 	vipChild.ActiveDate = time.Now()
-	newVipChild, err := c.dao.UpdateVipChild(vipChild)
-	if err != nil {
+	err1 := c.dao.UpdateVipChild(vipChild)
+	if err1 != nil {
 		c.ResponseError(err)
 	}
-	err := c.dao.CustomerCharge(newVipChild)
-	if err != nil {
+	err2 := c.dao.CustomerCharge(vipChild, createUser)
+	if err2 != nil {
 		c.ResponseError(err)
 	}
 	c.ResponseJSON("激活成功")

models/vipcard/vipcard.go

@@ -73,6 +73,7 @@ WHERE
 
 // AddVipCard 新增VIP卡
 func (m *VipcardDAO) AddVipCard(vipCard model.TaVipCard) (*model.TaVipCard, error) {
+	vipCard.VipCardName = "面值" + vipCard.CardAmount + "元VIP卡"
 	vipCard.VipCardId = utils.GetGUID()
 	vipCard.CreateDate = time.Now()
 	vipCard.Status = models.STATUS_NORMAL

routers/common.go

@@ -137,12 +137,18 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/case/table", &cases.CaseController{}, "put:SaveCaseTable"),
 		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
 
+		// channel 渠道
 		beego.NSRouter("/channel", &channel.ChannelController{}, "get:GetChannelList"),
 		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "get:GetChannelById"),
 		beego.NSRouter("/channel", &channel.ChannelController{}, "post:SaveChannel"),
 		beego.NSRouter("/channel", &channel.ChannelController{}, "put:SaveChannel"),
 		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "delete:DeleteChannel"),
 
+		// vipcard VIP卡
+		beego.NSRouter("/vipcard", &channel.ChannelController{}, "get:GetVipList"),
+		beego.NSRouter("/vipcard", &channel.ChannelController{}, "post:AddVipCard"),
+		beego.NSRouter("/vipcard/:vipCardChildCode", &channel.ChannelController{}, "put:userCharge"),
+
 		// role 角色
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),

service/vipcard/vipcard.go

@@ -60,10 +60,10 @@ func (s *VipcardServ) GetVipChildByCode(vipChildId string) (*model.TaVipCardChil
 }
 
 // UpdateVipChild 更新子卡
-func (s *VipcardServ) UpdateVipChild(vipChild *model.TaVipCardChild) (*model.TaVipCardChild, error) {
+func (s *VipcardServ) UpdateVipChild(vipChild *model.TaVipCardChild) error {
 	var err error
 	err = s.dao.UpdateVipChild(vipChild)
-	return &vipChild, err
+	return err
 }
 
 // AddVipCard 新建VIP卡
@@ -94,7 +94,7 @@ func (s *VipcardServ) FindCustomerByTel(tel string) (*model.TaCustomer, error) {
 }
 
 // CustomerCharge 给用户充值
-func (s *VipcardServ) CustomerCharge(vipchild model.TaVipCardChild, createUser model.SysUser) error {
+func (s *VipcardServ) CustomerCharge(vipchild *model.TaVipCardChild, createUser model.SysUser) error {
 	customer, err := s.cdao.GetCustomerByPhone(vipchild.CustomerTel)
 	if err != nil {
 		return err
@@ -115,6 +115,8 @@ func (s *VipcardServ) CustomerCharge(vipchild model.TaVipCardChild, createUser m
 	record.CustomerName = customer.CustomerName
 	record.ChangeType = models.CONSUME_MONEYCHG
 	record.ChangeSource = models.ACCSOURCE_RECHARGE
+	record.SourceId = vipchild.VipCardChildId
+	record.SourceName = vipcard.VipCardName
 	record.CreateUser = createUser.UserId
 	record.FloatType = models.ACCOUNT_INCOME
 	record.AccountId = account.AccountId