1
This commit is contained in:
@@ -488,14 +488,6 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
var afsSkuMapObj = make(map[string]bool, 0)
|
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 orders[0].VendorOrderID == "301782063256040331" {
|
|
||||||
globals.SugarLogger.Debugf("----SkuShopPrice:- %d", v.SkuShopPrice)
|
|
||||||
globals.SugarLogger.Debugf("----SkuEarningPrice:- %d", v.SkuEarningPrice)
|
|
||||||
globals.SugarLogger.Debugf("----SkuSalePrice:- %d", v.SkuSalePrice)
|
|
||||||
globals.SugarLogger.Debugf("----SkuCount2:- %d", v.SkuCount2)
|
|
||||||
globals.SugarLogger.Debugf("----SkuID:- %d", v.SkuID)
|
|
||||||
globals.SugarLogger.Debugf("----afsSkuMap:- %s", utils.Format4Output(afsInfo, false))
|
|
||||||
}
|
|
||||||
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
|
||||||
if minus > v.SkuCount2 {
|
if minus > v.SkuCount2 {
|
||||||
@@ -504,9 +496,9 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
|
|
||||||
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*v.Count - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice*v.Count)*float64(v.SkuShopPrice))
|
v.SkuShopPrice = v.SkuShopPrice*v.SkuCount2 - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice*v.SkuCount2)*float64(v.SkuShopPrice))
|
||||||
v.SkuEarningPrice = v.SkuEarningPrice*v.Count - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice*v.Count)*float64(v.SkuEarningPrice))
|
v.SkuEarningPrice = v.SkuEarningPrice*v.SkuCount2 - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice*v.SkuCount2)*float64(v.SkuEarningPrice))
|
||||||
v.SkuSalePrice = v.SkuSalePrice*v.Count - int(afsInfo[v.SkuID].UserMoney)
|
v.SkuSalePrice = v.SkuSalePrice*v.SkuCount2 - int(afsInfo[v.SkuID].UserMoney)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 同一个商品有多个商品列表,且有不定退货
|
// 同一个商品有多个商品列表,且有不定退货
|
||||||
|
|||||||
Reference in New Issue
Block a user