From df434b2c1ec769b26a038b6130a2d2652d7b7103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 3 Sep 2020 15:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E5=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/tempop/tempop.go | 158 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 80 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 4af35a9f7..b249ae6e7 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,26 +4,22 @@ import ( "bytes" "context" "fmt" - "math" "regexp" "strings" "time" - "git.rosy.net.cn/baseapi" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/partner/delivery" "github.com/360EntSecGroup-Skylar/excelize" "github.com/qiniu/api.v7/storage" - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxutils" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" - "git.rosy.net.cn/jx-callback/business/jxutils/excel" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" @@ -1589,81 +1585,83 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // fmt.Println("updateList2", utils.Format4Output(updateList, false)) // fmt.Println("deleteList2", deleteList) // cms.DeletedDuplicateWaitAuditData(ctx, dao.GetDB()) - type tmp struct { - JdID string `json:"jdID"` - S int `json:"s"` - } - type SpecialtyStoreSkus struct { - StoreID int `json:"门店ID"` - StoreName string `json:"门店名"` - City string `json:"城市"` - Area int `json:"面积"` - } - var ( - ss []*tmp - excelTitle = []string{ - "门店ID", - "门店名", - "城市", - "面积", - } - sheetList []*excel.Obj2ExcelSheetConfig - specialtyStoreSkus []*SpecialtyStoreSkus - downloadURL, fileName string - ) - storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "") - for _, v := range storeMaps { - time.Sleep(time.Second / 3) - station, err := jd.GetAPI("320406").GetDeliveryRangeByStationNo2(v.VendorStoreID) - if err != nil { - continue - } - if station.DeliveryRangeType == 2 { - strs := strings.Split(station.DeliveryRange, ";") - ss = append(ss, &tmp{ - JdID: v.VendorStoreID, - S: utils.Float64TwoInt(math.Ceil((jxutils.ComputeSignedArea(strs[:len(strs)-1])))), - }) - } - } - for i := 0; i < len(ss)-1; i++ { - for j := 0; j < len(ss)-1-i; j++ { - if ss[j].S > ss[j+1].S { - temp := ss[j] - ss[j] = ss[j+1] - ss[j+1] = temp - } - } - } - for _, v := range ss { - storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), v.JdID, model.VendorIDJD) - place, _ := dao.GetPlaceByCode(dao.GetDB(), storeDetail.CityCode) - specialtyStoreSku := &SpecialtyStoreSkus{ - StoreID: storeDetail.ID, - StoreName: storeDetail.Name, - City: place.Name, - Area: v.S, - } - specialtyStoreSkus = append(specialtyStoreSkus, specialtyStoreSku) - } - excelConf := &excel.Obj2ExcelSheetConfig{ - Title: "sheet1", - Data: specialtyStoreSkus, - CaptionList: excelTitle, - } - sheetList = append(sheetList, excelConf) - if excelConf != nil { - downloadURL, fileName, err = jxutils.UploadExeclAndPushMsg(sheetList, "面积") - } else { - baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess is nil!") - } - if err != nil { - baseapi.SugarLogger.Errorf("WriteToExcel:upload %s , %s failed error:%v", fileName, err) - } else { - noticeMsg := fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s \n", globals.BackstageHost, downloadURL) - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, ctx.GetUserID(), "异步任务完成", noticeMsg) - baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess downloadURL: [%v]", downloadURL) - } + // type tmp struct { + // JdID string `json:"jdID"` + // S int `json:"s"` + // } + // type SpecialtyStoreSkus struct { + // StoreID int `json:"门店ID"` + // StoreName string `json:"门店名"` + // City string `json:"城市"` + // Area int `json:"面积"` + // } + // var ( + // ss []*tmp + // excelTitle = []string{ + // "门店ID", + // "门店名", + // "城市", + // "面积", + // } + // sheetList []*excel.Obj2ExcelSheetConfig + // specialtyStoreSkus []*SpecialtyStoreSkus + // downloadURL, fileName string + // ) + // storeMaps, _ := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "") + // for _, v := range storeMaps { + // time.Sleep(time.Second / 3) + // station, err := jd.GetAPI("320406").GetDeliveryRangeByStationNo2(v.VendorStoreID) + // if err != nil { + // continue + // } + // if station.DeliveryRangeType == 2 { + // strs := strings.Split(station.DeliveryRange, ";") + // ss = append(ss, &tmp{ + // JdID: v.VendorStoreID, + // S: utils.Float64TwoInt(math.Ceil((jxutils.ComputeSignedArea(strs[:len(strs)-1])))), + // }) + // } + // } + // for i := 0; i < len(ss)-1; i++ { + // for j := 0; j < len(ss)-1-i; j++ { + // if ss[j].S > ss[j+1].S { + // temp := ss[j] + // ss[j] = ss[j+1] + // ss[j+1] = temp + // } + // } + // } + // for _, v := range ss { + // storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), v.JdID, model.VendorIDJD) + // place, _ := dao.GetPlaceByCode(dao.GetDB(), storeDetail.CityCode) + // specialtyStoreSku := &SpecialtyStoreSkus{ + // StoreID: storeDetail.ID, + // StoreName: storeDetail.Name, + // City: place.Name, + // Area: v.S, + // } + // specialtyStoreSkus = append(specialtyStoreSkus, specialtyStoreSku) + // } + // excelConf := &excel.Obj2ExcelSheetConfig{ + // Title: "sheet1", + // Data: specialtyStoreSkus, + // CaptionList: excelTitle, + // } + // sheetList = append(sheetList, excelConf) + // if excelConf != nil { + // downloadURL, fileName, err = jxutils.UploadExeclAndPushMsg(sheetList, "面积") + // } else { + // baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess is nil!") + // } + // if err != nil { + // baseapi.SugarLogger.Errorf("WriteToExcel:upload %s , %s failed error:%v", fileName, err) + // } else { + // noticeMsg := fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s \n", globals.BackstageHost, downloadURL) + // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, ctx.GetUserID(), "异步任务完成", noticeMsg) + // baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess downloadURL: [%v]", downloadURL) + // } + orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -3).Format("20060102"), time.Now().Format("20060102")) + return err }