1
This commit is contained in:
@@ -452,10 +452,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
var order *model.GoodsOrderExt
|
var order *model.GoodsOrderExt
|
||||||
var orders2 []*model.GoodsOrderExt
|
var orders2 []*model.GoodsOrderExt
|
||||||
for _, v := range orders {
|
for _, v := range orders {
|
||||||
if v.VendorOrderID == "601112850243823799" {
|
globals.SugarLogger.Debugf(" v := %s", utils.Format4Output(v.ShortSkuInfo, false))
|
||||||
globals.SugarLogger.Debugf("==========vendorOrder %s", utils.Format4Output(v, false))
|
|
||||||
globals.SugarLogger.Debugf("==========afsInfo %s", utils.Format4Output(afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)], false))
|
|
||||||
}
|
|
||||||
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
|
||||||
@@ -464,16 +461,20 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
}
|
}
|
||||||
v.SkuCount2 -= minus
|
v.SkuCount2 -= minus
|
||||||
if minus == 0 { // 有售后单,且通过,部分商品缺重等情况
|
if minus == 0 { // 有售后单,且通过,部分商品缺重等情况
|
||||||
|
globals.SugarLogger.Debugf(" v := %s", utils.Format4Output(minus, false))
|
||||||
|
globals.SugarLogger.Debugf(" v := %s", utils.Format4Output(v.SkuID, false))
|
||||||
if v.EarningType == model.EarningTypeQuote {
|
if 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.SkuSalePrice = v.SkuSalePrice - int(afsInfo[v.SkuID].UserMoney)
|
v.SkuSalePrice = v.SkuSalePrice - int(afsInfo[v.SkuID].UserMoney)
|
||||||
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))
|
||||||
|
globals.SugarLogger.Debugf(" vSkuShopPrice := %s", utils.Format4Output(v.SkuShopPrice, false))
|
||||||
|
globals.SugarLogger.Debugf(" vSkuSalePrice := %s", utils.Format4Output(v.SkuSalePrice, false))
|
||||||
|
globals.SugarLogger.Debugf(" vSkuEarningPrice := %s", utils.Format4Output(v.SkuEarningPrice, false))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
afsInfo[v.SkuID].Count -= minus
|
afsInfo[v.SkuID].Count -= minus
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("==========SkuCount2 %d", v.SkuCount2)
|
|
||||||
if v.SkuCount2 > 0 {
|
if v.SkuCount2 > 0 {
|
||||||
var skuStr string
|
var skuStr string
|
||||||
if beego.BConfig.RunMode == "jxgy" {
|
if beego.BConfig.RunMode == "jxgy" {
|
||||||
|
|||||||
Reference in New Issue
Block a user