Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

controllers/statistics/cardcoupon.go

@@ -164,7 +164,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 		case "event":
 			receivetype = "系统"
 			break
-		case "case":
+		case "sales":
 			receivetype = "案场"
 			break
 		case "channel":

models/flashbuy/flashbuy.go

@@ -315,7 +315,7 @@ func (m *FlashbuyDAO) UpdateFlashBuyCustomer(customerId, flashBuyId string) erro
 	}
 	var cols = []string{
 		"is_new",
-		"si_attend",
+		"is_attend",
 	}
 	_, err := m.db.Cols(cols...).Where("customer_id = ?", customer.CustomerId).And("flash_buy_id =?", flashBuyId).Update(customer)
 	return err

models/luckdraw/luckdraw.go

@@ -280,9 +280,10 @@ func (m *LuckDrawDao) SaveLuckDrawPrizes(prizes []PrizeWithDefaults, luckdraw *m
 		if prize.Id == "" {
 			prizes[inx].LuckdrawId = luckdraw.Id
 			prizes[inx].Id = utils.GetGUID()
-			prizes[inx].Remainder = prize.Stock
-			prizes[inx].Status = models.STATUS_NORMAL
 		}
+		prizes[inx].Remainder = prize.Stock
+		prizes[inx].Status = models.STATUS_NORMAL
+
 		if prize.PrizeType == models.PRIZE_TYPE_COUPONCARD {
 			valid, err := m.SavePrizeDetail(prizes[inx].TaLuckdrawPrize)
 			if err != nil {
@@ -596,7 +597,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	}
 	// 更新库存
 	if prize.IsReality == 1 {
-		prize.Remainder = prize.Remainder - 1
+		// prize.Remainder = prize.Remainder - 1
 		err = m.UpdateStock(prize)
 		if err != nil {
 			utils.LogError("更新库存失败：", err)
@@ -611,6 +612,13 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 			// 更新活动截止时间
 			err = m.UpdateLuckDrawEndDate(luckdraw.Id)
 		}
+	} else {
+		// 奖项自动核销，走卡券核销流程
+		err = m.PrizeWriteOff(record.Id, user.CustomerId)
+		if err != nil {
+			utils.LogError("卡券核销失败:", err)
+			return nil, nil, nil, errors.New("操作失败！")
+		}
 	}
 
 	return prize, &detail, record, err
@@ -821,10 +829,12 @@ func (m *LuckDrawDao) GetDefaultsByPrize(prizeid string) ([]model.TaPrizeDefault
 
 // UpdateStock 修改库存
 func (m *LuckDrawDao) UpdateStock(prize *model.TaLuckdrawPrize) error {
-	cols := []string{
-		"remainder",
-	}
-	_, err := m.db.Cols(cols...).Where("id=?", prize.Id).Update(prize)
+	sql := `update ta_luckdraw_prize set remainder = remainder - 1 where id=?`
+	_, err := m.db.Exec(sql, prize.Id)
+	// cols := []string{
+	// 	"remainder",
+	// }
+	// _, err := m.db.Cols(cols...).Where("id=?", prize.Id).Update(prize)
 	return err
 }
 

models/statistics/cardcoupon.go

@@ -225,8 +225,8 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 							a.start_date,
 							a.end_date,
 							a.receive_date,
-							a.receive_date as used_date,
-							'used' as verify_status
+							a.verify_date as used_date,
+							a.verify_status
 						FROM
 							ta_customer_card a
 						INNER JOIN ta_coupon_card_target b ON b.card_id = a.card_id
@@ -265,7 +265,7 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 									) as used_date,
 									(
 										CASE
-										WHEN NOW() > a.end_date THEN
+										WHEN use_date IS NULL and NOW() > a.end_date THEN
 											'expire'
 										WHEN use_date IS NULL THEN
 											'useable'
@@ -325,7 +325,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 							a.start_date,
 							a.end_date,
 							a.receive_date,
-							a.receive_date as used_date,
+							a.verify_date as used_date,
 							a.verify_status
 						FROM
 							ta_customer_card a
@@ -365,7 +365,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 									) as used_date,
 									(
 										CASE
-										WHEN NOW() > a.end_date THEN
+										WHEN use_date IS NULL and NOW() > a.end_date THEN
 											'expire'
 										WHEN use_date IS NULL THEN
 											'useable'