导出订单增加字段

This commit is contained in:
苏尹岚
2020-04-29 15:17:47 +08:00
parent 34683bb26e
commit 21ddced471
2 changed files with 34 additions and 0 deletions

View File

@@ -330,6 +330,39 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
order.SkuInfo += ";" + skuStr
}
}
if v.SkuCount2 > 1 {
skuStr := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(v.SkuEarningPrice),
}, ",")
price := 0
if v.SkuShopPrice < v.SkuSalePrice {
price = v.SkuShopPrice
} else {
price = v.SkuSalePrice
}
skuStr2 := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2 - 1),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(price),
}, ",")
if order == nil || v.ID != order.ID {
order = v
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo2 = skuStr + ";" + skuStr2
orders2 = append(orders2, v)
} else {
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
}
} else {
order.SkuInfo2 = ""
}
}
orders = orders2
case 3:

View File

@@ -40,6 +40,7 @@ type GoodsOrderExt struct {
PayPercentage int `json:"payPercentage"`
SkuInfo string `json:"skuInfo,omitempty"`
SkuInfo2 string `json:"skuInfo2,omitempty"`
ShortSkuInfo `json:"-"`
SkuList []*ShortSkuInfo `json:"skuList,omitempty"`
Count int `json:"count"`