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

business/model/api.go

@@ -35,9 +35,10 @@ type GoodsOrderExt struct {
 	WaybillCreatedAt  time.Time `orm:"type(datetime);index" json:"waybillCreatedAt"`
 	WaybillFinishedAt time.Time `orm:"type(datetime)" json:"waybillFinishedAt"`
 
-	DistrictName  string `json:"districtName"`
-	CityName      string `json:"cityName"`
-	PayPercentage int    `json:"payPercentage"`
+	DistrictName     string `json:"districtName"`
+	CityName         string `json:"cityName"`
+	PayPercentage    int    `json:"payPercentage"`
+	OldPayPercentage int    `json:"oldPayPercentage"`
 
 	SkuInfo         string `json:"skuInfo,omitempty"`
 	SkuInfo2        string `json:"skuInfo2,omitempty"`

business/model/dao/dao_order.go

@@ -767,7 +767,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t5.pay_percentage > 0, t5.pay_percentage, %d) / 100) AS SIGNED) earning_price,
 	t2.status waybill_status, t2.courier_name, t2.courier_mobile,
 	t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at,
-	t5.pay_percentage,
+	t5.pay_percentage, t5.old_pay_percentage,
 	city.name city_name, district.name district_name`, model.DefaultEarningPricePercentage)
 	if isIncludeSku {
 		sql += `,

business/model/store.go

@@ -336,6 +336,7 @@ type Store struct {
 	PayeeBankBranchName string `orm:"size(255)" json:"payeeBankBranchName"` // 开户支行
 	PayeeBankCode       string `orm:"size(8)" json:"payeeBankCode"`         // 开户行代码
 	PayPercentage       int    `json:"payPercentage"`
+	OldPayPercentage    int    `json:"oldPayPercentage"`
 
 	// OperatorName  string `orm:"size(8)" json:"operatorName"`   // 运营人姓名
 	OperatorPhone string `orm:"size(16)" json:"operatorPhone"` // 京东运营人电话