Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/jxstore/act/act.go

@@ -2,12 +2,13 @@ package act
 
 import (
 	"fmt"
-	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
 	"math"
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
+
 	"git.rosy.net.cn/jx-callback/business/authz"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
@@ -157,6 +158,24 @@ var (
 				MaxDiscount: 100,
 			},
 		},
+		model.VendorIDTaoVegetable: map[int]*tActRuleInfo{
+			model.ActSkuFake: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 500,
+			},
+			model.ActSkuDirectDown: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 99,
+			},
+			model.ActSkuSecKill: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 30,
+			},
+			model.ActSkuDiscount: &tActRuleInfo{
+				MinDiscount: 100,
+				MaxDiscount: 100,
+			},
+		},
 	}
 )