Merge branch 'dev/v4.8.93_fuwencai' of qmx/jy into feature/v4.8.93

src/jfw/modules/subscribepay/src/entity/equityActive.go

@@ -128,7 +128,7 @@ func (e *EquityActive) processEquityInfo(activeName string, activeId, mold int)
 	countQuery := fmt.Sprintf("SELECT count(*)  FROM %s where state= 0 and mold=? and active_id=? ;", TableEquityInfo)
 	rows, err := tx.Query(countQuery, mold, activeId)
 	if err != nil || rows == nil {
-		log.Println("获取剩余库存数量失败：", err, rows,e.OrderCode)
+		log.Println("获取剩余库存数量失败：", err, rows, e.OrderCode)
 		return
 	}
 	defer rows.Close()
@@ -147,7 +147,7 @@ func (e *EquityActive) processEquityInfo(activeName string, activeId, mold int)
 	data, err := tx.Query(query, mold, activeId)
 	if err != nil || data == nil {
 		tx.Rollback()
-		log.Println("获取视频权益码信息失败：", err, data,e.OrderCode)
+		log.Println("获取视频权益码信息失败：", err, data, e.OrderCode)
 		return
 	}
 	eId, name, code, exEndTime := 0, "", "", ""
@@ -156,12 +156,13 @@ func (e *EquityActive) processEquityInfo(activeName string, activeId, mold int)
 		err = data.Scan(&eId, &name, &code, &exEndTime)
 	}
 	if err != nil {
-		log.Println("获取视频权益码失败：", err, data,e.OrderCode)
+		log.Println("获取视频权益码失败：", err, data, e.OrderCode)
 		tx.Rollback()
 		return
 	}
 	threshold, b := config.Config.EquityActive.MailAlarm.Threshold[fmt.Sprintf("%v", mold)]
 	if count < 1 || eId <= 0 {
+		tx.Rollback()
 		// 没有库存
 		if b {
 			go e.sendAlarmMail(activeName, activeId, threshold.Name, mold, 0)
@@ -176,12 +177,12 @@ func (e *EquityActive) processEquityInfo(activeName string, activeId, mold int)
 	_, err = tx.Exec(update, e.OrderCode, valueStateGifted, date.NowFormat(date.Date_Full_Layout), eId)
 	if err != nil {
 		tx.Rollback()
-		log.Println("更新视频权益码失败", e.OrderCode,eId,err)
+		log.Println("更新视频权益码失败", e.OrderCode, eId, err)
 		return
 	}
 	err = tx.Commit()
 	if err != nil {
-		log.Println("视频权益码commit失败",e.OrderCode,eId, err)
+		log.Println("视频权益码commit失败", e.OrderCode, eId, err)
 		return
 	}
 	//6. 发送短信、站内信