liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

退回

Browse Source
This commit is contained in:
苏尹岚
2020-02-25 17:49:25 +08:00
parent 3ffb6798f7
commit 77cb160f64
1 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
business/jxstore/yonghui/yonghui.go
View File

@@ -105,56 +105,55 @@ type WeimobOrderSkusExcelResult struct {
} }
var ( var (
//去掉毛菜. 2020-02-25 17:20
sheetMap = map[string]*SheetParam{ sheetMap = map[string]*SheetParam{
"蔬菜": &SheetParam{ "蔬菜": &SheetParam{
SkuIDCol: 0, SkuIDCol: 0,
SkuPriceCol: 10, SkuPriceCol: 14,
SkuNameCol: 1, SkuNameCol: 1,
// OrgSkuIdCol: 5, OrgSkuIdCol: 5,
// OrgSkuPriceCol: 8, OrgSkuPriceCol: 8,
// OrgSkuNameCol: 6, OrgSkuNameCol: 6,
SkuRow: 2, SkuRow: 2,
}, "水果": &SheetParam{ }, "水果": &SheetParam{
SkuIDCol: 0, SkuIDCol: 0,
SkuPriceCol: 10, SkuPriceCol: 14,
SkuNameCol: 1, SkuNameCol: 1,
// OrgSkuIdCol: 5, OrgSkuIdCol: 5,
// OrgSkuPriceCol: 8, OrgSkuPriceCol: 8,
// OrgSkuNameCol: 6, OrgSkuNameCol: 6,
SkuRow: 2, SkuRow: 2,
}, "肉禽": &SheetParam{ }, "肉禽": &SheetParam{
SkuIDCol: 0, SkuIDCol: 0,
SkuPriceCol: 5, SkuPriceCol: 12,
SkuNameCol: 1, SkuNameCol: 1,
// OrgSkuIdCol: 4, OrgSkuIdCol: 4,
// OrgSkuPriceCol: 7, OrgSkuPriceCol: 7,
// OrgSkuNameCol: 5, OrgSkuNameCol: 5,
SkuRow: 1, SkuRow: 1,
}, "净配": &SheetParam{ }, "净配": &SheetParam{
SkuIDCol: 0, SkuIDCol: 0,
SkuPriceCol: 9, SkuPriceCol: 14,
SkuNameCol: 1, SkuNameCol: 1,
// OrgSkuIdCol: 4, OrgSkuIdCol: 4,
// OrgSkuPriceCol: 7, OrgSkuPriceCol: 7,
// OrgSkuNameCol: 5, OrgSkuNameCol: 5,
SkuRow: 1, SkuRow: 1,
}, "水产": &SheetParam{ }, "水产": &SheetParam{
SkuIDCol: 1, SkuIDCol: 1,
SkuPriceCol: 11, SkuPriceCol: 15,
SkuNameCol: 2, SkuNameCol: 2,
// OrgSkuIdCol: 6, OrgSkuIdCol: 6,
// OrgSkuPriceCol: 9, OrgSkuPriceCol: 9,
// OrgSkuNameCol: 7, OrgSkuNameCol: 7,
SkuRow: 1, SkuRow: 1,
}, "干货": &SheetParam{ }, "干货": &SheetParam{
SkuIDCol: 0, SkuIDCol: 0,
SkuPriceCol: 9, SkuPriceCol: 13,
SkuNameCol: 1, SkuNameCol: 1,
// OrgSkuIdCol: 4, OrgSkuIdCol: 4,
// OrgSkuPriceCol: 7, OrgSkuPriceCol: 7,
// OrgSkuNameCol: 5, OrgSkuNameCol: 5,
SkuRow: 2, SkuRow: 2,
}, "MINI肉禽价格": &SheetParam{ }, "MINI肉禽价格": &SheetParam{
SkuIDCol: 1, SkuIDCol: 1,
SkuPriceCol: 5, SkuPriceCol: 5,
@@ -557,18 +556,18 @@ func GetWeiMobGoodsList(param *weimobapi.QueryGoodsListParam) (goodsList []*weim
func GetCellIntoMap(sheetParam *SheetParam, skuMap map[string]*ExcelParam, row []string, sheetName string, rowNum int) (errMsg string) { func GetCellIntoMap(sheetParam *SheetParam, skuMap map[string]*ExcelParam, row []string, sheetName string, rowNum int) (errMsg string) {
var ( var (
skuID string skuID string
// orgSkuID string orgSkuID string
skuPrice float64 skuPrice float64
// orgSkuPrice float64 orgSkuPrice float64
skuName string skuName string
// orgSkuName string orgSkuName string
skuIDCol = sheetParam.SkuIDCol skuIDCol = sheetParam.SkuIDCol
skuPriceCol = sheetParam.SkuPriceCol skuPriceCol = sheetParam.SkuPriceCol
skuNameCol = sheetParam.SkuNameCol skuNameCol = sheetParam.SkuNameCol
// orgSkuIDCol = sheetParam.OrgSkuIdCol orgSkuIDCol = sheetParam.OrgSkuIdCol
// orgSkuPriceCol = sheetParam.OrgSkuPriceCol orgSkuPriceCol = sheetParam.OrgSkuPriceCol
// orgSkuNameCol = sheetParam.OrgSkuNameCol orgSkuNameCol = sheetParam.OrgSkuNameCol
) )
for k, cell := range row { for k, cell := range row {
if cell != "" { if cell != "" {
@@ -577,30 +576,29 @@ func GetCellIntoMap(sheetParam *SheetParam, skuMap map[string]*ExcelParam, row [
} }
if k == skuPriceCol && skuPriceCol >= 0 { if k == skuPriceCol && skuPriceCol >= 0 {
if rowNum == sheetParam.SkuRow-1 { if rowNum == sheetParam.SkuRow-1 {
if !strings.Contains(cell, "今日供价") { if !strings.Contains(cell, "今日供价") && !strings.Contains(cell, "单价") {
// && !strings.Contains(cell, "单价") {
errMsg += fmt.Sprintf("sheet页：[%v],Excel排版发生变化！第[%v]列今日供价附近可能增加或减少了一列，请确认！", sheetName, k+1) errMsg += fmt.Sprintf("sheet页：[%v],Excel排版发生变化！第[%v]列今日供价附近可能增加或减少了一列，请确认！", sheetName, k+1)
} }
} }
skuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0)) skuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0))
} }
// if k == orgSkuIDCol && orgSkuIDCol >= 0 { if k == orgSkuIDCol && orgSkuIDCol >= 0 {
// orgSkuID = "0" + cell orgSkuID = "0" + cell
// } }
// if k == orgSkuPriceCol && orgSkuPriceCol >= 0 { if k == orgSkuPriceCol && orgSkuPriceCol >= 0 {
// if rowNum == sheetParam.SkuRow-1 { if rowNum == sheetParam.SkuRow-1 {
// if !strings.Contains(cell, "进价") { if !strings.Contains(cell, "进价") {
// errMsg += fmt.Sprintf("sheet页：[%v],Excel排版发生变化！第[%v]列进价附近可能增加或减少了一列，请确认!", sheetName, k+1) errMsg += fmt.Sprintf("sheet页：[%v],Excel排版发生变化！第[%v]列进价附近可能增加或减少了一列，请确认!", sheetName, k+1)
// } }
// } }
// orgSkuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0)) orgSkuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0))
// } }
if k == skuNameCol && skuNameCol >= 0 { if k == skuNameCol && skuNameCol >= 0 {
skuName = cell skuName = cell
} }
// if k == orgSkuNameCol && orgSkuNameCol >= 0 { if k == orgSkuNameCol && orgSkuNameCol >= 0 {
// orgSkuName = cell orgSkuName = cell
// } }
} }
} }
if rowNum >= sheetParam.SkuRow { if rowNum >= sheetParam.SkuRow {
@@ -621,20 +619,20 @@ func GetCellIntoMap(sheetParam *SheetParam, skuMap map[string]*ExcelParam, row [
} else if skuPrice != 0 { } else if skuPrice != 0 {
BuildSkuMap(skuID, skuName, skuPrice, skuMap) BuildSkuMap(skuID, skuName, skuPrice, skuMap)
} }
// if skuMap[orgSkuID] != nil { if skuMap[orgSkuID] != nil {
// if skuMap[orgSkuID].Price != 0 && skuMap[orgSkuID].Price != orgSkuPrice && orgSkuPrice != 0 { if skuMap[orgSkuID].Price != 0 && skuMap[orgSkuID].Price != orgSkuPrice && orgSkuPrice != 0 {
// if orgSkuPrice > skuMap[orgSkuID].Price { if orgSkuPrice > skuMap[orgSkuID].Price {
// BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap) BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap)
// } }
// } else if orgSkuPriceCol >= 0 && orgSkuIDCol >= 0 && orgSkuNameCol >= 0 { } else if orgSkuPriceCol >= 0 && orgSkuIDCol >= 0 && orgSkuNameCol >= 0 {
// BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap) BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap)
// } }
// } else if orgSkuPrice != 0 { } else if orgSkuPrice != 0 {
// BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap) BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap)
// } }
} else { } else {
BuildSkuMap(skuID, skuName, skuPrice, skuMap) BuildSkuMap(skuID, skuName, skuPrice, skuMap)
// BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap) BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap)
} }
delete(skuMap, "") delete(skuMap, "")
} else { } else {