liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-04 14:59:37 +08:00
parent 8c222ece76
commit 58b4ea5856
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/model/api.go
View File

@@ -49,6 +49,7 @@ type GoodsOrderExt struct {
ShopSumPrice int64 `json:"shopSumPrice"` ShopSumPrice int64 `json:"shopSumPrice"`
AvgPrice int64 `json:"avgPrice"` AvgPrice int64 `json:"avgPrice"`
BadCommentCount int `json:"badCommentCount"` BadCommentCount int `json:"badCommentCount"`
JxIncome int `json:"jxIncome"` //预计收益
FloatLng float64 `json:"floatLng"` FloatLng float64 `json:"floatLng"`
FloatLat float64 `json:"floatLat"` FloatLat float64 `json:"floatLat"`

15
business/model/dao/dao_order.go
View File

@@ -778,7 +778,8 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at, t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at,
t5.pay_percentage, t5.old_pay_percentage, t5.market_man_phone, tu.name market_man_name, t5.pay_percentage, t5.old_pay_percentage, t5.market_man_phone, tu.name market_man_name,
t6.vendor_pay_percentage, t6.vendor_pay_percentage,
city.name city_name, district.name district_name`, model.DefaultEarningPricePercentage) city.name city_name, district.name district_name,
IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-t2.desired_fee, t1.total_shop_money *(100- t1.order_pay_percentage/2)) jx_income`, model.DefaultEarningPricePercentage)
if isIncludeSku { if isIncludeSku {
sql += `, sql += `,
IF(t3.jx_sku_id > 0, t3.jx_sku_id, t3.sku_id) sku_id, IF(t3.jx_sku_id > 0, t3.jx_sku_id, t3.sku_id) sku_id,
@@ -929,6 +930,18 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
// sqlParams = append(sqlParams, params["deliveryType"].(string)) // sqlParams = append(sqlParams, params["deliveryType"].(string))
// } // }
// } // }
if params["jxIncomeBegin"] != nil {
if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 {
sqlWhere += " AND jx_income >= ?"
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeBegin"]))
}
}
if params["jxIncomeEnd"] != nil {
if utils.MustInterface2Int64(params["jxIncomeEnd"]) != 0 {
sqlWhere += " AND jx_income <= ?"
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"]))
}
}
if params["cities"] != nil { if params["cities"] != nil {
var cities []int var cities []int
if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil { if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {