2.1.0

controllers/flashbuy/flashbuy.go

@@ -118,8 +118,7 @@ func (c *FlashBuyController) UpdateFlashBuy() {
 
 func (c *FlashBuyController) VerifyCustomerFlashBuyList() {
 	qrcode := c.GetString(":qrcode")
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseids := c.GetCaseIDs(cases)
+	caseids := c.GetString(":caseId")
 	customerFlashBuy, err := c.dao.VerifyCustomerFlashBuyList(qrcode, caseids)
 	if err != nil {
 		c.ResponseError(err)

models/customer/customer.go

@@ -129,7 +129,7 @@ func (m *CustomerDAO) GetCustWithWXByOpenID(openid string) (*CustWithWX, error)
 
 	cust := CustWithWX{}
 	query := `
-	SELECT a.*,b.*, b.user_id as map_user,c.type_id as user_type_id,e.real_name
+	SELECT a.*,b.*, b.user_id as map_user,c.type_id as user_type_id,e.real_name,e.recommend_code
 	FROM
 		ta_user_mapping a
 	LEFT JOIN ta_customer b ON a.user_id = b.customer_id

models/customer/types.go

@@ -14,4 +14,5 @@ type CustWithWX struct {
 	BelongCaseId        string
 	BelongCaseStatus    int
 	RealName            string
+	RecommendCode       string
 }

models/flashbuy/flashbuy.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -34,6 +36,7 @@ type CustomerFlashBuy struct {
 	CaseName                 string
 	CustomerName             string
 	Phone                    string
+	FlashBuyName             string
 }
 type CustomerFlashResult struct {
 	model.TaCustomerFlashBuy `xorm:"extends"`
@@ -140,11 +143,17 @@ func (m *FlashbuyDAO) VerifyFlashBuy(customerFlashBuyId string) error {
 		VerifyStatus:       models.VERIFY_USED,
 		VerifyDate:         time.Now(),
 	}
+	beego.Error("---------------------------------")
+	beego.Error(customerFlashBuy)
+	beego.Error("---------------------------------")
 	var cols = []string{
 		"verify_status",
 		"verify_date",
 	}
-	_, err := m.db.Cols(cols...).Where("customer_flash_buy_id = ?", customerFlashBuy.CustomerFlashBuyId).Update(customerFlashBuy)
+	record, err := m.db.Cols(cols...).Where("customer_flash_buy_id = ?", customerFlashBuy.CustomerFlashBuyId).Update(customerFlashBuy)
+	beego.Error("---------------------------------")
+	beego.Error(record)
+	beego.Error("---------------------------------")
 	return err
 }
 
@@ -154,11 +163,13 @@ func (m *FlashbuyDAO) GetCustomerFlashBuyById(flashBuyId, phone string, page, pa
 	a.*,
 	b.customer_name,
 	b.phone,
-	c.case_name 
+	c.case_name,
+	d.flash_buy_id
 FROM
 	ta_customer_flash_buy a
 	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
-	INNER JOIN sys_case c ON a.case_id = c.case_id 
+	INNER JOIN sys_case c ON a.case_id = c.case_id
+	INNER JOIN ta_flash_buy d ON a.flash_buy_id = d.flash_buy_id
 WHERE
 	a.flash_buy_id = '` + flashBuyId + `' 
 	and a.status >` + strconv.Itoa(models.STATUS_DEL)
@@ -197,11 +208,13 @@ func (m *FlashbuyDAO) GetCustomerFlashBuyByQr(customerFlashBuyId, caseId string)
 	a.*,
 	b.customer_name,
 	b.phone,
-	c.case_name 
+	c.case_name,
+	d.flash_buy_name
 FROM
 	ta_customer_flash_buy a
 	INNER JOIN ta_customer b ON a.customer_id = b.customer_id
 	INNER JOIN sys_case c ON a.case_id = c.case_id 
+	INNER JOIN ta_flash_buy d ON a.flash_buy_id = d.flash_buy_id
 WHERE
 	a.customer_flash_buy_id ='` + customerFlashBuyId + `' and a.case_id = '` + caseId + `'`
 	sql += ` and a.validate_start <= now() and a.validate_end >= now()`

routers/common.go

@@ -332,8 +332,8 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/flashbuy/edit", &flashbuy.FlashBuyController{}, "put:SaveFlashBuy"),
 		beego.NSRouter("/flashbuy/:flashBuyId", &flashbuy.FlashBuyController{}, "delete:DeleteFlashBuy"),
 		beego.NSRouter("/flashbuy/:flashBuyId/:flashBuyStatus", &flashbuy.FlashBuyController{}, "put:UpdateFlashBuy"),
-		beego.NSRouter("/flashbuy/:qrcode", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
-		beego.NSRouter("/flashbuy/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
+		beego.NSRouter("/flashbuy/verify/:qrcode/:caseId", &flashbuy.FlashBuyController{}, "get:VerifyCustomerFlashBuyList"),
+		beego.NSRouter("/flashbuy/verify/:customerFlashBuyId", &flashbuy.FlashBuyController{}, "put:Verify"),
 		beego.NSRouter("/flashbuy/model", &flashbuy.FlashBuyController{}, "get:GetFlashModelList"),
 	)
 }

service/flashbuy/flashbuy.go

@@ -10,6 +10,8 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // FlashBuyServ 系统处理
@@ -133,6 +135,9 @@ func (s *FlashBuyServ) VerifyCustomerFlashBuyList(qrcode, caseId string) (*flash
 	var customerFlashBuyId string
 	var customerVerify *flashbuy.CustomerFlashBuy
 	customerFlashBuyId, err = s.vdao.GetCustomerCourseIdByQrcode(qrcode)
+	beego.Error("________________________________")
+	beego.Error(customerFlashBuyId)
+	beego.Error("________________________________")
 	if err != nil {
 		utils.LogError("获取核销列表失败: " + err.Error())
 		return nil, errors.New("获取核销列表失败")