bug修改

models/card/card.go

@@ -481,7 +481,7 @@ func (m *CardDAO) GetCustomerCardByCustomerAndSaleCount(customerid, saleid strin
 // GetCustomerCardByCustomerAndSale 获取用户的领取记录
 func (m *CardDAO) GetCustomerCardByCustomerAndSale(customerid, saleid string, page, pageSize int) ([]model.TaCustomerCard, error) {
 	var customerCard []model.TaCustomerCard
-	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).Desc("status").Limit(pageSize, (page-1)*pageSize).Find(&customerCard)
+	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).OrderBy("status asc,receive_date desc").Limit(pageSize, (page-1)*pageSize).Find(&customerCard)
 	return customerCard, err
 }
 

models/coupon/coupon.go

@@ -542,7 +542,7 @@ func (m *CouponDAO) GetCustomerCouponByCustomerAndSaleCount(customerid, saleid s
 // GetCustomerCouponByCustomerAndSale 获取用户的领取记录
 func (m *CouponDAO) GetCustomerCouponByCustomerAndSale(customerid, saleid string, page, pageSize int) ([]model.TaCustomerCoupon, error) {
 	var customerCoupon []model.TaCustomerCoupon
-	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).Desc("status").Limit(pageSize, (page-1)*pageSize).Find(&customerCoupon)
+	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).OrderBy("status asc,receive_date desc").Limit(pageSize, (page-1)*pageSize).Find(&customerCoupon)
 	return customerCoupon, err
 }
 

service/flashbuy/flashbuy.go

@@ -206,6 +206,7 @@ func (s *FlashBuyServ) GetCustomerFlashBuyId(customerFlashBuyId string) (*flashb
 // FlashBuy 抢购
 func (s *FlashBuyServ) FlashBuy(id string) error {
 	flashbuy, err := s.dao.GetFlashBuyById(id)
+	utils.LogError("-----------------抢购校验开始")
 	if err != nil {
 		utils.LogError("获取抢购活动信息失败: " + err.Error())
 		return errors.New("获取抢购活动信息失败！")
@@ -231,6 +232,7 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 	if len(buys) > 0 {
 		return errors.New("您已参与过该活动！")
 	}
+	utils.LogError("-----------------抢购------")
 	if flashbuy.JoinNum >= flashbuy.FlashBuyMaxAttendant {
 		err = s.dao.UpdateFlashBuy(flashbuy.FlashBuyId, models.FLASH_BUY_OVER)
 		if err != nil {
@@ -279,6 +281,7 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 		utils.LogError("插入中奖二维码失败: " + err.Error())
 		return errors.New("写入中奖二维码失败")
 	}
+	// ---------------推送消息
 
 	// 推送微信消息
 	userMap := s.ctx.Get("userMap").(model.TaUserMapping)