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:
苏尹岚
2021-03-05 17:30:43 +08:00
parent 71f4d08d68
commit f9f37fa2b7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,13 +390,13 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
utils.Int2Str(v.SkuCount2), utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuEarningPrice), utils.Int2Str(v.SkuEarningPrice),
utils.Int2Str(v.SkuSalePrice), utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuEarningPrice),
}, ",") }, ",")
} else { } else {
skuStr = strings.Join([]string{ skuStr = strings.Join([]string{
utils.Int2Str(v.SkuID), utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2), utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuEarningPrice),
utils.Int2Str(v.SkuSalePrice), utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(v.SkuEarningPrice), utils.Int2Str(v.SkuEarningPrice),
}, ",") }, ",")
@@ -759,7 +759,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
//成都菜市 //成都菜市
if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" { if beego.BConfig.RunMode == "prod" || beego.BConfig.RunMode == "beta" {
if v.EarningType == model.EarningTypeQuote { if v.EarningType == model.EarningTypeQuote {
saleInfo.RealEarningPrice += v.ShopPrice * int64(v.Count) saleInfo.RealEarningPrice += v.EarningPrice * int64(v.Count)
} }
} else { } else {
if v.OrderPayPercentage == 100 { if v.OrderPayPercentage == 100 {