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

1

Browse Source
This commit is contained in:
邹宗楠
2024-10-14 12:41:49 +08:00
parent 1c136089da
commit e17042afd0
11 changed files with 166 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order.go
View File

@@ -2153,7 +2153,7 @@ func RefreshOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID,
}
storeSku := storeSkus[0]
//if v.ShopPrice == v.EarningPrice {
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
if v.SalePrice > v.ShopPrice {
v.EarningPrice = int64(math.Round(float64(storeSku.Price) * float64(order.OrderPayPercentage) / 100))
} else {

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

@@ -471,7 +471,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
}
if v.SkuCount2 > 0 {
var skuStr string
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
skuStr = strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),
@@ -1678,6 +1678,8 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
)
if beego.BConfig.RunMode == "jxgy" {
appOrgCode = "339032"
} else if beego.BConfig.RunMode == "jxpet" {
appOrgCode = "jxpet_apporg_code"
} else {
appOrgCode = "320406"
}

16
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -20,8 +20,6 @@ import (
push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
beego "github.com/astaxie/beego/server/web"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/authz"
@@ -1806,18 +1804,10 @@ func OrderProfitWarning(order *model.GoodsOrder) {
} else {
payPercentage = storeDetail.PayPercentage
}
if beego.BConfig.RunMode == "jxgy" {
if payPercentage >= 50 {
profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney-order.EarningPrice)) / 100
} else {
profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney*int64(payPercentage)/200)) / 100
}
if payPercentage >= 50 {
profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney-order.EarningPrice)) / 100
} else {
if payPercentage >= 50 {
profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney-order.EarningPrice)) / 100
} else {
profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney*int64(payPercentage)/200)) / 100
}
profit = utils.Str2Float64(utils.Int64ToStr(order.TotalShopMoney*int64(payPercentage)/200)) / 100
}
if profit < 0 {
operatorPhone, operatorName := getOrderOperatorInfo(order, storeDetail)