1
This commit is contained in:
@@ -452,6 +452,8 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
||||
var order *model.GoodsOrderExt
|
||||
var orders2 []*model.GoodsOrderExt
|
||||
for _, v := range orders {
|
||||
globals.SugarLogger.Debugf("========orders := %s", utils.Format4Output(orders, false))
|
||||
globals.SugarLogger.Debugf("========afsSkuMap := %s", utils.Format4Output(afsSkuMap, false))
|
||||
if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil {
|
||||
if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count > 0 {
|
||||
minus := afsInfo[v.SkuID].Count
|
||||
@@ -473,7 +475,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
||||
utils.Int2Str(v.SkuEarningPrice),
|
||||
}, ",")
|
||||
} else {
|
||||
if v.EarningType == model.EarningTypeQuote {
|
||||
if v.EarningType == model.EarningTypeQuote { // 报价
|
||||
earningPrice := 0
|
||||
if v.SkuEarningPrice != 0 {
|
||||
earningPrice = v.SkuEarningPrice
|
||||
@@ -487,7 +489,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
||||
utils.Int2Str(v.SkuSalePrice),
|
||||
utils.Int2Str(earningPrice),
|
||||
}, ",")
|
||||
} else {
|
||||
} else { // 扣点
|
||||
skuStr = strings.Join([]string{
|
||||
utils.Int2Str(v.SkuID),
|
||||
utils.Int2Str(v.SkuCount2),
|
||||
|
||||
Reference in New Issue
Block a user