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)

37
business/jxstore/cms/sku.go
View File

@@ -865,23 +865,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
}
}
//picType := true
//for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
// if imgName != "" {
// dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
// if err = err2; err != nil {
// return nil, err
// }
// if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
// picType = false
// }
// }
//}
//if picType {
// return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片！")
//}
if skuNameExt.DescImg != "" {
dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name+"desc", skuNameExt.DescImg, model.ImgTypeDesc, false)
if err = err2; err != nil {
@@ -912,12 +895,8 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
sku := v.Sku
dao.WrapAddIDCULDEntity(sku, userName)
sku.NameID = skuNameExt.ID
if beego.BConfig.RunMode == "jxgy" {
sku.LadderBoxPrice = 0
} else if beego.BConfig.RunMode == "prod" {
sku.LadderBoxPrice = 10
}
sku.LadderBoxNum = 1
sku.LadderBoxPrice = 0
sku.LadderBoxNum = 0
if err = dao.CreateEntity(db, sku); err != nil {
dao.Rollback(db, txDB)
return nil, err
@@ -1176,6 +1155,8 @@ func getCategoryByName(name string) string {
vendorOrgCode := ""
if beego.BConfig.RunMode == "jxgy" {
vendorOrgCode = "339032"
} else if beego.BConfig.RunMode == "jxpet" {
vendorOrgCode = "jxpet_apporg_code"
} else {
vendorOrgCode = "320406"
}
@@ -1196,6 +1177,8 @@ func getCategoryByImg(img ...string) string {
vendorOrgCode := ""
if beego.BConfig.RunMode == "jxgy" {
vendorOrgCode = "57939570"
} else if beego.BConfig.RunMode == "jxpet" {
vendorOrgCode = "57939570"
} else {
vendorOrgCode = "57939570"
}
@@ -1536,12 +1519,8 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
// sku.JdSyncStatus = model.SyncFlagNewMask
// sku.JdID = 0
sku.NameID = nameID
if beego.BConfig.RunMode == "jxgy" {
sku.LadderBoxPrice = 0
} else if beego.BConfig.RunMode == "prod" {
sku.LadderBoxPrice = 10
}
sku.LadderBoxNum = 1
sku.LadderBoxPrice = 0
sku.LadderBoxNum = 0
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {

2
business/jxstore/cms/store_sku.go
View File

@@ -1726,7 +1726,7 @@ func UpdateStoreSkus(ctx *jxcontext.Context, causeFlag, storeID int, skuBindInfo
}
func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, skuBindInfos []*StoreSkuBindInfo, isScale, isRefreshHigh, isAsync, isContinueWhenError bool) (hint string, err error) {
if beego.BConfig.RunMode == "jxgy" {
if beego.BConfig.RunMode == "jxgy" || beego.BConfig.RunMode == "jxpet" {
doStoreSkuAuditForGy(ctx, storeIDs, skuBindInfos)
var num int64
db := dao.GetDB()

1
business/jxstore/cms/sync_store_sku.go
View File

@@ -79,6 +79,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
case "dev":
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668469)
case "jxgy":
case "jxpet":
default:
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668594)

3
business/jxutils/tasks/configrefresh.go
View File

@@ -187,6 +187,9 @@ func RefreshFnToken() (err error) {
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken); err != nil {
globals.SugarLogger.Debugf("菜市token通知到果园错误:%v", err)
}
if _, err = fnpsapi.HttpToPetFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken); err != nil {
globals.SugarLogger.Debugf("菜市token通知到宠物错误:%v", err)
}
return token, expireTimeStr, refreshToken
}, func(value, v2 string) {

6
business/model/store_score.go
View File

@@ -35,6 +35,12 @@ type StoreScore struct {
SaleSkuPrice int `orm:"column(sale_sku_price)" json:"saleSkuPrice"`
}
func (*StoreScore) TableIndex() [][]string {
return [][]string{
[]string{"StoreID"},
}
}
type StoreScoreEx struct {
StoreScore
StoreName string `json:"storeName"`

6
business/partner/purchase/mtwm/order.go
View File

@@ -354,6 +354,10 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
if msg.Cmd == mtwmapi.MsgTypeNewOrder {
order, orderMap, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
if err = err2; err == nil {
// 存在新订单用户未支付推送,导致订单取消,但是订单又会被送出
if order.OrderSeq == 0 && msg.Cmd == mtwmapi.MsgTypeOrderFinancial {
return mtwmapi.Err2CallbackResponse(err, "")
}
err = partner.CurOrderManager.OnOrderNew(order, c.callbackMsg2Status(msg))
if err == nil {
utils.CallFuncAsync(func() {
@@ -369,7 +373,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
order, orderObj, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
if localOrder == nil {
return nil
return mtwmapi.Err2CallbackResponse(err, "")
// 会存在用户没支付订单,但是订单已经创建了,这个时候有可能会取消订单,所以这个地方直接退出不管了
// 等到美团推送新订单的时候再创建订单
/* localOrder = order