From a4de571a193ad28cc75b0e05d36ad134a5198fd5 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Tue, 27 Aug 2019 18:10:35 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E9=87=8A=E6=94=BE?= =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/misc/misc2.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/jxstore/misc/misc2.go b/business/jxstore/misc/misc2.go index a21ea9c7f..6006df42b 100644 --- a/business/jxstore/misc/misc2.go +++ b/business/jxstore/misc/misc2.go @@ -260,7 +260,9 @@ func StartOrEndOpStoreEx(ctx *jxcontext.Context, isStart bool, startTime, endTim AddOrDelExtraStoreOptime(ctx, vendorID, storeID, vendorStoreID, &storeListValue.Store, startOpStoreTime, endOpStoreTime, true) } } + storeSkuList = nil } + storeSkuNameList = nil } return retVal, err } From e5e6c45e7af45f50d54f210fe6eb5b58465f51f8 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Wed, 28 Aug 2019 18:07:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95-=E9=A5=BF=E7=99=BE?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=B9=B3=E5=8F=B0=E5=95=86=E5=93=81-?= =?UTF-8?q?=E5=8D=8F=E7=A8=8B=E6=94=B9=E4=B8=BAFOR=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store_sku2.go | 52 ++++++++++++-------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 7056381e7..623525f4f 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -312,27 +312,39 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas if err == nil { skuNameList = append(skuNameList, vendorSkuList2Jx(page1.List)...) if page1.Pages > 1 { - pages := make([]int, page1.Pages-1) - for i := 2; i <= page1.Pages; i++ { - pages[i-2] = i - } - task := tasksch.NewParallelTask("ebai GetStoreSkusFullInfo", nil, ctx, - func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - callParams := &ebaiapi.SkuListParams{ - PageSize: ebaiapi.MaxSkuListPageSize, - Page: batchItemList[0].(int), + // pages := make([]int, page1.Pages-1) + // for i := 2; i <= page1.Pages; i++ { + // pages[i-2] = i + // } + // task := tasksch.NewParallelTask("ebai GetStoreSkusFullInfo", nil, ctx, + // func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // callParams := &ebaiapi.SkuListParams{ + // PageSize: ebaiapi.MaxSkuListPageSize, + // Page: batchItemList[0].(int), + // } + // pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) + // if err2 == nil { + // return pageSku.List, err2 + // } + // return nil, err2 + // }, pages) + // tasksch.HandleTask(task, parentTask, true).Run() + // result, err2 := task.GetResult(0) + // if err = err2; err == nil { + // for _, v := range result { + // skuNameList = append(skuNameList, vendorSku2Jx(v.(*ebaiapi.SkuInfo))) + // } + // } + for pageIndex := 2; pageIndex <= page1.Pages; pageIndex++ { + callParams := &ebaiapi.SkuListParams{ + PageSize: ebaiapi.MaxSkuListPageSize, + Page: pageIndex, + } + pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) + if err2 == nil { + for _, v := range pageSku.List { + skuNameList = append(skuNameList, vendorSku2Jx(v)) } - pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) - if err2 == nil { - return pageSku.List, err2 - } - return nil, err2 - }, pages) - tasksch.HandleTask(task, parentTask, true).Run() - result, err2 := task.GetResult(0) - if err = err2; err == nil { - for _, v := range result { - skuNameList = append(skuNameList, vendorSku2Jx(v.(*ebaiapi.SkuInfo))) } } } From 77da618442dd496f856fe76e44bf0c2142e2ee2f Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Wed, 28 Aug 2019 18:32:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store_sku2.go | 64 ++++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 623525f4f..030db9813 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -312,41 +312,41 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas if err == nil { skuNameList = append(skuNameList, vendorSkuList2Jx(page1.List)...) if page1.Pages > 1 { - // pages := make([]int, page1.Pages-1) - // for i := 2; i <= page1.Pages; i++ { - // pages[i-2] = i - // } - // task := tasksch.NewParallelTask("ebai GetStoreSkusFullInfo", nil, ctx, - // func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - // callParams := &ebaiapi.SkuListParams{ - // PageSize: ebaiapi.MaxSkuListPageSize, - // Page: batchItemList[0].(int), - // } - // pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) - // if err2 == nil { - // return pageSku.List, err2 - // } - // return nil, err2 - // }, pages) - // tasksch.HandleTask(task, parentTask, true).Run() - // result, err2 := task.GetResult(0) - // if err = err2; err == nil { - // for _, v := range result { - // skuNameList = append(skuNameList, vendorSku2Jx(v.(*ebaiapi.SkuInfo))) - // } - // } - for pageIndex := 2; pageIndex <= page1.Pages; pageIndex++ { - callParams := &ebaiapi.SkuListParams{ - PageSize: ebaiapi.MaxSkuListPageSize, - Page: pageIndex, - } - pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) - if err2 == nil { - for _, v := range pageSku.List { - skuNameList = append(skuNameList, vendorSku2Jx(v)) + pages := make([]int, page1.Pages-1) + for i := 2; i <= page1.Pages; i++ { + pages[i-2] = i + } + task := tasksch.NewParallelTask("ebai GetStoreSkusFullInfo", nil, ctx, + func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + callParams := &ebaiapi.SkuListParams{ + PageSize: ebaiapi.MaxSkuListPageSize, + Page: batchItemList[0].(int), } + pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) + if err2 == nil { + return pageSku.List, err2 + } + return nil, err2 + }, pages) + tasksch.HandleTask(task, parentTask, false).Run() + result, err2 := task.GetResult(0) + if err = err2; err == nil { + for _, v := range result { + skuNameList = append(skuNameList, vendorSku2Jx(v.(*ebaiapi.SkuInfo))) } } + // for pageIndex := 2; pageIndex <= page1.Pages; pageIndex++ { + // callParams := &ebaiapi.SkuListParams{ + // PageSize: ebaiapi.MaxSkuListPageSize, + // Page: pageIndex, + // } + // pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) + // if err2 == nil { + // for _, v := range pageSku.List { + // skuNameList = append(skuNameList, vendorSku2Jx(v)) + // } + // } + // } } } return skuNameList, err From b482867bc2dd2adeb66e6bf6f6d089d592592f60 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Thu, 29 Aug 2019 08:37:02 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/misc/misc2.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/business/jxstore/misc/misc2.go b/business/jxstore/misc/misc2.go index 6006df42b..a21ea9c7f 100644 --- a/business/jxstore/misc/misc2.go +++ b/business/jxstore/misc/misc2.go @@ -260,9 +260,7 @@ func StartOrEndOpStoreEx(ctx *jxcontext.Context, isStart bool, startTime, endTim AddOrDelExtraStoreOptime(ctx, vendorID, storeID, vendorStoreID, &storeListValue.Store, startOpStoreTime, endOpStoreTime, true) } } - storeSkuList = nil } - storeSkuNameList = nil } return retVal, err } From 71f918568c2e226579f66560d9c66dac6b0a64e0 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Thu, 29 Aug 2019 11:54:21 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81/=E6=9D=A1?= =?UTF-8?q?=E5=BD=A2=E7=A0=81=E7=9A=84=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils_cms.go | 94 ++++++++++++++++++++++++++++++++- controllers/cms.go | 17 ++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index da30c40d4..c6fd63b39 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -11,12 +11,25 @@ import ( "strings" "sync" "time" - + "errors" + "image/png" + "os" + "encoding/base64" "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" + "github.com/boombuler/barcode" + "github.com/boombuler/barcode/qr" + "github.com/boombuler/barcode/code128" +) + +const ( + MaxCodeWidth = 400 + MaxCodeHeight = 400 + CodeTypeQr = "qr" + CodeTypeBar = "bar" ) var ( @@ -451,3 +464,82 @@ func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) earningPrice = earningPrice * int64(storePayPercentage) / 100 return earningPrice } + +func File2BytesByFileName(filename string) ([]byte, error) { + file, err := os.Open(filename) + defer file.Close() + if err != nil { + return nil, err + } + + return File2BytesByFile(file) +} + +func File2BytesByFile(file *os.File) ([]byte, error) { + stats, err := file.Stat() + if err != nil { + return nil, err + } + + data := make([]byte, stats.Size()) + _, err = file.Read(data) + if err != nil { + return nil, err + } + + return data, nil +} + +func CreateCodeImage(qrCode barcode.Barcode) (fileName string, err error) { + fileName = "qrcode.png" + file, err := os.Create(fileName) + defer file.Close() + if err == nil { + err = png.Encode(file, qrCode) + } + + return fileName, err +} + +func GetImgBase64(qrCode barcode.Barcode) (imgBase64 string, err error) { + fileName, err := CreateCodeImage(qrCode) + if err == nil { + fileData, err := File2BytesByFileName(fileName) + if err == nil { + imgBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(fileData) + } + } + + return imgBase64, err +} + +func CreateQrAndBarCode(width, height int, codetype, srcData string) (imgBase64 string, err error) { + if width > MaxCodeWidth { + width = MaxCodeWidth + } + if height > MaxCodeHeight { + height = MaxCodeHeight + } + + if codetype == CodeTypeQr { + qrCode, err := qr.Encode(srcData, qr.M, qr.Auto) + if err == nil { + qrCode, err = barcode.Scale(qrCode, width, height) + if err == nil { + imgBase64, err = GetImgBase64(qrCode) + } + } + } else if codetype == CodeTypeBar { + cs, err := code128.Encode(srcData) + if err == nil { + qrCode, err2 := barcode.Scale(cs, width, height) + if err = err2; err == nil { + imgBase64, err = GetImgBase64(qrCode) + } + } + } else { + err = errors.New(fmt.Sprintf("未知编码类型:%s", codetype)) + } + + return imgBase64, err +} diff --git a/controllers/cms.go b/controllers/cms.go index 0df74e736..431ab98a4 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -279,3 +279,20 @@ func (c *CmsController) QueryConfigs() { return retVal, "", err }) } + +// @Title 生成二维码或条形码 +// @Description 生成二维码或条形码 +// @Param token header string true "认证token" +// @Param width formData int true "图片宽" +// @Param height formData int true "图片高" +// @Param codetype formData string true "编码类型(二维码：qr; 条形码：bar)" +// @Param srcData formData string true "二维码/条形码数据源" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /CreateQrAndBarCode [post] +func (c *CmsController) CreateQrAndBarCode() { + c.callCreateQrAndBarCode(func(params *tCmsCreateQrAndBarCodeParams) (retVal interface{}, errCode string, err error) { + retVal, err = jxutils.CreateQrAndBarCode(params.Width, params.Height, params.Codetype, params.SrcData) + return retVal, "", err + }) +} \ No newline at end of file From 82d22c08e6329caf729914f8f15545ea03085d4f Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Thu, 29 Aug 2019 11:54:48 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81/=E6=9D=A1?= =?UTF-8?q?=E5=BD=A2=E7=A0=81=E7=9A=84=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/commentsRouter_controllers.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 5195de907..fe7873213 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -277,6 +277,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], + beego.ControllerComments{ + Method: "CreateQrAndBarCode", + Router: `/CreateQrAndBarCode`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], beego.ControllerComments{ Method: "DeleteConfig", From ebfc3c3a9ab66d4617cb632cf2b19c158d96b50c Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Thu, 29 Aug 2019 14:48:13 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=94=9F=E6=88=90Base64=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81/=E6=9D=A1=E5=BD=A2?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils_cms.go | 48 +++------------------------------ 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index c6fd63b39..0a83482ed 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -13,7 +13,7 @@ import ( "time" "errors" "image/png" - "os" + "bytes" "encoding/base64" "git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/utils" @@ -465,50 +465,10 @@ func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) return earningPrice } -func File2BytesByFileName(filename string) ([]byte, error) { - file, err := os.Open(filename) - defer file.Close() - if err != nil { - return nil, err - } - - return File2BytesByFile(file) -} - -func File2BytesByFile(file *os.File) ([]byte, error) { - stats, err := file.Stat() - if err != nil { - return nil, err - } - - data := make([]byte, stats.Size()) - _, err = file.Read(data) - if err != nil { - return nil, err - } - - return data, nil -} - -func CreateCodeImage(qrCode barcode.Barcode) (fileName string, err error) { - fileName = "qrcode.png" - file, err := os.Create(fileName) - defer file.Close() - if err == nil { - err = png.Encode(file, qrCode) - } - - return fileName, err -} - func GetImgBase64(qrCode barcode.Barcode) (imgBase64 string, err error) { - fileName, err := CreateCodeImage(qrCode) - if err == nil { - fileData, err := File2BytesByFileName(fileName) - if err == nil { - imgBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(fileData) - } - } + bufWriter := bytes.NewBuffer(nil) + png.Encode(bufWriter, qrCode) + imgBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(bufWriter.Bytes()) return imgBase64, err } From f2d049bdef117892487d2ae8f7eac31788a52c24 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Thu, 29 Aug 2019 15:19:43 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index ee5bd62d3..0584ff5ca 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -588,7 +588,7 @@ func AddCreateFlagForJxStoreSku(ctx *jxcontext.Context, parentTask tasksch.ITask storeSkuBindIDs = append(storeSkuBindIDs, v.BindID) } } - storeSkuBindIDs = nil + localSkuList = nil } case 1: if len(storeSkuBindIDs) > 0 { From 1ea9c5aca241325fb8770add1602ff592bc90056 Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Thu, 29 Aug 2019 16:05:29 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=92=8C=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku_check.go | 1 + business/jxutils/jxutils_cms.go | 36 +++++++++----------- business/partner/purchase/ebai/store_sku2.go | 14 +------- controllers/cms.go | 8 ++--- routers/commentsRouter_controllers.go | 4 +-- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/business/jxstore/cms/store_sku_check.go b/business/jxstore/cms/store_sku_check.go index 9714f4491..34dd94871 100644 --- a/business/jxstore/cms/store_sku_check.go +++ b/business/jxstore/cms/store_sku_check.go @@ -468,6 +468,7 @@ func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) { if len(sheetList) > 0 { excelBin := excel.Obj2Excel(sheetList) + sheetList = nil timeStr := utils.Int64ToStr(time.Now().Unix()) diffFullFileName := diffFileName[IsJXCS()] + timeStr + fileExt if canWriteTolocal { diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index 0a83482ed..a35725f67 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -12,6 +12,7 @@ import ( "sync" "time" "errors" + "image" "image/png" "bytes" "encoding/base64" @@ -465,15 +466,15 @@ func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) return earningPrice } -func GetImgBase64(qrCode barcode.Barcode) (imgBase64 string, err error) { +func GetImgBase64(img image.Image) (imgBase64 string, err error) { bufWriter := bytes.NewBuffer(nil) - png.Encode(bufWriter, qrCode) + png.Encode(bufWriter, img) imgBase64 = "data:image/png;base64," + base64.StdEncoding.EncodeToString(bufWriter.Bytes()) return imgBase64, err } -func CreateQrAndBarCode(width, height int, codetype, srcData string) (imgBase64 string, err error) { +func CreateQrOrBarCode(width, height int, codeType, srcData string) (imgBase64 string, err error) { if width > MaxCodeWidth { width = MaxCodeWidth } @@ -481,24 +482,19 @@ func CreateQrAndBarCode(width, height int, codetype, srcData string) (imgBase64 height = MaxCodeHeight } - if codetype == CodeTypeQr { - qrCode, err := qr.Encode(srcData, qr.M, qr.Auto) - if err == nil { - qrCode, err = barcode.Scale(qrCode, width, height) - if err == nil { - imgBase64, err = GetImgBase64(qrCode) - } - } - } else if codetype == CodeTypeBar { - cs, err := code128.Encode(srcData) - if err == nil { - qrCode, err2 := barcode.Scale(cs, width, height) - if err = err2; err == nil { - imgBase64, err = GetImgBase64(qrCode) - } - } + var code barcode.Barcode + if codeType == CodeTypeQr { + code, err = qr.Encode(srcData, qr.M, qr.Auto) + } else if codeType == CodeTypeBar { + code, err = code128.Encode(srcData) } else { - err = errors.New(fmt.Sprintf("未知编码类型:%s", codetype)) + err = errors.New(fmt.Sprintf("未知编码类型:%s", codeType)) + } + if err == nil { + code, err = barcode.Scale(code, width, height) + if err == nil { + imgBase64, err = GetImgBase64(code) + } } return imgBase64, err diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 030db9813..7056381e7 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -328,25 +328,13 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas } return nil, err2 }, pages) - tasksch.HandleTask(task, parentTask, false).Run() + tasksch.HandleTask(task, parentTask, true).Run() result, err2 := task.GetResult(0) if err = err2; err == nil { for _, v := range result { skuNameList = append(skuNameList, vendorSku2Jx(v.(*ebaiapi.SkuInfo))) } } - // for pageIndex := 2; pageIndex <= page1.Pages; pageIndex++ { - // callParams := &ebaiapi.SkuListParams{ - // PageSize: ebaiapi.MaxSkuListPageSize, - // Page: pageIndex, - // } - // pageSku, err2 := api.EbaiAPI.SkuList(utils.Int2Str(storeID), callParams) - // if err2 == nil { - // for _, v := range pageSku.List { - // skuNameList = append(skuNameList, vendorSku2Jx(v)) - // } - // } - // } } } return skuNameList, err diff --git a/controllers/cms.go b/controllers/cms.go index 431ab98a4..325f588de 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -289,10 +289,10 @@ func (c *CmsController) QueryConfigs() { // @Param srcData formData string true "二维码/条形码数据源" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /CreateQrAndBarCode [post] -func (c *CmsController) CreateQrAndBarCode() { - c.callCreateQrAndBarCode(func(params *tCmsCreateQrAndBarCodeParams) (retVal interface{}, errCode string, err error) { - retVal, err = jxutils.CreateQrAndBarCode(params.Width, params.Height, params.Codetype, params.SrcData) +// @router /CreateQrOrBarCode [post] +func (c *CmsController) CreateQrOrBarCode() { + c.callCreateQrOrBarCode(func(params *tCmsCreateQrOrBarCodeParams) (retVal interface{}, errCode string, err error) { + retVal, err = jxutils.CreateQrOrBarCode(params.Width, params.Height, params.Codetype, params.SrcData) return retVal, "", err }) } \ No newline at end of file diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index fe7873213..5c1efe789 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -279,8 +279,8 @@ func init() { beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], beego.ControllerComments{ - Method: "CreateQrAndBarCode", - Router: `/CreateQrAndBarCode`, + Method: "CreateQrOrBarCode", + Router: `/CreateQrOrBarCode`, AllowHTTPMethods: []string{"post"}, MethodParams: param.Make(), Filters: nil,