This commit is contained in:
邹宗楠
2025-02-10 15:31:50 +08:00
parent c93bfeb272
commit 3cb5d2c16c

View File

@@ -484,8 +484,8 @@ 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 {
var afsSkuMapObj = make(map[string]bool, 0)
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 {
minus := afsInfo[v.SkuID].Count minus := afsInfo[v.SkuID].Count
@@ -511,7 +511,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
if count == 1 { if count == 1 {
v.SkuCount2 -= minus v.SkuCount2 -= minus
} else { } else {
if have, _ := afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)]; !have { if have, _ := afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)]; !have {
afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)] = true afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)] = true
v.SkuCount2 -= minus v.SkuCount2 -= minus
} }