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:
邹宗楠
2025-02-10 15:25:38 +08:00
parent c58a357ed3
commit c93bfeb272
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -484,6 +484,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
case 2: case 2:
var order *model.GoodsOrderExt var order *model.GoodsOrderExt
var orders2 []*model.GoodsOrderExt var orders2 []*model.GoodsOrderExt
var afsSkuMapObj = make(map[string]bool, 0)
for _, v := range orders { for _, v := range orders {
if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil { if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil {
if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count >= 0 { if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count >= 0 {
@@ -501,18 +502,23 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
} else { } else {
// 同一个商品有多个商品列表,且有不定退货 // 同一个商品有多个商品列表,且有不定退货
ordersByOrder, _, _ := dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, false, nil, false, "", map[string]interface{}{"orderID": v.VendorOrderID}, 0, model.UnlimitedPageSize) ordersByOrder, _, _ := dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, false, nil, false, "", map[string]interface{}{"orderID": v.VendorOrderID}, 0, model.UnlimitedPageSize)
if len(ordersByOrder) == 1 { count := 0
for _, obo1 := range ordersByOrder {
if obo1.SkuID == v.SkuID {
count += 1
}
}
if count == 1 {
v.SkuCount2 -= minus v.SkuCount2 -= minus
} else { } else {
for _, obo := range ordersByOrder { if have, _ := afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)]; !have {
if obo.SkuCount2 == v.SkuCount2 && obo.SkuCount2 == minus { afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)] = true
v.SkuCount2 -= minus v.SkuCount2 -= minus
} }
} }
} }
} }
} }
}
if v.SkuCount2 > 0 { if v.SkuCount2 > 0 {
var skuStr string var skuStr string
if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet { if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {

2
controllers/ebai_callback.go
View File

@@ -5,6 +5,7 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
@@ -25,6 +26,7 @@ var EBaiVendorStoreIDList = new(sync.Map)
func (c *EbaiController) Msg() { func (c *EbaiController) Msg() {
if c.Ctx.Input.Method() == http.MethodPost { if c.Ctx.Input.Method() == http.MethodPost {
obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request) obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request)
globals.SugarLogger.Debugf("-------obj := %s", utils.Format4Output(utils.Struct2Map(obj, "", false), false))
if callbackResponse == nil { if callbackResponse == nil {
vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"]) vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"])
if _, have := EBaiVendorStoreIDList.Load(vendorStoreId); vendorStoreId != 0 && !have { if _, have := EBaiVendorStoreIDList.Load(vendorStoreId); vendorStoreId != 0 && !have {