From 97a96057120934510992f464187d773b986b28f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 23 Mar 2021 16:50:29 +0800 Subject: [PATCH] aa --- business/jxstore/tempop/tempop.go | 196 +++++++++++++++-------------- business/partner/purchase/jd/jd.go | 13 +- 2 files changed, 111 insertions(+), 98 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index cf0116b67..d7ae2daec 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1746,99 +1746,99 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // } // 京东商城补身份证 - var ( - storeMaps []*model.StoreMap - db = dao.GetDB() - ) - sql := ` - SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2 - AND store_id = 100117 - ` - dao.GetRows(db, &storeMaps, sql, nil) + // var ( + // storeMaps []*model.StoreMap + // db = dao.GetDB() + // ) + // sql := ` + // SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2 + // AND store_id = 100117 + // ` + // dao.GetRows(db, &storeMaps, sql, nil) // for _, v := range storeMaps { - task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - v := batchItemList[0].(*model.StoreMap) - // detail, _ := api.JdShop2API.ShopDetail(utils.Str2Int(v.VendorStoreID)) - // storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2") - api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID)) - // var ( - // url2 string - // idCode string - // startTime string - // ) - // if storeDetail.IDCardFront != "" { - // data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront) - // fileName := storeDetail.IDCardFront[strings.LastIndex(storeDetail.IDCardFront, "/")+1 : len(storeDetail.IDCardFront)] - // url2, _ = api.JdShop2API.UploadImageNew(data2, fileName) - // } else { - // data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg") - // fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg" - // url2, _ = api.JdShop2API.UploadImageNew(data2, fileName) - // } - // if storeDetail.IDCode == "" { - // idCode = "610126198012230014" - // } else { - // idCode = storeDetail.IDCode - // } - // if storeDetail.IDValid == "" { - // startTime = "2013-01-25 00:00:00" - // } else { - // startTime = utils.Time2Str(utils.Str2Time(storeDetail.IDValid)) - // } - // ex := storeDetail.IDExpire - // if ex == "" { - // ex = utils.Time2Str(utils.Str2Time(storeDetail.IDValid).AddDate(10, 0, 0)) - // } - // if !strings.Contains(ex, "00:00:00") { - // ex += " 00:00:00" - // } - // api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{ - // StoreID: detail.StoreID, - // StoreName: detail.StoreName, - // CategoryID2: detail.CategoryID2, - // Coordinate: detail.Coordinate, - // BussinessBeginTime: detail.BussinessBeginTime, - // BussinessEndTime: detail.BussinessEndTime, - // ImgURL: detail.ImgURL, - // StorePhone: detail.StorePhone, - // AddName: detail.AddName, - // AddCode1: detail.AddCode1, - // AddCode2: detail.AddCode2, - // AddCode3: detail.AddCode3, - // CategoryID1: detail.CategoryID1, - // QualificationRequests: []*jdshopapi.QualificationRequests{ - // &jdshopapi.QualificationRequests{ - // QualificationID: 41, - // QualificationName: "营业执照", - // QualificationNo: detail.QualificationInfoTOList[0].QualificationNo, - // QualificationURL: detail.QualificationInfoTOList[0].QualificationURL, - // QualificationBusType: 2, - // QualificationBusName: storeDetail.LicenceCorpName, - // StartTime: detail.QualificationInfoTOList[0].StartTime, - // EndingTime: utils.Time2Str(utils.Str2Time(detail.QualificationInfoTOList[0].StartTime).AddDate(10, 0, 0)), - // Time: []string{detail.QualificationInfoTOList[0].StartTime, detail.QualificationInfoTOList[0].EndingTime}, - // }, - // &jdshopapi.QualificationRequests{ - // QualificationID: 42, - // QualificationName: "身份证件", - // QualificationNo: detail.QualificationInfoTOList[1].QualificationNo, - // QualificationURL: detail.QualificationInfoTOList[1].QualificationURL, - // StartTime: detail.QualificationInfoTOList[1].StartTime, - // EndingTime: detail.QualificationInfoTOList[1].EndingTime, - // Time: []string{detail.QualificationInfoTOList[1].StartTime, detail.QualificationInfoTOList[1].EndingTime}, - // QualificationNo: idCode, - // QualificationURL: url2, - // StartTime: startTime, - // EndingTime: ex, - // Time: []string{startTime, ex}, - // }, - // }, - // }) - return retVal, err - }, storeMaps) - tasksch.HandleTask(task, nil, true).Run() - task.GetID() + // task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // v := batchItemList[0].(*model.StoreMap) + // detail, _ := api.JdShop2API.ShopDetail(utils.Str2Int(v.VendorStoreID)) + // storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2") + // api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID)) + // var ( + // url2 string + // idCode string + // startTime string + // ) + // if storeDetail.IDCardFront != "" { + // data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront) + // fileName := storeDetail.IDCardFront[strings.LastIndex(storeDetail.IDCardFront, "/")+1 : len(storeDetail.IDCardFront)] + // url2, _ = api.JdShop2API.UploadImageNew(data2, fileName) + // } else { + // data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg") + // fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg" + // url2, _ = api.JdShop2API.UploadImageNew(data2, fileName) + // } + // if storeDetail.IDCode == "" { + // idCode = "610126198012230014" + // } else { + // idCode = storeDetail.IDCode + // } + // if storeDetail.IDValid == "" { + // startTime = "2013-01-25 00:00:00" + // } else { + // startTime = utils.Time2Str(utils.Str2Time(storeDetail.IDValid)) + // } + // ex := storeDetail.IDExpire + // if ex == "" { + // ex = utils.Time2Str(utils.Str2Time(storeDetail.IDValid).AddDate(10, 0, 0)) + // } + // if !strings.Contains(ex, "00:00:00") { + // ex += " 00:00:00" + // } + // api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{ + // StoreID: detail.StoreID, + // StoreName: detail.StoreName, + // CategoryID2: detail.CategoryID2, + // Coordinate: detail.Coordinate, + // BussinessBeginTime: detail.BussinessBeginTime, + // BussinessEndTime: detail.BussinessEndTime, + // ImgURL: detail.ImgURL, + // StorePhone: detail.StorePhone, + // AddName: detail.AddName, + // AddCode1: detail.AddCode1, + // AddCode2: detail.AddCode2, + // AddCode3: detail.AddCode3, + // CategoryID1: detail.CategoryID1, + // QualificationRequests: []*jdshopapi.QualificationRequests{ + // &jdshopapi.QualificationRequests{ + // QualificationID: 41, + // QualificationName: "营业执照", + // QualificationNo: detail.QualificationInfoTOList[0].QualificationNo, + // QualificationURL: detail.QualificationInfoTOList[0].QualificationURL, + // QualificationBusType: 2, + // QualificationBusName: storeDetail.LicenceCorpName, + // StartTime: detail.QualificationInfoTOList[0].StartTime, + // EndingTime: utils.Time2Str(utils.Str2Time(detail.QualificationInfoTOList[0].StartTime).AddDate(10, 0, 0)), + // Time: []string{detail.QualificationInfoTOList[0].StartTime, detail.QualificationInfoTOList[0].EndingTime}, + // }, + // &jdshopapi.QualificationRequests{ + // QualificationID: 42, + // QualificationName: "身份证件", + // QualificationNo: detail.QualificationInfoTOList[1].QualificationNo, + // QualificationURL: detail.QualificationInfoTOList[1].QualificationURL, + // StartTime: detail.QualificationInfoTOList[1].StartTime, + // EndingTime: detail.QualificationInfoTOList[1].EndingTime, + // Time: []string{detail.QualificationInfoTOList[1].StartTime, detail.QualificationInfoTOList[1].EndingTime}, + // QualificationNo: idCode, + // QualificationURL: url2, + // StartTime: startTime, + // EndingTime: ex, + // Time: []string{startTime, ex}, + // }, + // }, + // }) + // return retVal, err + // }, storeMaps) + // tasksch.HandleTask(task, nil, true).Run() + // task.GetID() // var ( // db = dao.GetDB() // vendorThingIDs []int64 @@ -1878,6 +1878,18 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // }, storeMaps) // tasksch.HandleTask(task, nil, true).Run() // _, err = task.GetResult(0) + //京东账号更新 + var ( + db = dao.GetDB() + ) + result, _ := api.JdAPI.GetJdAppInfo() + if result != nil { + if vocs, _ := dao.GetVendorOrgCode(db, model.VendorIDJD, result.OrgCode, model.VendorOrgTypePlatform); len(vocs) > 0 { + vocs[0].AppKey = result.AppKey + vocs[0].AppSecret = result.AppSecret + dao.UpdateEntity(db, vocs[0], "AppKey", "AppSecret") + } + } return err } diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go index 00cac72f3..79b6b5533 100644 --- a/business/partner/purchase/jd/jd.go +++ b/business/partner/purchase/jd/jd.go @@ -2,10 +2,9 @@ package jd import ( "encoding/json" - "fmt" "net/url" - "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/business/model/dao" @@ -125,7 +124,12 @@ func OnTokenChange(values url.Values) { dao.WrapAddIDCULDEntity(voc2, "jxadmin") if err := dao.CreateEntity(db, voc2); err == nil { //添加成功后去开发者后台填验证码 - + if configs, err := dao.QueryConfigs(dao.GetDB(), "jdConfigCookie", model.ConfigTypeCookie, ""); err == nil { + api.JdAPI.SetCookieWithStr(configs[0].Value) + if appID, err := api.JdAPI.GetJdNoAuthAppID(codeInfo.VenderID); err == nil { + api.JdAPI.SetCode(codeInfo.Code, appID) + } + } } } else { globals.SugarLogger.Debugf("OnTokenChange， 发验证码，但是库里有这个账号了") @@ -133,12 +137,9 @@ func OnTokenChange(values url.Values) { } } else { tokenInfo := &JdToken{} - fmt.Println("11111111111111111111", values) if dataStr := values.Get("token"); dataStr != "" { json.Unmarshal([]byte(dataStr), &tokenInfo) } - fmt.Println("11111111111111111111", values.Get("token")) - fmt.Println("11111111111111111111", utils.Format4Output(tokenInfo, false)) if tokenInfo == nil { return }