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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-23 16:50:29 +08:00
parent b40e508ac2
commit 97a9605712
2 changed files with 111 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1746,99 +1746,99 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// } // }
// } // }
// 京东商城补身份证 // 京东商城补身份证
var ( // var (
storeMaps []*model.StoreMap // storeMaps []*model.StoreMap
db = dao.GetDB() // db = dao.GetDB()
) // )
sql := ` // sql := `
SELECT * from store_map where vendor_id = 5 and deleted_at = '1970-01-01 00:00:00' and vendor_org_code = 2 // 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 // AND store_id = 100117
` // `
dao.GetRows(db, &storeMaps, sql, nil) // dao.GetRows(db, &storeMaps, sql, nil)
// for _, v := range storeMaps { // for _, v := range storeMaps {
task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, // task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*model.StoreMap) // v := batchItemList[0].(*model.StoreMap)
// detail, _ := api.JdShop2API.ShopDetail(utils.Str2Int(v.VendorStoreID)) // detail, _ := api.JdShop2API.ShopDetail(utils.Str2Int(v.VendorStoreID))
// storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2") // storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2")
api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID)) // api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID))
// var ( // var (
// url2 string // url2 string
// idCode string // idCode string
// startTime string // startTime string
// ) // )
// if storeDetail.IDCardFront != "" { // if storeDetail.IDCardFront != "" {
// data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront) // data2, _, _ := jxutils.DownloadFileByURL(storeDetail.IDCardFront)
// fileName := storeDetail.IDCardFront[strings.LastIndex(storeDetail.IDCardFront, "/")+1 : len(storeDetail.IDCardFront)] // fileName := storeDetail.IDCardFront[strings.LastIndex(storeDetail.IDCardFront, "/")+1 : len(storeDetail.IDCardFront)]
// url2, _ = api.JdShop2API.UploadImageNew(data2, fileName) // url2, _ = api.JdShop2API.UploadImageNew(data2, fileName)
// } else { // } else {
// data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg") // data2, _, _ := jxutils.DownloadFileByURL("http://image.jxc4.com/image/a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg")
// fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg" // fileName := "a9bfc170a950ab9a4c76bd10b48b222b.tem.jpg"
// url2, _ = api.JdShop2API.UploadImageNew(data2, fileName) // url2, _ = api.JdShop2API.UploadImageNew(data2, fileName)
// } // }
// if storeDetail.IDCode == "" { // if storeDetail.IDCode == "" {
// idCode = "610126198012230014" // idCode = "610126198012230014"
// } else { // } else {
// idCode = storeDetail.IDCode // idCode = storeDetail.IDCode
// } // }
// if storeDetail.IDValid == "" { // if storeDetail.IDValid == "" {
// startTime = "2013-01-25 00:00:00" // startTime = "2013-01-25 00:00:00"
// } else { // } else {
// startTime = utils.Time2Str(utils.Str2Time(storeDetail.IDValid)) // startTime = utils.Time2Str(utils.Str2Time(storeDetail.IDValid))
// } // }
// ex := storeDetail.IDExpire // ex := storeDetail.IDExpire
// if ex == "" { // if ex == "" {
// ex = utils.Time2Str(utils.Str2Time(storeDetail.IDValid).AddDate(10, 0, 0)) // ex = utils.Time2Str(utils.Str2Time(storeDetail.IDValid).AddDate(10, 0, 0))
// } // }
// if !strings.Contains(ex, "00:00:00") { // if !strings.Contains(ex, "00:00:00") {
// ex += " 00:00:00" // ex += " 00:00:00"
// } // }
// api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{ // api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{
// StoreID: detail.StoreID, // StoreID: detail.StoreID,
// StoreName: detail.StoreName, // StoreName: detail.StoreName,
// CategoryID2: detail.CategoryID2, // CategoryID2: detail.CategoryID2,
// Coordinate: detail.Coordinate, // Coordinate: detail.Coordinate,
// BussinessBeginTime: detail.BussinessBeginTime, // BussinessBeginTime: detail.BussinessBeginTime,
// BussinessEndTime: detail.BussinessEndTime, // BussinessEndTime: detail.BussinessEndTime,
// ImgURL: detail.ImgURL, // ImgURL: detail.ImgURL,
// StorePhone: detail.StorePhone, // StorePhone: detail.StorePhone,
// AddName: detail.AddName, // AddName: detail.AddName,
// AddCode1: detail.AddCode1, // AddCode1: detail.AddCode1,
// AddCode2: detail.AddCode2, // AddCode2: detail.AddCode2,
// AddCode3: detail.AddCode3, // AddCode3: detail.AddCode3,
// CategoryID1: detail.CategoryID1, // CategoryID1: detail.CategoryID1,
// QualificationRequests: []*jdshopapi.QualificationRequests{ // QualificationRequests: []*jdshopapi.QualificationRequests{
// &jdshopapi.QualificationRequests{ // &jdshopapi.QualificationRequests{
// QualificationID: 41, // QualificationID: 41,
// QualificationName: "营业执照", // QualificationName: "营业执照",
// QualificationNo: detail.QualificationInfoTOList[0].QualificationNo, // QualificationNo: detail.QualificationInfoTOList[0].QualificationNo,
// QualificationURL: detail.QualificationInfoTOList[0].QualificationURL, // QualificationURL: detail.QualificationInfoTOList[0].QualificationURL,
// QualificationBusType: 2, // QualificationBusType: 2,
// QualificationBusName: storeDetail.LicenceCorpName, // QualificationBusName: storeDetail.LicenceCorpName,
// StartTime: detail.QualificationInfoTOList[0].StartTime, // StartTime: detail.QualificationInfoTOList[0].StartTime,
// EndingTime: utils.Time2Str(utils.Str2Time(detail.QualificationInfoTOList[0].StartTime).AddDate(10, 0, 0)), // EndingTime: utils.Time2Str(utils.Str2Time(detail.QualificationInfoTOList[0].StartTime).AddDate(10, 0, 0)),
// Time: []string{detail.QualificationInfoTOList[0].StartTime, detail.QualificationInfoTOList[0].EndingTime}, // Time: []string{detail.QualificationInfoTOList[0].StartTime, detail.QualificationInfoTOList[0].EndingTime},
// }, // },
// &jdshopapi.QualificationRequests{ // &jdshopapi.QualificationRequests{
// QualificationID: 42, // QualificationID: 42,
// QualificationName: "身份证件", // QualificationName: "身份证件",
// QualificationNo: detail.QualificationInfoTOList[1].QualificationNo, // QualificationNo: detail.QualificationInfoTOList[1].QualificationNo,
// QualificationURL: detail.QualificationInfoTOList[1].QualificationURL, // QualificationURL: detail.QualificationInfoTOList[1].QualificationURL,
// StartTime: detail.QualificationInfoTOList[1].StartTime, // StartTime: detail.QualificationInfoTOList[1].StartTime,
// EndingTime: detail.QualificationInfoTOList[1].EndingTime, // EndingTime: detail.QualificationInfoTOList[1].EndingTime,
// Time: []string{detail.QualificationInfoTOList[1].StartTime, detail.QualificationInfoTOList[1].EndingTime}, // Time: []string{detail.QualificationInfoTOList[1].StartTime, detail.QualificationInfoTOList[1].EndingTime},
// QualificationNo: idCode, // QualificationNo: idCode,
// QualificationURL: url2, // QualificationURL: url2,
// StartTime: startTime, // StartTime: startTime,
// EndingTime: ex, // EndingTime: ex,
// Time: []string{startTime, ex}, // Time: []string{startTime, ex},
// }, // },
// }, // },
// }) // })
return retVal, err // return retVal, err
}, storeMaps) // }, storeMaps)
tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
task.GetID() // task.GetID()
// var ( // var (
// db = dao.GetDB() // db = dao.GetDB()
// vendorThingIDs []int64 // vendorThingIDs []int64
@@ -1878,6 +1878,18 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// }, storeMaps) // }, storeMaps)
// tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
// _, err = task.GetResult(0) // _, 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 return err
} }

13
business/partner/purchase/jd/jd.go
View File

@@ -2,10 +2,9 @@ package jd
import ( import (
"encoding/json" "encoding/json"
"fmt"
"net/url" "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" "git.rosy.net.cn/jx-callback/business/model/dao"
@@ -125,7 +124,12 @@ func OnTokenChange(values url.Values) {
dao.WrapAddIDCULDEntity(voc2, "jxadmin") dao.WrapAddIDCULDEntity(voc2, "jxadmin")
if err := dao.CreateEntity(db, voc2); err == nil { 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 { } else {
globals.SugarLogger.Debugf("OnTokenChange， 发验证码，但是库里有这个账号了") globals.SugarLogger.Debugf("OnTokenChange， 发验证码，但是库里有这个账号了")
@@ -133,12 +137,9 @@ func OnTokenChange(values url.Values) {
} }
} else { } else {
tokenInfo := &JdToken{} tokenInfo := &JdToken{}
fmt.Println("11111111111111111111", values)
if dataStr := values.Get("token"); dataStr != "" { if dataStr := values.Get("token"); dataStr != "" {
json.Unmarshal([]byte(dataStr), &tokenInfo) json.Unmarshal([]byte(dataStr), &tokenInfo)
} }
fmt.Println("11111111111111111111", values.Get("token"))
fmt.Println("11111111111111111111", utils.Format4Output(tokenInfo, false))
if tokenInfo == nil { if tokenInfo == nil {
return return
} }