aa

business/jxstore/tempop/tempop.go

@@ -1746,22 +1746,22 @@ 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 {
-	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))
 	// storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, model.VendorIDJDShop, "2")
-			api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID))
+	// api.JdShop2API.UpdateExpand(utils.Str2Int(v.VendorStoreID))
 	// var (
 	// 	url2      string
 	// 	idCode    string
@@ -1835,10 +1835,10 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		},
 	// 	},
 	// })
-			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 (
 	// 	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
 }
 

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
 		}