diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 29626cbc4..800b5e1df 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -914,3 +914,45 @@ func UpdateAllWeiXinRemark(ctx *jxcontext.Context, isAsync, isContinueWhenError } return hint, err } + +// 从饿百得到执照信息 +func RetrieveEbaiShopLicence(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) { + var ebaiStoreList []*model.StoreMap + db := dao.GetDB() + if err = dao.GetRows(db, &ebaiStoreList, ` + SELECT * + FROM store_map + WHERE vendor_id = ? AND deleted_at = ? + `, model.VendorIDEBAI, utils.DefaultTimeValue); err == nil { + globals.SugarLogger.Debugf("RetrieveEbaiShopLicence, count:%d", len(ebaiStoreList)) + rootTask := tasksch.NewParallelTask("XXXX", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + ebaiStore := batchItemList[0].(*model.StoreMap) + xxList, err := api.EbaiAPI.ShopAptitudeGet("", utils.Str2Int64(ebaiStore.VendorStoreID)) + if err == nil && ebaiStore != nil { + if len(xxList) > 1 { + ebaiStore2, err2 := api.EbaiAPI.ShopGet("", utils.Str2Int64(ebaiStore.VendorStoreID)) + if err = err2; err == nil { + shop := &legacymodel.EbaiShopLicence{ + ShopName: utils.Interface2String(ebaiStore2["name"]), + Licence: utils.Interface2String(xxList[1]["license_number"]), + Address: utils.Interface2String(ebaiStore2["address"]), + Owner: utils.Interface2String(xxList[1]["legal_representative_name"]), + Tel: utils.Interface2String(ebaiStore2["service_phone"]), + LicenceName: utils.Interface2String(xxList[1]["license_name"]), + } + err = dao.CreateEntity(db, shop) + } + } + } + return nil, err + }, ebaiStoreList) + tasksch.ManageTask(rootTask).Run() + if !isAsync { + _, err = rootTask.GetResult(0) + } else { + hint = rootTask.ID + } + } + return hint, err +} diff --git a/business/model/legacymodel/ebaishoplicence.go b/business/model/legacymodel/ebaishoplicence.go new file mode 100644 index 000000000..bfe9dd3d1 --- /dev/null +++ b/business/model/legacymodel/ebaishoplicence.go @@ -0,0 +1,14 @@ +package legacymodel + +import "git.rosy.net.cn/jx-callback/business/model" + +type EbaiShopLicence struct { + model.ModelIDCUL + + ShopName string + Licence string + Address string + Owner string + Tel string + LicenceName string +} diff --git a/controllers/temp_op.go b/controllers/temp_op.go index 9dff79877..c61beb02c 100644 --- a/controllers/temp_op.go +++ b/controllers/temp_op.go @@ -3,8 +3,13 @@ package controllers import ( "git.rosy.net.cn/jx-callback/business/jxstore/tempop" "git.rosy.net.cn/jx-callback/business/jxutils" + "github.com/astaxie/beego" ) +type TempOpController struct { + beego.Controller +} + // @Title 将为份的商品在京东转成SPU // @Description 将为份的商品在京东转成SPU // @Param token header string true "认证token" @@ -174,8 +179,8 @@ func (c *InitDataController) RefreshEbaiBadComment() { // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /PrintMsg [post] -func (c *InitDataController) PrintMsg() { - c.callPrintMsg(func(params *tInitdataPrintMsgParams) (retVal interface{}, errCode string, err error) { +func (c *TempOpController) PrintMsg() { + c.callPrintMsg(func(params *tTempopPrintMsgParams) (retVal interface{}, errCode string, err error) { retVal, err = tempop.PrintMsg(params.Ctx, params.VendorID, params.Id1, params.Id2, params.MsgTitle, params.MsgContent) return retVal, "", err }) @@ -189,9 +194,24 @@ func (c *InitDataController) PrintMsg() { // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /UpdateAllWeiXinRemark [post] -func (c *InitDataController) UpdateAllWeiXinRemark() { - c.callUpdateAllWeiXinRemark(func(params *tInitdataUpdateAllWeiXinRemarkParams) (retVal interface{}, errCode string, err error) { +func (c *TempOpController) UpdateAllWeiXinRemark() { + c.callUpdateAllWeiXinRemark(func(params *tTempopUpdateAllWeiXinRemarkParams) (retVal interface{}, errCode string, err error) { retVal, err = tempop.UpdateAllWeiXinRemark(params.Ctx, params.IsAsync, params.IsContinueWhenError) return retVal, "", err }) } + +// @Title XXXX +// @Description XXXX +// @Param token header string true "认证token" +// @Param isAsync formData bool false "是否异步操作" +// @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /RetrieveEbaiShopLicence [post] +func (c *TempOpController) RetrieveEbaiShopLicence() { + c.callRetrieveEbaiShopLicence(func(params *tTempopRetrieveEbaiShopLicenceParams) (retVal interface{}, errCode string, err error) { + retVal, err = tempop.RetrieveEbaiShopLicence(params.Ctx, params.IsAsync, params.IsContinueWhenError) + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index a095b3c6b..d665663ce 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -412,15 +412,6 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"], - beego.ControllerComments{ - Method: "PrintMsg", - Router: `/PrintMsg`, - AllowHTTPMethods: []string{"post"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"], beego.ControllerComments{ Method: "PullJdOrder", @@ -466,15 +457,6 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"], - beego.ControllerComments{ - Method: "UpdateAllWeiXinRemark", - Router: `/UpdateAllWeiXinRemark`, - AllowHTTPMethods: []string{"post"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:InitDataController"], beego.ControllerComments{ Method: "UploadEbaiImg4SkuName", @@ -1258,6 +1240,33 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"], + beego.ControllerComments{ + Method: "PrintMsg", + Router: `/PrintMsg`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"], + beego.ControllerComments{ + Method: "RetrieveEbaiShopLicence", + Router: `/RetrieveEbaiShopLicence`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"], + beego.ControllerComments{ + Method: "UpdateAllWeiXinRemark", + Router: `/UpdateAllWeiXinRemark`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"], beego.ControllerComments{ Method: "GetBindAuthInfo", diff --git a/routers/router.go b/routers/router.go index 0ae09d9c8..72a2a7e2d 100644 --- a/routers/router.go +++ b/routers/router.go @@ -96,6 +96,11 @@ func init() { &controllers.DDAPIController{}, ), ), + beego.NSNamespace("/tempop", + beego.NSInclude( + &controllers.TempOpController{}, + ), + ), ) beego.AddNamespace(ns)