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