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-08-23 10:56:38 +08:00
parent 099166f543
commit b853363a58
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/jxcallback/orderman/orderman_ext.go
View File

@@ -388,13 +388,23 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
}
}
}
//if isJxIncomeArea {
// var order2 *model.GoodsOrderExt
// if order.JxIncome >= begin && order.JxIncome <= end {
// order2 = order
// return []*model.GoodsOrderExt{order2}, err
// }
//}
count := &struct {
Count int
}{}
sql2 := `
SELECT COUNT(*) count
FROM goods_order WHERE IF(store_id = 0, jx_store_id ,store_id) = ?
`
storeID := 0
if order.StoreID == 0 {
storeID = order.JxStoreID
} else {
storeID = order.StoreID
}
sqlParams2 := []interface{}{storeID}
if err = dao.GetRow(db, &count, sql2, sqlParams2); err == nil {
order.StoreDayOrderCount = count.Count
}
return retVal, err
}, orders)
tasksch.HandleTask(task, nil, true).Run()

19
business/model/api.go
View File

@@ -41,15 +41,16 @@ type GoodsOrderExt struct {
VendorPayPercentage int `json:"vendorPayPercentage"`
OldPayPercentage int `json:"oldPayPercentage"`
SkuInfo string `json:"skuInfo,omitempty"`
SkuInfo2 string `json:"skuInfo2,omitempty"`
ShortSkuInfo `json:"-"`
SkuList []*ShortSkuInfo `json:"skuList,omitempty"`
Count int `json:"count"`
ShopSumPrice int64 `json:"shopSumPrice"`
AvgPrice int64 `json:"avgPrice"`
BadCommentCount int `json:"badCommentCount"`
JxIncome int64 `json:"jxIncome"` //预计收益
SkuInfo string `json:"skuInfo,omitempty"`
SkuInfo2 string `json:"skuInfo2,omitempty"`
ShortSkuInfo `json:"-"`
SkuList []*ShortSkuInfo `json:"skuList,omitempty"`
Count int `json:"count"`
ShopSumPrice int64 `json:"shopSumPrice"`
AvgPrice int64 `json:"avgPrice"`
BadCommentCount int `json:"badCommentCount"`
JxIncome int64 `json:"jxIncome"` //预计收益
StoreDayOrderCount int `json:"storeDayOrderCount"` //门店当天单量
FloatLng float64 `json:"floatLng"`
FloatLat float64 `json:"floatLat"`