Merge remote-tracking branch 'origin/mark' into su

This commit is contained in:
苏尹岚
2020-01-14 18:34:58 +08:00
16 changed files with 495 additions and 30 deletions

View File

@@ -1,6 +1,9 @@
package controllers
import (
"fmt"
"io"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -309,3 +312,43 @@ func (c *SyncController) FullSyncVendorStuff() {
return retVal, "", err
})
}
// @Title 上传假京东门店与SKU映射表并启动同步
// @Description 上传假京东门店与SKU映射表并启动同步
// @Param token header string false "认证token"
// @Param isSyncNow formData bool false "是否马上同步,一般不建议"
// @Param isAsync formData bool false "是否异步,缺省是同步"
// @Param isContinueWhenError formData bool false "单个同步失败是否继续缺省false"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /UploadFakeJdThingMap [post,get]
func (c *SyncController) UploadFakeJdThingMap() {
if c.Ctx.Input.IsGet() {
w := c.Ctx.ResponseWriter
// 上传页面
w.Header().Add("Content-Type", "text/html")
w.WriteHeader(200)
html := `
<form enctype="multipart/form-data" action="/v2/sync/UploadFakeJdThingMap" method="POST">
Send this file: <input name="userfiles" multiple accept="*" type="file" />
<input type="submit" value="Send File" />
</form>
`
io.WriteString(w, html)
} else if c.Ctx.Input.IsPost() {
c.callUploadFakeJdThingMap(func(params *tSyncUploadFakeJdThingMapParams) (retVal interface{}, errCode string, err error) {
r := c.Ctx.Request
files := r.MultipartForm.File["userfiles"]
if len(files) == 0 {
err = fmt.Errorf("没上传文件")
} else {
fileReader, err2 := files[0].Open()
if err = err2; err == nil {
retVal, err = cms.UploadFakeJdThingMap(params.Ctx, fileReader, params.IsSyncNow, params.IsAsync, params.IsContinueWhenError)
fileReader.Close()
}
}
return retVal, "", err
})
}
}