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

business/model/dao/store_sku.go

@@ -210,12 +210,13 @@ type StoreSkuExt struct {
 
 type SkuNameAndPlace struct {
 	model.SkuName
-	CityCode int                 `json:"cityCode"`
-	CityName string              `json:"cityName"`
-	Sequence int                 `json:"sequence"`
-	Count    int                 `json:"count"`
-	Type     int                 `json:"type"`
-	Skus     []*model.SkuAndName `json:"skus"`
+	UnitPrice int                 `json:"unitPrice"`
+	CityCode  int                 `json:"cityCode"`
+	CityName  string              `json:"cityName"`
+	Sequence  int                 `json:"sequence"`
+	Count     int                 `json:"count"`
+	Type      int                 `json:"type"`
+	Skus      []*model.SkuAndName `json:"skus"`
 }
 
 type StoreSkuPriceAndWeight struct {

business/model/sku.go

@@ -231,14 +231,21 @@ type Sku struct {
 
 type SkuAndName struct {
 	Sku
-	Name          string
-	Unit          string
-	Prefix        string
-	IsSpu         int
-	ExPrefix      string
-	ExPrefixBegin *time.Time
-	ExPrefixEnd   *time.Time
-	Price         int
+	Name           string     `json:"name"`
+	Unit           string     `json:"unit"`
+	Prefix         string     `json:"prefix"`
+	IsSpu          int        `json:"isSpu"`
+	ExPrefix       string     `json:"exPrefix"`
+	ExPrefixBegin  *time.Time `json:"exPrefixBegin"`
+	ExPrefixEnd    *time.Time `json:"eExPrefixEndxPrefixEnd"`
+	Price          int        `json:"price"`
+	StoreSkuStatus int        `json:"storeSkuStatus"`
+	ActPrice       int        `json:"actPrice"`
+	ActID          int        `orm:"column(act_id)" json:"actID"`
+	ActType        int        `orm:"column(act_type)" json:"actType"`
+
+	EarningPrice int `json:"earningPrice"`
+	EarningActID int `orm:"column(earning_act_id)" json:"earningActID"`
 }
 
 func (*Sku) TableUnique() [][]string {