From 38ec8490d2c06dac913b6473a49a181304091150 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Mon, 3 Jul 2023 16:59:22 +0800
Subject: [PATCH] wxlogin

---
 business/auth2/authprovider/weixin/weixin.go   | 16 ++++------------
 business/partner/purchase/tao_vegetable/act.go |  4 ++--
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/business/auth2/authprovider/weixin/weixin.go b/business/auth2/authprovider/weixin/weixin.go
index 5fe831d12..86d36126f 100644
--- a/business/auth2/authprovider/weixin/weixin.go
+++ b/business/auth2/authprovider/weixin/weixin.go
@@ -2,6 +2,8 @@ package weixin
 
 import (
 	"errors"
+	"fmt"
+
 	"git.rosy.net.cn/baseapi/platformapi/weixinapi"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider"
@@ -68,18 +70,8 @@ func (a *Auther) VerifySecret(id, secret string) (authBindEx *auth2.AuthBindEx,
 		state := id
 		code := jsCode
 		if state == "" {
-			token, err2 := a.getAPI().SNSRetrieveToken(code)
-			if err = err2; err == nil {
-				openID = token.OpenID
-				accessToken = token.AccessToken
-			}
-		} else {
-			err = ErrStateIsWrong
-		}
-	} else if a.authType == AuthTypeWxApp {
-		state := id
-		code := jsCode
-		if state == "" {
+			temp := a.getAPI()
+			fmt.Printf("secret=%s,appid=%s", temp.GetSecret(), temp.GetAppID())
 			token, err2 := a.getAPI().SNSRetrieveToken(code)
 			if err = err2; err == nil {
 				openID = token.OpenID
diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go
index 4060b335c..9c707ca0a 100644
--- a/business/partner/purchase/tao_vegetable/act.go
+++ b/business/partner/purchase/tao_vegetable/act.go
@@ -259,7 +259,7 @@ func getActStoreSkuFromTaskResult(taskReslt []interface{}) (list []*model.ActSto
 
 func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actStoreSku []*model.ActStoreSku2) (createdList []*model.ActStoreSku2, err error) {
 	actStoreSkuListList := partner.SplitActStoreSku2List(actStoreSku)
-	task := tasksch.NewParallelTask("mtwm createSkuAct", nil, ctx,
+	task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			list := batchItemList[0].([]*model.ActStoreSku2)
 			failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list)
@@ -285,7 +285,7 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A
 
 func cancelSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actStoreSku []*model.ActStoreSku2) (canceledList []*model.ActStoreSku2, err error) {
 	actStoreSkuListList := partner.SplitActStoreSku2List(actStoreSku)
-	task := tasksch.NewParallelTask("mtwm cancelSkuAct", nil, ctx,
+	task := tasksch.NewParallelTask("txd cancelSkuAct", nil, ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			actStoreSkuList := batchItemList[0].([]*model.ActStoreSku2)
 			if _, err = cancelOneShopAct(act, actStoreSkuList[0].VendorStoreID, actStoreSkuList); err == nil {