Merge remote-tracking branch 'origin/mark' into su

business/jxstore/cms/store_sku.go

@@ -88,6 +88,7 @@ type StoreSkuNameExt struct {
 	StoreName string `json:"storeName"`
 
 	model.SkuName
+	PayPercentage int                      `json:"-"`
 	UnitPrice     int                      `json:"unitPrice"`
 	Skus          []map[string]interface{} `orm:"-" json:"skus2,omitempty"`
 	Skus2         []*StoreSkuExt           `orm:"-" json:"skus,omitempty"`
@@ -95,8 +96,6 @@ type StoreSkuNameExt struct {
 
 	PendingOpType    int8 `json:"pendingOpType"`    // 取值同 StoreOpRequest.Type
 	PendingUnitPrice int  `json:"pendingUnitPrice"` // 这个是待审核的价格申请
-
-	PayPercentage int `json:"-"`
 }
 
 // GetStoreSkus用
@@ -167,6 +166,7 @@ type tGetStoresSkusInfo struct {
 	StoreName string
 
 	model.SkuName
+	PayPercentage int `json:"-"`
 	StoreSkuExt
 }
 
@@ -473,6 +473,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
 				StoreName:     v.StoreName,
 				SkuName:       v.SkuName,
 				UnitPrice:     v.UnitPrice,
+				PayPercentage: v.PayPercentage,
 			}
 			if !isBySku {
 				storeNameMap[index] = storeName