Accept Merge Request #29: (don -> mark)

Merge Request: 修改一些BUG,代码重构
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/29
This commit is contained in:
XJH-Rosy
2019-08-09 13:42:15 +08:00
2 changed files with 24 additions and 4 deletions

View File

@@ -22,10 +22,13 @@ const (
canWriteTolocal = false
parallelCount = 5
fileExt = ".xlsx"
diffFileName = "export/京西和平台商品差异"
)
var (
diffFileName = map[bool]string {
true : "export/JXCSAndVendorSkuDiff",
false : "export/JXGYAndVendorSkuDiff",
}
vendorNameList = map[int]string{
model.VendorIDMTWM: model.VendorChineseNames[model.VendorIDMTWM],
model.VendorIDEBAI: model.VendorChineseNames[model.VendorIDEBAI],
@@ -42,7 +45,7 @@ var (
"平台可售状态",
}
diffData DiffDataLock
diffData DiffDataLock
multiStoreAllSkuInfoMap map[int]map[int]*partner.SkuNameInfo
multiStoreAllSkuInfoList map[int][]*partner.StoreSkuInfo
@@ -291,6 +294,10 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
tasksch.HandleTask(taskSeq, nil, true).Run()
}
func IsJXCS() bool {
return globals.IsMainProductEnv()
}
func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) {
var sheetList []*excel.Obj2ExcelSheetConfig
for key, value := range data {
@@ -306,7 +313,7 @@ func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) {
if len(sheetList) > 0 {
excelBin := excel.Obj2Excel(sheetList)
timeStr := utils.Int64ToStr(time.Now().Unix())
diffFullFileName := diffFileName + timeStr + fileExt
diffFullFileName := diffFileName[IsJXCS()] + timeStr + fileExt
if canWriteTolocal {
jxutils.WriteFile(diffFullFileName, excelBin)
}
@@ -315,7 +322,7 @@ func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) {
if err != nil {
baseapi.SugarLogger.Errorf("WriteToExcel:upload %s failed error:%v", diffFullFileName, err)
} else {
noticeMsg := fmt.Sprintf("[详情点我](%s/billshow/?normal=true&path=%s) \n", globals.BackstageHost, downloadURL)
noticeMsg := fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s \n", globals.BackstageHost, downloadURL)
task.SetNoticeMsg(noticeMsg)
baseapi.SugarLogger.Debugf("WriteToExcel:upload %s success, downloadURL:%s", diffFullFileName, downloadURL)
}