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

mergemark

Browse Source
This commit is contained in:
苏尹岚
2019-11-26 10:26:14 +08:00
parent 679c4db0f2 684c1091f8
commit 483d3c8dbc
25 changed files with 1208 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/act/act.go
View File

@@ -150,7 +150,6 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
jxPrice := storeSkuInfo.Price
actSkuMap.VendorPrice = int64(getVendorPriceFromStoreSkuBind(storeSkuInfo, vendorID))
v.OriginalPrice = int64(jxPrice)
v.OriginalPrice = actSkuMap.VendorPrice // 暂时返回平台价
}
var err2 error
if act.Type != model.ActSkuFake { // 非结算，要计算实际活动价格
@@ -629,10 +628,6 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act
if len(actMap) == 0 {
return 0, fmt.Errorf("找不到活动:%d，或已被取消", actID)
}
if actMap[0].Status != model.ActStatusCreated {
// 如果不是正常状态直接跳过
return 0, nil
}
actStoreSkuMap, err := dao.GetActStoreSkuVendorInfo(db, actID, nil, nil, nil)
if err != nil {

6
business/jxstore/cms/store.go
View File

@@ -754,8 +754,10 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
if (outStore.OpenTime2 == 0 && outStore.CloseTime2 != 0) || (outStore.OpenTime2 != 0 && outStore.CloseTime2 == 0) {
return 0, errors.New(fmt.Sprintf("门店营业时间2设置不合法！时间范围2 ：[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1))
}
if outStore.OpenTime2 > outStore.OpenTime1 {
return 0, errors.New(fmt.Sprintf("门店营业时间设置不合法!第二段营业时间应该在第一段营业时间之后！"))
if outStore.OpenTime1 != 0 && outStore.CloseTime1 != 0 && outStore.OpenTime2 != 0 && outStore.CloseTime2 != 0 {
if outStore.OpenTime2 < outStore.CloseTime1 {
return 0, errors.New(fmt.Sprintf("门店营业时间设置不合法!第二段营业时间应该在第一段营业时间之后！"))
}
}
if beginAt, endAt := GetTimeMixByInt(outStore.OpenTime1, outStore.CloseTime1, outStore.OpenTime2, outStore.CloseTime2); beginAt != 0 && endAt != 0 {
return 0, errors.New(fmt.Sprintf("两段门店营业时间不可交叉！时间范围1 ：[%v] 至 [%v], 时间范围2 ：[%v] 至 [%v]", outStore.OpenTime1, outStore.CloseTime1, outStore.OpenTime2, outStore.CloseTime2))

6
business/jxstore/cms/store_sku.go
View File

@@ -79,6 +79,9 @@ type StoreSkuExt struct {
RealEarningPrice int `json:"realEarningPrice"`
StatusSaleBegin int16 `json:"statusSaleBegin"` //商品可售时间范围
StatusSaleEnd int16 `json:"statusSaleEnd"`
Count int `json:"count"`
Times int `json:"times"`
}
@@ -451,7 +454,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
t4.sub_store_id, t4.price bind_price, IF(t4.unit_price IS NOT NULL, t4.unit_price, t1.price) unit_price, t4.status store_sku_status, t4.auto_sale_at,
t4.ebai_id, t4.mtwm_id,
t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status,
t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price
t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price,
t4.status_sale_begin, t4.status_sale_end
` + sql
var tmpList []*tGetStoresSkusInfo
beginTime := time.Now()

17
business/jxstore/cms/sync_store_sku.go
View File

@@ -441,7 +441,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
}
return skuList
}
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
isContinueWhenError2 := true
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int)
// globals.SugarLogger.Debugf("step:%d", step)
@@ -462,7 +463,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
updateStoreSku(dao.GetDB(), vendorID, bareSku2Sync(successList), model.SyncFlagDeletedMask)
}
return nil, len(successList), err
}, ctx, task, deleteList, 1 /*singleStoreHandler.GetStoreSkusBatchSize(partner.FuncDeleteStoreSkus)*/, isContinueWhenError)
}, ctx, task, deleteList, 1 /*singleStoreHandler.GetStoreSkusBatchSize(partner.FuncDeleteStoreSkus)*/, isContinueWhenError2)
}
case 1:
if len(createList) > 0 {
@@ -494,7 +495,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
updateStoreSku(dao.GetDB(), vendorID, successList, model.SyncFlagNewMask)
}
return nil, len(successList), err
}, ctx, task, createList, 1 /*singleStoreHandler.GetStoreSkusBatchSize(partner.FuncCreateStoreSkus)*/, isContinueWhenError)
}, ctx, task, createList, 1 /*singleStoreHandler.GetStoreSkusBatchSize(partner.FuncCreateStoreSkus)*/, isContinueWhenError2)
}
case 2:
if len(updateList) > 0 {
@@ -507,7 +508,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
updateStoreSku(dao.GetDB(), vendorID, successList, model.SyncFlagModifiedMask)
}
return nil, len(successList), err
}, ctx, task, updateList, singleStoreHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkus), isContinueWhenError)
}, ctx, task, updateList, singleStoreHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkus), isContinueWhenError2)
}
case 3:
for k, list := range [][]*partner.StoreSkuInfo{stockList /*, onlineList*/} {
@@ -526,7 +527,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
updateStoreSku(dao.GetDB(), vendorID, bareSku2Sync(successList), model.SyncFlagStockMask)
}
return nil, len(successList), err
}, ctx, task, list, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusStock), isContinueWhenError)
}, ctx, task, list, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusStock), isContinueWhenError2)
}
}
case 4, 5:
@@ -550,7 +551,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
updateStoreSku(dao.GetDB(), vendorID, bareSku2Sync(successList), model.SyncFlagSaleMask)
}
return nil, len(successList), err
}, ctx, task, statusList, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusStatus), isContinueWhenError)
}, ctx, task, statusList, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusStatus), isContinueWhenError2)
}
case 6:
if len(priceList) > 0 {
@@ -565,7 +566,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
updateStoreSku(dao.GetDB(), vendorID, bareSku2Sync(successList), model.SyncFlagPriceMask)
}
return nil, len(successList), err
}, ctx, task, priceList, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusPrice), isContinueWhenError)
}, ctx, task, priceList, storeSkuHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkusPrice), isContinueWhenError2)
}
case 7:
if len(reorderSkuMap) > 0 {
@@ -573,7 +574,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
for vendorCatID := range reorderSkuMap {
vendorCatIDs = append(vendorCatIDs, vendorCatID)
}
reorderTask := tasksch.NewParallelTask("门店商品排序", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
reorderTask := tasksch.NewParallelTask("门店商品排序", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError2), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
vendorCatID := batchItemList[0].(string)
skuList := reorderSkuMap[vendorCatID]

9
business/jxstore/misc/misc.go
View File

@@ -146,11 +146,14 @@ func doDailyWork() {
cms.SyncStoresCourierInfo(jxcontext.AdminCtx, nil, false, true)
netprinter.RebindAllPrinters(jxcontext.AdminCtx, false, true)
// cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, false, true, true)
cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, false, nil, []int{27379}, model.SyncFlagSaleMask|model.SyncFlagPriceMask, true, true)
syncFlag := model.SyncFlagPriceMask
if (time.Now().Unix()/24*3600)%10 == 0 {
syncFlag |= model.SyncFlagSaleMask
}
cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, false, nil, []int{27379}, syncFlag, true, true)
SaveImportantTaskID(TaskNameSyncStoreSku, SpecialTaskID)
taskID, _ := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDEBAI, model.VendorIDMTWM}, nil, false, nil, nil, model.SyncFlagSaleMask|model.SyncFlagPriceMask, true, true)
taskID, _ := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDEBAI, model.VendorIDMTWM}, nil, false, nil, nil, syncFlag, true, true)
SaveImportantTaskID(TaskNameSyncStoreSku, taskID)
InitEx()

57
business/jxstore/tempop/tempop.go
View File

@@ -8,11 +8,13 @@ import (
"image/png"
"net/http"
"regexp"
"strings"
"sync"
"time"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/partner/delivery"
"github.com/360EntSecGroup-Skylar/excelize"
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
@@ -1302,3 +1304,58 @@ func FixMtwmCategory(ctx *jxcontext.Context, mtwmStoreIDs []int, isAsync, isCont
}
return hint, err
}
func JdStoreInfo1125() (hint string, err error) {
fileName := "/Users/xujianhua/Downloads/老格恢复拓店进度.xlsx"
db := dao.GetDB()
storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err == nil {
var validStoreList []*dao.StoreDetail
for _, v := range storeList {
if v.Status != model.StoreStatusDisabled && v.CreatedAt.Sub(utils.Str2Time("2019-10-01")) > 0 {
storeInfo, err := api.JdAPI.GetStoreInfoByStationNo2(v.VendorStoreID)
if err == nil && storeInfo.CreateTime.GoTime().Sub(utils.Str2Time("2019-10-25")) > 0 {
if storeDetail, err := dao.GetStoreDetail(db, v.StoreID, v.VendorID); err == nil {
validStoreList = append(validStoreList, storeDetail)
}
}
}
}
getStoreList := func(lng, lat, lng2, lat2 int) (vendorStoreIDs []string) {
for _, v := range validStoreList {
if v.Lng >= lng && v.Lng <= lng2 && v.Lat >= lat && v.Lat <= lat2 {
vendorStoreIDs = append(vendorStoreIDs, v.VendorStoreID)
}
}
return vendorStoreIDs
}
sheetName := "老格明细"
file, err2 := excelize.OpenFile(fileName)
if err = err2; err == nil {
// globals.SugarLogger.Debug(err, file)
rows, err2 := file.GetRows(sheetName)
if err = err2; err == nil {
str2Coords := func(str string) (lng, lat int) {
list := strings.Split(str, ",")
if len(list) >= 2 {
lng, lat = jxutils.StandardCoordinate2Int(utils.Str2Float64WithDefault(list[1], 0)), jxutils.StandardCoordinate2Int(utils.Str2Float64WithDefault(list[0], 0))
}
return lng, lat
}
for i := 1; i < len(rows); i++ {
lng, lat := str2Coords(rows[i][8])
lng2, lat2 := str2Coords(rows[i][7])
vendorStoreIDs := getStoreList(lng, lat, lng2, lat2)
// fmt.Printf("%d,%v", i, vendorStoreIDs)
countInfo := fmt.Sprintf("京西已拓%d", len(vendorStoreIDs))
axis, _ := excelize.CoordinatesToCellName(5, i+1)
file.SetCellStr(sheetName, axis, countInfo)
axis2, _ := excelize.CoordinatesToCellName(6, i+1)
file.SetCellStr(sheetName, axis2, strings.Join(vendorStoreIDs, ","))
}
file.SaveAs("ffff.xlsx")
}
}
}
return hint, err
}

26
business/jxstore/tempop/tempop_test.go Normal file
View File

@@ -0,0 +1,26 @@
package tempop
import (
"testing"
"git.rosy.net.cn/jx-callback/globals/api2"
"git.rosy.net.cn/jx-callback/globals/testinit"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/elm"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/weimob/wsc"
)
func init() {
testinit.Init()
api2.Init()
}
func TestJdStoreInfo1125(t *testing.T) {
_, err := JdStoreInfo1125()
if err != nil {
t.Fatal(err)
}
}

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

@@ -6,16 +6,25 @@ import (
"io"
"math"
"mime/multipart"
"strings"
"sync"
"time"
"unicode"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"github.com/360EntSecGroup-Skylar/excelize"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/weimobapi"
"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"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
@@ -26,64 +35,156 @@ import (
type SheetParam struct {
SkuIDCol int
SkuPriceCol int
SkuNameCol int
OrgSkuIdCol int
OrgSkuPriceCol int
OrgSkuNameCol int
SkuRow int
}
type DataSuccessLock struct {
dataSuccessList []DataSuccess
locker sync.RWMutex
}
type DataFailedLock struct {
dataFailedList []DataFailed
locker sync.RWMutex
}
type DataSuccess struct {
NameID string `json:"商品nameID"`
Name string `json:"商品名称"`
Unit string `json:"单位"`
OrgPrice float64 `json:"原价"`
NowPrice float64 `json:"现价"`
MixPrice float64 `json:"涨跌"`
}
type DataFailed struct {
GoodsID string `json:"商品ID"`
GoodsName string `json:"商品名称"`
Comment string `json:"备注"`
}
type Data struct {
GoodsID string `json:"商品编码"`
GoodsName string `json:"商品名称"`
GoodsNum int `json:"订货数量"`
}
type ExcelParam struct {
SpuCode string
Name string
Price float64
}
type OrderList struct {
Name string `json:"name"`
Phone string `json:"phone"`
OrderNo int64 `json:"orderNo"`
}
var (
sheetMap = map[string]*SheetParam{
"蔬菜": &SheetParam{
SkuIDCol: 0,
SkuPriceCol: 14,
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,
}, "肉禽": &SheetParam{
SkuIDCol: 0,
SkuPriceCol: 12,
SkuNameCol: 1,
OrgSkuIdCol: 4,
OrgSkuPriceCol: 7,
OrgSkuNameCol: 5,
SkuRow: 1,
}, "净配": &SheetParam{
SkuIDCol: 0,
SkuPriceCol: 12,
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,
}, "干货": &SheetParam{
SkuIDCol: 0,
SkuPriceCol: 13,
SkuNameCol: 1,
OrgSkuIdCol: 4,
OrgSkuPriceCol: 7,
OrgSkuNameCol: 5,
SkuRow: 2,
}, "MINI肉禽价格": &SheetParam{
SkuIDCol: 1,
SkuPriceCol: 5,
SkuNameCol: 2,
OrgSkuIdCol: -1,
OrgSkuPriceCol: -1,
OrgSkuNameCol: -1,
SkuRow: 1,
},
}
titleListSuccess = []string{
"商品nameID",
"商品名称",
"单位",
"原价",
"现价",
"涨跌",
}
titleListFailed = []string{
"商品ID",
"商品名称",
"备注",
}
titleList = []string{
"商品编码",
"商品名称",
"订货数量",
}
dataSuccess DataSuccessLock
dataFailed DataFailedLock
)
const (
parallelCount = 5
UpdateGoodsShelfStatusCount = 50 //微盟下架商品api限制一次50个
fileExt = ".xlsx"
)
func (d *DataSuccessLock) AppendData(dataSuccess DataSuccess) {
d.locker.Lock()
defer d.locker.Unlock()
d.dataSuccessList = append(d.dataSuccessList, dataSuccess)
}
func (d *DataFailedLock) AppendData2(dataFailed DataFailed) {
d.locker.Lock()
defer d.locker.Unlock()
d.dataFailedList = append(d.dataFailedList, dataFailed)
}
func LoadExcelByYongHui(ctx *jxcontext.Context, files []*multipart.FileHeader, isAsync, isContinueWhenError bool) (hint string, err error) {
if len(files) == 0 {
return "", errors.New("没有文件上传！")
@@ -99,11 +200,12 @@ func LoadExcelByYongHui(ctx *jxcontext.Context, files []*multipart.FileHeader, i
func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, isContinueWhenError bool) (hint string, err error) {
var (
skuMap = make(map[string]float64)
skuMap = make(map[string]*ExcelParam)
errMsg string
costPrice float64 //成本价
goodsList []*weimobapi.GoodsInfo
goodsIDListForPutAway []interface{}
isCompare bool
)
db := dao.GetDB()
taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
@@ -121,7 +223,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
if rowNum < sheetParam.SkuRow {
continue
}
GetCellIntoMap(sheetParam.SkuIDCol, sheetParam.SkuPriceCol, sheetParam.OrgSkuIdCol, sheetParam.OrgSkuPriceCol, skuMap, row, k, rowNum)
GetCellIntoMap(sheetParam, skuMap, row, k, rowNum)
if len(skuMap) < 1 {
errMsg += fmt.Sprintf("读取Excel数据失败，Excel格式排版可能发生了变化！sheetName: [%v]\n", k)
}
@@ -133,10 +235,14 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
//修改分组名
// 分类名格式为：可定XX日
// XX为上传永辉 提供的 价格表时间 +2天
isCompare, err = UpdateClassifyAndGetLastClassify()
case 1:
//获取微盟所有商品
goodsList, err = GetWeiMobGoodsList()
param := &weimobapi.QueryGoodsListParam{
PageNum: 1,
PageSize: jdapi.MaxSkuIDsCount4QueryListBySkuIds,
}
goodsList, err = GetWeiMobGoodsList(param)
if err != nil {
baseapi.SugarLogger.Errorf("GetWeiMobGoodsList error:%v", err)
}
@@ -157,12 +263,15 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
for k, _ := range skuMap {
//表示excel上有，微盟上没有
if goodsInfoAndDetailMap[k] == nil {
errMsg += fmt.Sprintf("在微盟上未找到该商品！excel商品ID : [%v]\n", k)
outPutData := DataFailed{
GoodsID: k,
GoodsName: skuMap[k].Name,
Comment: "在微盟上未找到该商品",
}
dataFailed.AppendData2(outPutData)
// errMsg += fmt.Sprintf("在微盟上未找到该商品xxx", xxx)
}
}
// if errMsg != "" {
// return "", errors.New(errMsg)
// }
case 2:
//找出微盟上有，excel上没有的，有就更新，没有就下架
taskFunc3 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
@@ -171,24 +280,28 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
spuCode := goodsDetail.OuterGoodsCode
if spuCode != "" {
//如果微盟商品里找得到excel中的商品
if skuMap[spuCode] != 0 {
if skuMap[spuCode] != nil {
//获取京西库商品
skuList, _ := dao.GetSkus(db, nil, []int{int(utils.Str2Int64(goodsDetail.SkuMap.SingleSku.OuterSkuCode))}, nil, nil)
if len(skuList) == 0 {
return "", errors.New(fmt.Sprintf("在京西库中未找到该商品！name_id : [%v]\n", goodsDetail.SkuMap.SingleSku.OuterSkuCode))
outPutData := DataFailed{
GoodsID: spuCode,
GoodsName: skuMap[spuCode].Name,
Comment: "在京西库中未找到该商品",
}
dataFailed.AppendData2(outPutData)
// return "", errors.New(fmt.Sprintf("在京西库中未找到该商品！name_id : [%v]\n", goodsDetail.SkuMap.SingleSku.OuterSkuCode))
} else {
if skuList[0].Unit == "份" {
if goodsDetail.SkuMap.SingleSku.B2CSku.Weight == 0 {
costPrice = skuMap[spuCode]
costPrice = skuMap[spuCode].Price
} else {
costPrice = Float64Round(0.5 / goodsDetail.SkuMap.SingleSku.B2CSku.Weight * skuMap[spuCode])
costPrice = Float64Round(0.5 / goodsDetail.SkuMap.SingleSku.B2CSku.Weight * skuMap[spuCode].Price)
}
} else {
costPrice = skuMap[spuCode]
costPrice = skuMap[spuCode].Price
}
// if errMsg == "" {
_, _, err = updateWeiMobGoods(costPrice, skuMap[spuCode], goodsDetail)
// }
_, _, _ = updateWeiMobGoods(costPrice, skuMap[spuCode].Price, skuList[0].Unit, isCompare, goodsDetail)
}
} else {
//下架微盟商品
@@ -197,7 +310,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
}
return retVal, err
}
taskParallel3 := tasksch.NewParallelTask("根据获取的微盟所有商品并更新", tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc3, goodsList)
taskParallel3 := tasksch.NewParallelTask("根据获取的微盟所有商品并更新", tasksch.NewParallelConfig().SetParallelCount(parallelCount), ctx, taskFunc3, goodsList)
tasksch.HandleTask(taskParallel3, task, true).Run()
goodsIDListForPutAwayInterface, err2 := taskParallel3.GetResult(0)
if err = err2; err != nil {
@@ -206,7 +319,6 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
goodsIDListForPutAway = goodsIDListForPutAwayInterface
case 3:
// 批量下架微盟商品
// if errMsg == "" {
taskFunc4 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
int64Slice := []int64{}
for _, v := range batchItemList {
@@ -218,14 +330,15 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
taskParallel4 := tasksch.NewParallelTask("下架微盟商品", tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetBatchSize(UpdateGoodsShelfStatusCount), ctx, taskFunc4, goodsIDListForPutAway)
tasksch.HandleTask(taskParallel4, task, true).Run()
_, err = taskParallel4.GetResult(0)
// }
}
if errMsg != "" {
return result, errors.New(errMsg)
case 4:
WriteToExcel(task, dataSuccess.dataSuccessList, dataFailed.dataFailedList)
}
// if errMsg != "" {
// return result, errors.New(errMsg)
// }
return result, err
}
taskSeq := tasksch.NewSeqTask2("读取永辉Excel文件修改微盟商品价格可售状态-序列任务", ctx, isContinueWhenError, taskSeqFunc, 4)
taskSeq := tasksch.NewSeqTask2("读取永辉Excel文件修改微盟商品价格可售状态-序列任务", ctx, isContinueWhenError, taskSeqFunc, 5)
tasksch.HandleTask(taskSeq, nil, true).Run()
if !isAsync {
_, err = taskSeq.GetResult(0)
@@ -265,13 +378,14 @@ func GetGoodsInfoAndDetailMap(goodsList []*weimobapi.GoodsInfo) (goodsMap map[st
// return list
// }
func updateWeiMobGoods(costPrice, salePrice float64, goodsDetail *weimobapi.GoodsDetailInfo) (goodsID int64, skuMap map[string]int64, err error) {
func updateWeiMobGoods(costPrice, salePrice float64, unit string, isCompare bool, goodsDetail *weimobapi.GoodsDetailInfo) (goodsID int64, skuMap map[string]int64, err error) {
var (
categoryList []*weimobapi.CategoryList
skuListInfo = goodsDetail.SkuList[0]
skuListParam []*weimobapi.SkuList
categoryID int
deliveryTypeListSlice []int64
newSkuTitle string
)
//查询配送方式
@@ -298,16 +412,51 @@ func updateWeiMobGoods(costPrice, salePrice float64, goodsDetail *weimobapi.Good
return 0, nil, errors.New(fmt.Sprintf("未查询到此商品的分类信息！goodsID : [%v] ,", goodsDetail.GoodsID))
}
//获取分组
//商品分组（原有的分组IDs）
selectedClassifyList := goodsDetail.SelectedClassifyList
var selectedClassifyListID []int64
selectedClassifyListIDMap := make(map[int64]int64)
if len(selectedClassifyList) > 0 {
for _, v := range selectedClassifyList {
for _, vv := range v.ChildrenClassify {
selectedClassifyListID = append(selectedClassifyListID, vv.ClassifyID)
for _, v := range v.ChildrenClassify {
selectedClassifyListIDMap[v.ClassifyID] = v.ClassifyID
}
}
}
//上次上传价格和这次上传价格对比
// 4、微盟商品。两个重要分组
// 降价超0.2元，与前一日数据对比，需要将此类商品增加分类到这里，不改变原分类
// 涨价超0.2元，与前一日数据对比，需要将此类商品增加分类到这里，不改变原分类
// 其他商品，取消 这两个分类
// 同一天第二次上传的处理，需要注意是与前一天价格的对比，不是当天的价格对比。
// 5. 涨价和跌价值保留2位小数
// 需要在每个商品中增加↑0.01或↓0.02。
// 显示在商品最前的括号里，如果没有括号，需要增加。都用小写的括号，大写括号需要删除。
// 包装菜需要增加“精”，其他不需要加字，比如：
// (精↓2.11)新土豆1kg/袋
// (↓2.11)新土豆1kg
//salePrice 这次上传的价格 goodsDetail.SkuMap.SingleSku.SalePrice 上次上传的价格 priceMix 两次上传价格差 priceMixRound 保留两位后的价格差
if !isCompare {
priceMix := salePrice - goodsDetail.SkuMap.SingleSku.SalePrice
if priceMix > 0.2 {
delete(selectedClassifyListIDMap, 1064198248)
delete(selectedClassifyListIDMap, 1065246248)
selectedClassifyListIDMap[1064198248] = 1064198248
} else if priceMix < -0.2 {
delete(selectedClassifyListIDMap, 1064198248)
delete(selectedClassifyListIDMap, 1065246248)
selectedClassifyListIDMap[1065246248] = 1065246248
} else {
delete(selectedClassifyListIDMap, 1064198248)
delete(selectedClassifyListIDMap, 1065246248)
}
priceMixRound := Float64Round(priceMix)
newSkuTitle = GetNewSkuTitle(priceMixRound, goodsDetail.Title, goodsDetail.OuterGoodsCode)
} else {
newSkuTitle = goodsDetail.Title
}
b2CSku := &weimobapi.B2CSku{
Weight: skuListInfo.B2CSku.Weight,
Volume: skuListInfo.B2CSku.Volume,
@@ -329,7 +478,7 @@ func updateWeiMobGoods(costPrice, salePrice float64, goodsDetail *weimobapi.Good
goods := &weimobapi.Goods{
B2CGoods: b2CGoods,
SkuList: skuListParam,
Title: goodsDetail.Title,
Title: newSkuTitle,
IsMultiSku: goodsDetail.IsMultiSku,
IsPutAway: weimobapi.GoodsTypeNormal,
GoodsImageURL: goodsDetail.GoodsImageURL,
@@ -337,22 +486,38 @@ func updateWeiMobGoods(costPrice, salePrice float64, goodsDetail *weimobapi.Good
CategoryID: categoryID,
OuterGoodsCode: goodsDetail.OuterGoodsCode,
PointDeductRatio: goodsDetail.PointDeductRatio,
SelectedClassifyIDList: selectedClassifyListID,
SelectedClassifyIDList: Map2Int64Slice(selectedClassifyListIDMap),
}
updateGoodsParam := &weimobapi.UpdateGoodsParam{
Goods: goods,
}
if globals.EnableStoreWrite {
goodsID, skuMap, err = api.WeimobAPI.UpdateGoods3(updateGoodsParam)
if err != nil {
if errExt, ok := err.(*utils.ErrorWithCode); ok {
outPutData := DataFailed{
GoodsID: goodsDetail.OuterGoodsCode,
GoodsName: goodsDetail.Title,
Comment: errExt.ErrMsg(),
}
dataFailed.AppendData2(outPutData)
}
} else {
outPutData := DataSuccess{
NameID: goodsDetail.SkuMap.SingleSku.OuterSkuCode,
Name: goodsDetail.Title,
Unit: unit,
OrgPrice: goodsDetail.SkuMap.SingleSku.SalePrice,
NowPrice: salePrice,
MixPrice: Float64Round(salePrice - goodsDetail.SkuMap.SingleSku.SalePrice),
}
dataSuccess.AppendData(outPutData)
}
}
return goodsID, skuMap, err
}
func GetWeiMobGoodsList() (goodsList []*weimobapi.GoodsInfo, err error) {
param := &weimobapi.QueryGoodsListParam{
PageNum: 1,
PageSize: jdapi.MaxSkuIDsCount4QueryListBySkuIds,
}
func GetWeiMobGoodsList(param *weimobapi.QueryGoodsListParam) (goodsList []*weimobapi.GoodsInfo, err error) {
for {
goodsInfoList, _, err := api.WeimobAPI.QueryGoodsList(param)
if err != nil {
@@ -378,52 +543,427 @@ func IsChineseChar(str string) bool {
return false
}
func GetCellIntoMap(skuIDCol, skuPriceCol, orgSkuIDCol, orgSkuPriceCol int, skuMap map[string]float64, row []string, sheetName string, rowNum int) {
func GetCellIntoMap(sheetParam *SheetParam, skuMap map[string]*ExcelParam, row []string, sheetName string, rowNum int) {
var (
skuID string
orgSkuID string
skuPrice float64
orgSkuPrice float64
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 !IsChineseChar(cell) && cell != "" {
if k == skuIDCol && skuIDCol >= 0 {
skuID = cell
if cell != "" {
if !IsChineseChar(cell) {
if k == skuIDCol && skuIDCol >= 0 {
skuID = cell
}
if k == skuPriceCol && skuPriceCol >= 0 {
skuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0))
}
if k == orgSkuIDCol && orgSkuIDCol >= 0 {
orgSkuID = "0" + cell
}
if k == orgSkuPriceCol && orgSkuPriceCol >= 0 {
orgSkuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0))
}
}
if k == skuPriceCol && skuPriceCol >= 0 {
skuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0))
if k == skuNameCol && skuNameCol >= 0 {
skuName = cell
}
if k == orgSkuIDCol && orgSkuIDCol >= 0 {
orgSkuID = "0" + cell
}
if k == orgSkuPriceCol && orgSkuPriceCol >= 0 {
orgSkuPrice = Float64Round(utils.Str2Float64WithDefault(cell, 0))
if k == orgSkuNameCol && orgSkuNameCol >= 0 {
orgSkuName = cell
}
}
}
if skuMap[skuID] != 0 && skuMap[skuID] != skuPrice {
if skuPrice > skuMap[skuID] {
skuMap[skuID] = skuPrice
if len(skuMap) > 0 {
if skuMap[skuID] != nil {
if skuMap[skuID].Price != 0 && skuMap[skuID].Price != skuPrice && skuPrice != 0 {
if skuPrice > skuMap[skuID].Price {
BuildSkuMap(skuID, skuName, skuPrice, skuMap)
}
} else {
BuildSkuMap(skuID, skuName, skuPrice, skuMap)
}
} 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)
}
// fmt.Sprintf("读取excel表格出错！有商品ID重复且价格不同,sheetName : [%v] ,行数 : [%v] , 商品编码 ：[%v] , 价格：[%v]\n", sheetName, rowNum, skuID, skuPrice)
} else {
skuMap[skuID] = skuPrice
}
if skuMap[orgSkuID] != 0 && skuMap[orgSkuID] != orgSkuPrice {
if orgSkuPrice > skuMap[orgSkuID] {
skuMap[orgSkuID] = orgSkuPrice
}
// fmt.Sprintf("读取excel表格出错！有商品ID重复且价格不同,sheetName : [%v] ,行数 : [%v], 商品编码 ：[%v] , 价格：[%v]\n", sheetName, rowNum, orgSkuID, orgSkuPrice)
} else if orgSkuPriceCol >= 0 && orgSkuIDCol >= 0 {
skuMap[orgSkuID] = orgSkuPrice
BuildSkuMap(skuID, skuName, skuPrice, skuMap)
BuildSkuMap(orgSkuID, orgSkuName, orgSkuPrice, skuMap)
}
delete(skuMap, "")
}
func BuildSkuMap(id, name string, price float64, skuMap map[string]*ExcelParam) {
excelParam := &ExcelParam{
SpuCode: id,
Price: price,
Name: name,
}
skuMap[id] = excelParam
}
func Float64Round(f float64) (flt float64) {
return math.Round(f*100) / 100
}
func UpdateClassifyName() {
func Map2Int64Slice(m map[int64]int64) (result []int64) {
for _, v := range m {
result = append(result, v)
}
return result
}
func UpdateClassifyAndGetLastClassify() (isCompare bool, err error) {
var lastTitle string
classfiyList, err := api.WeimobAPI.QueryClassifyInfoList()
if len(classfiyList) > 0 {
for _, v := range classfiyList {
if v.ClassifyID == 1065244148 {
lastTitle = v.Title
}
}
}
title := "可定"
now := time.Now()
afterDay := now.AddDate(0, 0, 2).Day()
title += utils.Int2Str(afterDay) + "日"
if lastTitle == title {
return true, err
} else {
err = api.WeimobAPI.UpdateClassify(1065244148, title, "")
return false, err
}
}
func GetNewSkuTitle(priceMixRound float64, orgTitle, outerGoodsCode string) (name string) {
var prefix = ""
title1 := strings.ReplaceAll(orgTitle, "（", "(")
title := strings.ReplaceAll(title1, "）", ")")
if outerGoodsCode[0:1] != "0" {
prefix += "(精"
if priceMixRound > 0 {
prefix += "↑"
} else if priceMixRound < 0 {
prefix += "↓"
} else {
prefix += ")"
return GetReplaceNewTitle(title, prefix)
}
} else {
if priceMixRound > 0 {
prefix += "(↑"
} else if priceMixRound < 0 {
prefix += "(↓"
} else {
return GetReplaceNewTitle(title, prefix)
}
}
prefix += utils.Float64ToStr(math.Abs(priceMixRound)) + ")"
return GetReplaceNewTitle(title, prefix)
}
func GetReplaceNewTitle(title, prefix string) (newTitle string) {
if title[0:1] == "(" {
return strings.Replace(title, title[0:strings.Index(title, ")")+1], prefix, 1)
} else {
return prefix + title
}
}
func WriteToExcel(task *tasksch.SeqTask, dataSuccess []DataSuccess, dataFailed []DataFailed) (err error) {
var sheetList1 []*excel.Obj2ExcelSheetConfig
var sheetList2 []*excel.Obj2ExcelSheetConfig
var downloadURL1, downloadURL2, fileName1, fileName2 string
excelConf1 := &excel.Obj2ExcelSheetConfig{
Title: "sheet1",
Data: dataSuccess,
CaptionList: titleListSuccess,
}
sheetList1 = append(sheetList1, excelConf1)
excelConf2 := &excel.Obj2ExcelSheetConfig{
Title: "sheet1",
Data: dataFailed,
CaptionList: titleListFailed,
}
sheetList2 = append(sheetList2, excelConf2)
if excelConf1 != nil {
downloadURL1, fileName1, err = UploadExeclAndPushMsg(sheetList1, "已更新商品")
} else {
baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess is nil!")
}
if excelConf2 != nil {
downloadURL2, fileName2, err = UploadExeclAndPushMsg(sheetList2, "缺少商品_微盟")
} else {
baseapi.SugarLogger.Debug("WriteToExcel: dataFailed is nil!")
}
if err != nil {
baseapi.SugarLogger.Errorf("WriteToExcel:upload %s , %s failed error:%v", fileName1, fileName2, err)
} else {
noticeMsg := fmt.Sprintf("[详情点我]path1=%s, path2=%s \n", globals.BackstageHost, downloadURL1, downloadURL2)
task.SetNoticeMsg(noticeMsg)
baseapi.SugarLogger.Debugf("WriteToExcel:upload %s ,%s success, downloadURL1:%s ,downloadURL2:%s", fileName1, fileName2, downloadURL1, downloadURL2)
}
return err
}
func UploadExeclAndPushMsg(sheetList []*excel.Obj2ExcelSheetConfig, name string) (downloadURL, fileName string, err error) {
excelBin := excel.Obj2Excel(sheetList)
timeStr := utils.Int64ToStr(time.Now().Unix())
fileName = name + timeStr + fileExt
baseapi.SugarLogger.Debugf("WriteToExcel:save %s success", fileName)
downloadURL, err = jxutils.UploadExportContent(excelBin, fileName)
return downloadURL, fileName, err
}
func UpdateJxPriceByWeimob(ctx *jxcontext.Context, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
var (
storeSkuBindInfoList []interface{}
skuBindInfos []*cms.StoreSkuBindInfo
)
//获取微盟所有上架商品
queryParameter := &weimobapi.QueryGoodsListRequestVo{
GoodsStatus: weimobapi.GoodsTypeNormal,
}
param := &weimobapi.QueryGoodsListParam{
PageNum: 1,
PageSize: jdapi.MaxSkuIDsCount4QueryListBySkuIds,
QueryParameter: queryParameter,
}
goodsList, err := GetWeiMobGoodsList(param)
if err != nil {
baseapi.SugarLogger.Errorf("GetWeiMobGoodsList error:%v", err)
}
taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
switch step {
case 0:
taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*weimobapi.GoodsInfo)
goodsDetail, err := api.WeimobAPI.QueryGoodsDetail(v.GoodsID)
if err != nil {
baseapi.SugarLogger.Errorf("QueryGoodsDetail error:%v", err)
}
if goodsDetail.OuterGoodsCode != "" && goodsDetail.IsPutAway == weimobapi.GoodsTypeNormal {
nameID := int(utils.Str2Int64(goodsDetail.SkuMap.SingleSku.OuterSkuCode))
unitPrice := int(utils.Float64TwoInt64(goodsDetail.SkuMap.SingleSku.CostPrice * 100))
storeSkuBindInfo := &cms.StoreSkuBindInfo{
NameID: nameID,
UnitPrice: unitPrice,
}
retVal = []*cms.StoreSkuBindInfo{storeSkuBindInfo}
}
return retVal, err
}
taskParallel := tasksch.NewParallelTask("获取微盟商品", tasksch.NewParallelConfig().SetParallelCount(parallelCount), ctx, taskFunc, goodsList)
tasksch.HandleTask(taskParallel, task, true).Run()
storeSkuBindInfoList, err = taskParallel.GetResult(0)
case 1:
for _, v := range storeSkuBindInfoList {
skuBindInfos = append(skuBindInfos, v.(*cms.StoreSkuBindInfo))
}
cms.UpdateStoresSkus(ctx, storeIDs, skuBindInfos, isAsync, isContinueWhenError)
}
return result, err
}
taskSeq := tasksch.NewSeqTask2("根据微盟商品更新京西价", ctx, isContinueWhenError, taskSeqFunc, 2)
tasksch.HandleTask(taskSeq, nil, true).Run()
if !isAsync {
_, err = taskSeq.GetResult(0)
hint = "1"
} else {
hint = taskSeq.GetID()
}
return hint, err
}
func GetWeimobOrders(ctx *jxcontext.Context, fromTime, toTime string, params map[string]interface{}) (result []*OrderList, err error) {
if fromTime != "" && toTime != "" {
fromTimeParam := utils.Str2Time(fromTime).UnixNano() / 1e6
toTimeParam := utils.Str2Time(toTime).UnixNano() / 1e6
if params["keyword"] != nil {
if jxutils.GetPossibleVendorIDFromVendorOrderID(params["keyword"].(string)) > model.VendorIDUnknown {
resultList, err := GetSingleOrderResultList(params)
result = append(result, resultList...)
return result, err
} else {
orderList, err := GetWeimobOrdersList(fromTimeParam, toTimeParam, params["keyword"].(string))
return orderList, err
}
} else {
orderList, err := GetWeimobOrdersList(fromTimeParam, toTimeParam, "")
return orderList, err
}
}
if fromTime == "" && toTime == "" && params["keyword"] != nil {
if jxutils.GetPossibleVendorIDFromVendorOrderID(params["keyword"].(string)) > model.VendorIDUnknown {
resultList, err := GetSingleOrderResultList(params)
result = append(result, resultList...)
return result, err
} else {
orderList, err := GetWeimobOrdersList(0, 0, params["keyword"].(string))
return orderList, err
}
}
return result, err
}
func GetWeimobOrdersList(fromTimeParam, toTimeParam int64, keyword string) (aList []*OrderList, err error) {
var queryParameter *weimobapi.MerchantOrderListQueryParameter
if fromTimeParam == 0 && toTimeParam == 0 {
queryParameter = &weimobapi.MerchantOrderListQueryParameter{
CreateStartTime: time.Now().AddDate(0, -2, 0).UnixNano() / 1e6,
CreateEndTime: time.Now().UnixNano() / 1e6,
}
} else {
queryParameter = &weimobapi.MerchantOrderListQueryParameter{
CreateStartTime: fromTimeParam,
CreateEndTime: toTimeParam,
}
}
param := &weimobapi.QueryOrdersListParam{
PageNum: 1,
PageSize: weimobapi.QueryOrdersListPageSize,
QueryParameter: queryParameter,
}
for {
orderList, _, err2 := api.WeimobAPI.QueryOrdersList(param)
err = err2
if len(orderList) > 0 {
if keyword != "" {
for _, v := range orderList {
if ContainsKeyword(v, keyword) {
var aOrder = &OrderList{
Name: v.ReceiverName,
OrderNo: v.OrderNo,
Phone: v.ReceiverMobile,
}
aList = append(aList, aOrder)
}
}
} else {
for _, v := range orderList {
var aOrder = &OrderList{
Name: v.ReceiverName,
OrderNo: v.OrderNo,
Phone: v.ReceiverMobile,
}
aList = append(aList, aOrder)
}
}
}
if len(orderList) < param.PageSize {
break
}
param.PageNum++
}
return aList, err
}
func GetWeimobOrderDetail(orderNo int64) (order *weimobapi.OrderDetail, err error) {
return api.WeimobAPI.QueryOrderDetail2(orderNo, false)
}
func GetSingleOrderResultList(params map[string]interface{}) (result []*OrderList, err error) {
weimobOrderID := params["keyword"].(string)
orderSingle, err := GetWeimobOrderDetail(utils.Str2Int64(weimobOrderID))
orderList := &OrderList{
Name: orderSingle.DeliveryDetail.LogisticsDeliveryDetail.ReceiverName,
Phone: orderSingle.DeliveryDetail.LogisticsDeliveryDetail.ReceiverMobile,
OrderNo: orderSingle.OrderNo,
}
result = append(result, orderList)
return result, err
}
func ContainsKeyword(v *weimobapi.OrderInfo, keyword string) bool {
return strings.Contains(v.ReceiverName, keyword) || strings.Contains(utils.Int64ToStr(v.OrderNo), keyword) || strings.Contains(v.ReceiverMobile, keyword)
}
func GetWeimobOrdersExcel(ctx *jxcontext.Context, OrderNo string) (err error) {
var (
DataFineList []*Data //精品
DataHairyList []*Data //毛菜
)
orderSingle, err := GetWeimobOrderDetail(utils.Str2Int64(OrderNo))
itemList := orderSingle.ItemList
for _, v := range itemList {
if v.GoodsCode[0:1] == "0" {
DataHairy := &Data{
GoodsID: v.GoodsCode,
GoodsName: v.GoodsTitle,
GoodsNum: v.SkuNum,
}
DataHairyList = append(DataHairyList, DataHairy)
} else {
DataFine := &Data{
GoodsID: v.GoodsCode,
GoodsName: v.GoodsTitle,
GoodsNum: v.SkuNum,
}
DataFineList = append(DataFineList, DataFine)
}
}
WriteToExcel2(ctx, DataFineList, DataHairyList)
return err
}
func WriteToExcel2(ctx *jxcontext.Context, DataFineList, DataHairyList []*Data) (err error) {
var (
sheetList1 []*excel.Obj2ExcelSheetConfig
sheetList2 []*excel.Obj2ExcelSheetConfig
downloadURL1, downloadURL2 string
fileName1, fileName2 string
noticeMsg string
)
excelConf1 := &excel.Obj2ExcelSheetConfig{
Title: "sheet1",
Data: DataFineList,
CaptionList: titleList,
}
sheetList1 = append(sheetList1, excelConf1)
excelConf2 := &excel.Obj2ExcelSheetConfig{
Title: "sheet1",
Data: DataHairyList,
CaptionList: titleList,
}
sheetList2 = append(sheetList2, excelConf2)
noticeMsg += "[详情点我]"
if len(DataFineList) > 0 {
downloadURL1, fileName1, err = UploadExeclAndPushMsg(sheetList1, "京西采购_精品")
noticeMsg += "path1=" + downloadURL1 + " "
} else {
baseapi.SugarLogger.Debug("WriteToExcel: DataFineList is nil!")
}
if len(DataHairyList) > 0 {
downloadURL2, fileName2, err = UploadExeclAndPushMsg(sheetList2, "京西采购_毛菜")
noticeMsg += "path2=" + downloadURL2
} else {
baseapi.SugarLogger.Debug("WriteToExcel: DataHairyList is nil!")
}
if err != nil {
baseapi.SugarLogger.Errorf("WriteToExcel:upload %s , %s failed error:%v", fileName1, fileName2, err)
} else {
if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "导出微盟订单商品成功", noticeMsg)
baseapi.SugarLogger.Debugf("WriteToExcel:upload %s ,%s success, downloadURL1:%s ,downloadURL2:%s", fileName1, fileName2, downloadURL1, downloadURL2)
}
}
return err
}