订单导出字段修改
This commit is contained in:
@@ -362,8 +362,6 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
|
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
order.SkuInfo2 = ""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
orders = orders2
|
orders = orders2
|
||||||
@@ -404,8 +402,8 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
"waybillFinishedAt",
|
"waybillFinishedAt",
|
||||||
"status2",
|
"status2",
|
||||||
"skuInfo",
|
"skuInfo",
|
||||||
"skuInfo2",
|
|
||||||
"waybillTipMoney",
|
"waybillTipMoney",
|
||||||
|
"skuInfo2",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
excelBin = excel.Obj2Excel([]*excel.Obj2ExcelSheetConfig{excelConf})
|
excelBin = excel.Obj2Excel([]*excel.Obj2ExcelSheetConfig{excelConf})
|
||||||
|
|||||||
@@ -4068,10 +4068,19 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store *dao.StoreDetail, v *partner.SkuNameInfo, nameID int) (err error) {
|
func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store *dao.StoreDetail, v *partner.SkuNameInfo, nameID int) (err error) {
|
||||||
var pricePercentagePack []*model.PricePercentageItem
|
var (
|
||||||
|
pricePercentagePack []*model.PricePercentageItem
|
||||||
|
pricePercentagePack2 []*model.PricePercentageItem
|
||||||
|
jxPrice = 0
|
||||||
|
)
|
||||||
skus, _ := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
|
skus, _ := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
|
||||||
err = jxutils.Strings2Objs(store.PricePercentagePackStr, &pricePercentagePack)
|
err = jxutils.Strings2Objs(store.PricePercentagePackStr, &pricePercentagePack)
|
||||||
price := jxutils.CaculateJxPriceByPricePack(pricePercentagePack, 0, int(v.SkuList[0].VendorPrice))
|
price := jxutils.CaculateJxPriceByPricePack(pricePercentagePack, 0, int(v.SkuList[0].VendorPrice))
|
||||||
|
store2, _ := dao.GetStoreDetail(db, store.ID, model.VendorIDJX)
|
||||||
|
if store2 != nil {
|
||||||
|
err = jxutils.Strings2Objs(store2.PricePercentagePackStr, &pricePercentagePack2)
|
||||||
|
jxPrice = jxutils.CaculatePriceByPricePack(pricePercentagePack2, 0, price)
|
||||||
|
}
|
||||||
skuBind := &model.StoreSkuBind{
|
skuBind := &model.StoreSkuBind{
|
||||||
StoreID: store.ID,
|
StoreID: store.ID,
|
||||||
UnitPrice: price,
|
UnitPrice: price,
|
||||||
@@ -4079,6 +4088,7 @@ func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store
|
|||||||
Status: model.StoreSkuBindStatusNormal,
|
Status: model.StoreSkuBindStatusNormal,
|
||||||
YbID: utils.Str2Int64(v.SkuList[0].VendorSkuID),
|
YbID: utils.Str2Int64(v.SkuList[0].VendorSkuID),
|
||||||
YbPrice: int(v.SkuList[0].VendorPrice),
|
YbPrice: int(v.SkuList[0].VendorPrice),
|
||||||
|
JxPrice: jxPrice,
|
||||||
YbSyncStatus: 0,
|
YbSyncStatus: 0,
|
||||||
}
|
}
|
||||||
if len(skus) > 0 {
|
if len(skus) > 0 {
|
||||||
|
|||||||
Reference in New Issue
Block a user