fix:最优活动逻辑修改

src/jfw/modules/subscribepay/src/service/commodity.go

@@ -201,16 +201,21 @@ func EventRenewalReminder(session *httpsession.Session, userid string, areaCount
 						if activity != nil && activity.Id == sku.ActivityId {
 							for _, discounts := range activity.Discount { //卡卷
 								if discounts != nil && discounts.Usable && discounts.LotteryId == sku.LotterId {
-									if discounts.Types == 3 {
+									switch discounts.Types {
+									case 0, 5: //满减 分值换算
+										discounts.Full = discounts.Full / 100
+										discounts.Reduce = discounts.Reduce / 100
+									case 3:
 										discounts.Full = sku.OriginalPrice
 										discounts.Reduce = sku.OriginalPrice - discounts.PromotionalPrice
-									} else if discounts.Types == 2 && discounts.Time == 12 && discounts.TimeType == 2 {
-										discounts.Time = 1
-										discounts.TimeType = 3
-									}
-									if discounts.Types == 2 && discounts.Time%12 == 0 {
-										discounts.Time = discounts.Time / 12
-										discounts.TimeType = 3
+									case 2:
+										if discounts.Time == 12 {
+											discounts.Time = 1
+											discounts.TimeType = 3
+										} else if discounts.Time > 12 && discounts.Time%12 == 0 {
+											discounts.Time = discounts.Time / 12
+											discounts.TimeType = 3
+										}
 									}
 									activity.Discount = []*util.Discounts{discounts}
 									sku.Activity = []*util.Activity{activity}