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:
邹宗楠
2023-07-14 17:46:44 +08:00
parent 2909a9ae8d
commit 35ca3a47cc
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/jx_order.go
View File

@@ -571,7 +571,7 @@ func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*mod
skuCount += sku.Count
skuID := jxutils.GetSkuIDFromOrderSku(sku)
if sku.SkuID > 0 {
index := jxutils.Combine2Int(skuID, sku.StoreSubID)
index := jxutils.Combine2Int(skuID, int(sku.StoreSubID))
if skuMap[index] == nil {
tmpSku := *sku
skuMap[index] = &tmpSku
@@ -901,7 +901,7 @@ func fillSkuList(skuList, orderSkuList []*model.OrderSku) (isSame bool, err erro
skuCount2 += sku.Count
skuID := jxutils.GetSkuIDFromOrderSku(sku)
actID := sku.StoreSubID
sku2 := getSkuFromMap(orderSkuMap, skuID, actID)
sku2 := getSkuFromMap(orderSkuMap, skuID, int(actID))
if sku2 == nil {
err = fmt.Errorf("找不到SKU:%d", skuID)
} else if sku.Count > sku2.Count {