胡轶钦 6 年前
父节点
当前提交
cdcdc34218

+ 0
- 1
controllers/customerremark/customerremark.go 查看文件

62
 		c.ResponseError(err)
62
 		c.ResponseError(err)
63
 	}
63
 	}
64
 	c.ResponseJSON(num)
64
 	c.ResponseJSON(num)
65
-
66
 }
65
 }
67
 
66
 
68
 func (c *CustomerRemarkController) SearchCustomer() {
67
 func (c *CustomerRemarkController) SearchCustomer() {

+ 8
- 0
controllers/flashbuy/flashbuy.go 查看文件

136
 	}
136
 	}
137
 	c.ResponseJSON("恭喜您!抢购成功!")
137
 	c.ResponseJSON("恭喜您!抢购成功!")
138
 }
138
 }
139
+
140
+func (c *FlashBuyController) GetFlashModelList() {
141
+	model, err := c.dao.GetFlashModelList()
142
+	if err != nil {
143
+		c.ResponseError(err)
144
+	}
145
+	c.ResponseJSON(model)
146
+}

+ 1
- 1
models/customer/customer.go 查看文件

282
 
282
 
283
 func (m *CustomerDAO) GetSalesCaseById(userId string) (*model.SysUserCase, error) {
283
 func (m *CustomerDAO) GetSalesCaseById(userId string) (*model.SysUserCase, error) {
284
 	userCase := new(model.SysUserCase)
284
 	userCase := new(model.SysUserCase)
285
-	if _, err := m.db.Where("user_id = ?", userId).Get(&userCase); err != nil {
285
+	if _, err := m.db.Where("user_id = ?", userId).Get(userCase); err != nil {
286
 		return nil, err
286
 		return nil, err
287
 	}
287
 	}
288
 	return userCase, nil
288
 	return userCase, nil

+ 7
- 0
models/flashbuy/flashbuy.go 查看文件

275
 	_, err := m.db.Insert(cstFlashBuy)
275
 	_, err := m.db.Insert(cstFlashBuy)
276
 	return &cstFlashBuy, err
276
 	return &cstFlashBuy, err
277
 }
277
 }
278
+
279
+func (m *FlashbuyDAO) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
280
+	var model []model.TdFlashbuyModel
281
+	sql := `select * from td_flashbuy_model`
282
+	err := m.db.Sql(sql).Find(&model)
283
+	return model, err
284
+}

+ 1
- 0
routers/common.go 查看文件

333
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
333
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
334
 		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
334
 		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
335
 		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
335
 		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
336
+		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
336
 	)
337
 	)
337
 }
338
 }

+ 3
- 0
routers/guest.go 查看文件

6
 	"spaceofcheng/services/controllers/cases"
6
 	"spaceofcheng/services/controllers/cases"
7
 	"spaceofcheng/services/controllers/course"
7
 	"spaceofcheng/services/controllers/course"
8
 	"spaceofcheng/services/controllers/customer"
8
 	"spaceofcheng/services/controllers/customer"
9
+	"spaceofcheng/services/controllers/customerremark"
9
 	"spaceofcheng/services/controllers/goods"
10
 	"spaceofcheng/services/controllers/goods"
10
 	"spaceofcheng/services/controllers/message"
11
 	"spaceofcheng/services/controllers/message"
11
 	"spaceofcheng/services/controllers/user"
12
 	"spaceofcheng/services/controllers/user"
66
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
67
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
67
 		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
68
 		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
68
 		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
69
 		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
70
+
71
+		beego.NSRouter("/customerremark/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
69
 	)
72
 	)
70
 }
73
 }

+ 0
- 1
routers/wechat.go 查看文件

105
 		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
105
 		beego.NSRouter("/customerremark/:salesId/:customerId", &customerremark.CustomerRemarkController{}, "get:GetCustomerRemarkList"),
106
 		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
106
 		beego.NSRouter("/customerremark/search/:salesId/:customerInfo", &customerremark.CustomerRemarkController{}, "get:SearchCustomer"),
107
 		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
107
 		beego.NSRouter("/customerremark", &customerremark.CustomerRemarkController{}, "post:AddRemark"),
108
-		beego.NSRouter("/customerremark/exist/:recommendCode", &customerremark.CustomerRemarkController{}, "get:IsExist"),
109
 	)
108
 	)
110
 }
109
 }

+ 9
- 0
service/flashbuy/flashbuy.go 查看文件

251
 
251
 
252
 	return nil
252
 	return nil
253
 }
253
 }
254
+
255
+func (s *FlashBuyServ) GetFlashModelList() ([]model.TdFlashbuyModel, error) {
256
+	model, err := s.dao.GetFlashModelList()
257
+	if err != nil {
258
+		utils.LogError("获取抢购活动模板失败: " + err.Error())
259
+		return nil, errors.New("获取抢购活动模板失败")
260
+	}
261
+	return model, nil
262
+}