1
This commit is contained in:
@@ -493,7 +493,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
minus = v.SkuCount2
|
minus = v.SkuCount2
|
||||||
}
|
}
|
||||||
|
|
||||||
if minus == 0 { // 退差价的,count还在
|
if minus == 0 { // 退差价的,count还在 退重
|
||||||
if afsInfo[v.SkuID].Count == model.NO && v.EarningType == model.EarningTypeQuote {
|
if afsInfo[v.SkuID].Count == model.NO && v.EarningType == model.EarningTypeQuote {
|
||||||
v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice))
|
v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice))
|
||||||
v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice))
|
v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice))
|
||||||
@@ -508,9 +508,10 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
count += 1
|
count += 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if count == 1 {
|
if count == 1 { // 同一商品一个sku退一部分
|
||||||
v.SkuCount2 -= minus
|
v.SkuCount2 -= minus
|
||||||
} else {
|
} else {
|
||||||
|
// 同一商品多个sku退一部分 ->对应一个afsOrder,分辨不出来是退的哪一个了
|
||||||
if have, _ := afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)]; !have {
|
if have, _ := afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)]; !have {
|
||||||
afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)] = true
|
afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)] = true
|
||||||
v.SkuCount2 -= minus
|
v.SkuCount2 -= minus
|
||||||
|
|||||||
@@ -1740,9 +1740,8 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku
|
|||||||
}
|
}
|
||||||
isAsync = asyncStoreSkuOpFilter(ctx, isAsync)
|
isAsync = asyncStoreSkuOpFilter(ctx, isAsync)
|
||||||
num = int64(len(skuIDs))
|
num = int64(len(skuIDs))
|
||||||
globals.SugarLogger.Debugf("--------num:=%d, %s", num, utils.Format4Output(skuIDs, false))
|
|
||||||
if num > 0 {
|
if num > 0 {
|
||||||
hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
|
//hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
|
||||||
}
|
}
|
||||||
if num == 0 || !isAsync || hint == "" {
|
if num == 0 || !isAsync || hint == "" {
|
||||||
hint = utils.Int64ToStr(num)
|
hint = utils.Int64ToStr(num)
|
||||||
|
|||||||
Reference in New Issue
Block a user