wangfei

service/card/card.go

@@ -71,10 +71,10 @@ func (s *CardServ) GetCardList(caseID, sendtype, usetype string, pagenavi ...int
 		if usetype != "" {
 			switch usetype {
 			case models.COUPONCARD_USETYPE_LUCKDRAW:
-				filters = append(filters, "card_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCard+"')")
+				filters = append(filters, "card_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCard+"') and used_count=0")
 				break
 			case models.COUPONCARD_USETYPE_SYS:
-				filters = append(filters, "card_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_CARD+"')")
+				filters = append(filters, "card_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_CARD+"') and used_count=0")
 				break
 			}
 		}

service/coupon/coupon.go

@@ -66,10 +66,10 @@ func (s *CouponServ) GetCouponList(caseID, sendtype, usetype string, pagenavi ..
 		if usetype != "" {
 			switch usetype {
 			case models.COUPONCARD_USETYPE_LUCKDRAW:
-				filters = append(filters, "coupon_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCoupon+"')")
+				filters = append(filters, "coupon_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCoupon+"') and used_count=0")
 				break
 			case models.COUPONCARD_USETYPE_SYS:
-				filters = append(filters, "coupon_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_COUPON+"')")
+				filters = append(filters, "coupon_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_COUPON+"') and used_count=0")
 				break
 			}
 		}