From d65f1066ea706093189eb447ecd695c8ea8e728a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Aug 2022 13:46:00 +0800 Subject: [PATCH 01/34] =?UTF-8?q?dd=E6=89=AB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/defauther.go | 3 +++ business/auth2/authprovider/dingding/qrcode.go | 1 + controllers/auth2.go | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 08e731180..db2801b72 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -103,6 +103,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } } if err == nil && authBindEx == nil { //如果没有报错，且没有找到一个认证方式，创建无用户（UserID为空）的认证方式 + globals.SugarLogger.Debug("没有找到一个认证方式") authBindEx = &auth2.AuthBindEx{ AuthBind: model.AuthBind{ Type: curAuthType, @@ -111,6 +112,8 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu AuthID2: unionID, }, } + globals.SugarLogger.Debug("输出一下authBindEx", authBindEx) + globals.SugarLogger.Debug("===================再输出一下authBind", authBind) if authDetail != nil { authBindEx.DetailData = string(utils.MustMarshal(authDetail)) } diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index 8e84d4a35..7d78ac6b1 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -30,6 +30,7 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil { authBindEx.UserHint = &auth2.UserBasic{ Name: userQRInfo.Nickname, + //UserID: userQRInfo., } } } diff --git a/controllers/auth2.go b/controllers/auth2.go index e0593cf24..f9c355468 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -256,7 +256,7 @@ func (c *Auth2Controller) WeixinMPOAuth2() { // @Param state query string false "微信回调的登录状态" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /DingDingOAuth2 [get] +// @router pay [get] func (c *Auth2Controller) DingDingOAuth2() { var ( redirectURL string From 443505d322602856beabe96b112178852cbf19be Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Aug 2022 14:27:09 +0800 Subject: [PATCH 02/34] refund --- business/partner/purchase/ebai/order_afs.go | 16 +++++++++++----- controllers/auth2.go | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 2d6595b90..860ccb875 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -220,12 +220,13 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *ebaiapi.CallbackMsg) (order return orderStatus } -// 审核售后单申请 +// 审核售后单申请 全额退单 func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) { if globals.EnableEbaiStoreWrite { if approveType == partner.AfsApproveTypeRefused { err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason) } else { + err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID) } } @@ -239,16 +240,21 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord } // 发起全款退款 -func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { - return c.PartRefundOrder(ctx, order, order.Skus, reason) +func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, afsOrder *model.AfsOrder, reason string) (err error) { + //售后退单 部分/全部 + if order.Status > model.OrderStatusEndBegin { + return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason) + } else { + return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason) + } } // 发起部分退款 售后/售中 -func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) { +func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, afsOrder *model.AfsOrder, refundSkuList2 []*model.OrderSkuFinancial, reason string) (err error) { if globals.EnableEbaiStoreWrite { //售后部分多次退款 if order.Status > model.OrderStatusEndBegin { - if err := api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID); err != nil { + if err := api.EbaiAPI.OrderAgreePartRefund(afsOrder.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrder.AfsOrderID); err != nil { return err } } else { diff --git a/controllers/auth2.go b/controllers/auth2.go index f9c355468..e0593cf24 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -256,7 +256,7 @@ func (c *Auth2Controller) WeixinMPOAuth2() { // @Param state query string false "微信回调的登录状态" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router pay [get] +// @router /DingDingOAuth2 [get] func (c *Auth2Controller) DingDingOAuth2() { var ( redirectURL string From 831093fbd4d708a33ffdc102dd72064c92282ff2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Aug 2022 15:57:43 +0800 Subject: [PATCH 03/34] refund --- business/partner/purchase/ebai/order.go | 11 ++++---- business/partner/purchase/ebai/order_afs.go | 29 +++++++++++++++------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index d9149d38a..5d47cc607 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -642,11 +642,12 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod if globals.EnableEbaiStoreWrite { if isAgree { //售后同意多次取消 - if order.Status > model.OrderStatusEndBegin { - err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID) - } else { - err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) - } + err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) + //if order.Status > model.OrderStatusEndBegin { + // err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID) + //} else { + // + //} } else { err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason) } diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 860ccb875..055ce7031 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -240,21 +240,34 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord } // 发起全款退款 -func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, afsOrder *model.AfsOrder, reason string) (err error) { +func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { //售后退单 部分/全部 - if order.Status > model.OrderStatusEndBegin { - return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason) - } else { - return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason) - } + return c.PartRefundOrder(ctx, order, order.Skus, reason) } // 发起部分退款 售后/售中 -func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, afsOrder *model.AfsOrder, refundSkuList2 []*model.OrderSkuFinancial, reason string) (err error) { +func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) { if globals.EnableEbaiStoreWrite { //售后部分多次退款 if order.Status > model.OrderStatusEndBegin { - if err := api.EbaiAPI.OrderAgreePartRefund(afsOrder.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrder.AfsOrderID); err != nil { + //获取afsOrder + var afsOrderInfo *model.AfsOrder + result, err := api.EbaiAPI.OrderPartRefundGet(order.VendorOrderID) + if err != nil { + return err + } + afsOrderInfo = CurPurchaseHandler.AfsOrderDetail2Financial(result) + //var param1 []*ebaiapi.RefundSku + //for _, v := range afsOrderInfo.Skus { + // param1 = append(param1, &ebaiapi.RefundSku{ + // SkuID: v.SkuID, + // Upc: v, + // CustomeSkuID: "", + // Number: "", + // }) + //} + + if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil { return err } } else { From b5d186b167ef6b81b4a85c6582251358c49d1370 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Aug 2022 16:10:15 +0800 Subject: [PATCH 04/34] refund --- business/partner/purchase/ebai/order_afs.go | 1 - globals/api/api.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 055ce7031..399ba7ef7 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -266,7 +266,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G // Number: "", // }) //} - if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil { return err } diff --git a/globals/api/api.go b/globals/api/api.go index dcb70038f..bc85275c7 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -288,7 +288,7 @@ func Init() { AliPayAPI = alipayapi.New(alipayAppID, []byte(beego.AppConfig.DefaultString("alipayPrivateKey", ""))) } - FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) + FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", ""), nil) FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", "")) From 3357b0e4b3879360b2f6ab85750e38167eccd6a1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Aug 2022 16:32:17 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E2=80=9D1=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- globals/api/api.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index bc85275c7..547b0e2ab 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -2,7 +2,6 @@ package api import ( enterprise "git.rosy.net.cn/baseapi/platformapi/enterprise_wechat" - gomei "git.rosy.net.cn/baseapi/platformapi/gome_live_show" "git.rosy.net.cn/baseapi/platformapi/jxprintapi" "git.rosy.net.cn/baseapi/platformapi/qywxapi" "git.rosy.net.cn/baseapi/platformapi/tiktok" @@ -113,7 +112,7 @@ var ( SMSClient *aliyunsmsclient.SmsClient TiktokApi *tiktok.API // 抖音api - GuoMeiApi *gomei.API // 国美api + //GuoMeiApi *gomei.API // 国美api EnterpriseChatHeadApi *enterprise.API // 企业微信api EnterpriseChatMin *enterprise.API // 企业微信小程序api @@ -288,7 +287,7 @@ func Init() { AliPayAPI = alipayapi.New(alipayAppID, []byte(beego.AppConfig.DefaultString("alipayPrivateKey", ""))) } - FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", ""), nil) + FnAPI = fnpsapi.New(beego.AppConfig.DefaultString("fnAppID", ""), beego.AppConfig.DefaultString("fnAppSecret", ""), beego.AppConfig.DefaultString("fnMerchantId", ""), beego.AppConfig.DefaultString("fnCode", "")) FeieAPI = feieapi.New(beego.AppConfig.DefaultString("feieUser", ""), beego.AppConfig.DefaultString("feieKey", "")) XiaoWMAPI = xiaowmapi.New(beego.AppConfig.DefaultInt("xiaoWMAppID", 0), beego.AppConfig.DefaultString("xiaoWMAppKey", "")) YilianyunAPI = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID", ""), beego.AppConfig.DefaultString("yilianyunClientSecret", "")) @@ -302,7 +301,7 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) // 国美aip - GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") + //GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") EnterpriseChatHeadApi = enterprise.New("ww9a156bfa070e1857", "0jBdCjSmoFiOoHIXyeCK9VbGQ82fVNJZ8uMl6JNN7X4") // 通讯录 EnterpriseChatMin = enterprise.NewMin("ww9a156bfa070e1857", "JQsEmSTltHhNgdPIT320YJFphiYmRs-YZa-rCBwplss") // 小程序 } From 1893f698c376df5afe4f952f991b9f676631b651 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 9 Aug 2022 16:33:45 +0800 Subject: [PATCH 06/34] 1 --- globals/api/api.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index 547b0e2ab..dcb70038f 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -2,6 +2,7 @@ package api import ( enterprise "git.rosy.net.cn/baseapi/platformapi/enterprise_wechat" + gomei "git.rosy.net.cn/baseapi/platformapi/gome_live_show" "git.rosy.net.cn/baseapi/platformapi/jxprintapi" "git.rosy.net.cn/baseapi/platformapi/qywxapi" "git.rosy.net.cn/baseapi/platformapi/tiktok" @@ -112,7 +113,7 @@ var ( SMSClient *aliyunsmsclient.SmsClient TiktokApi *tiktok.API // 抖音api - //GuoMeiApi *gomei.API // 国美api + GuoMeiApi *gomei.API // 国美api EnterpriseChatHeadApi *enterprise.API // 企业微信api EnterpriseChatMin *enterprise.API // 企业微信小程序api @@ -301,7 +302,7 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) // 国美aip - //GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") + GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") EnterpriseChatHeadApi = enterprise.New("ww9a156bfa070e1857", "0jBdCjSmoFiOoHIXyeCK9VbGQ82fVNJZ8uMl6JNN7X4") // 通讯录 EnterpriseChatMin = enterprise.NewMin("ww9a156bfa070e1857", "JQsEmSTltHhNgdPIT320YJFphiYmRs-YZa-rCBwplss") // 小程序 } From 4f997f702292ad3c17a2ca4431a4101071a47bd3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 14:25:31 +0800 Subject: [PATCH 07/34] dd --- business/auth2/authprovider/defauther.go | 1 + business/partner/purchase/ebai/order_afs.go | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index db2801b72..6af89984d 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -98,6 +98,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } else if dao.IsNoRowsError(err) { err = nil } + globals.SugarLogger.Debug("输出一下authBindList", authBindList) } else { err = nil } diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 399ba7ef7..85dc2e921 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -220,13 +220,12 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *ebaiapi.CallbackMsg) (order return orderStatus } -// 审核售后单申请 全额退单 +// 审核售后单申请 退货退款 func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) { if globals.EnableEbaiStoreWrite { if approveType == partner.AfsApproveTypeRefused { err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason) } else { - err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID) } } From 4f595d26308d16cf91bd39a7acd23a77f9721de6 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 14:35:44 +0800 Subject: [PATCH 08/34] dd --- business/auth2/authprovider/defauther.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 6af89984d..18e80688e 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -82,6 +82,8 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } else if dao.IsNoRowsError(err) { // 直接找不到，尝试unionID if unionID != "" || openID != "" { // 且有unionID var authBindList []*model.AuthBind + globals.SugarLogger.Debug("输出一下", unionAuthTypeList) + globals.SugarLogger.Debug("=====================输出一下openID,unionID", openID, unionID) if authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil); err == nil && len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 authBind = authBindList[0] authBind.Type = curAuthType @@ -98,7 +100,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } else if dao.IsNoRowsError(err) { err = nil } - globals.SugarLogger.Debug("输出一下authBindList", authBindList) + globals.SugarLogger.Debug("输出一下authBindList", authBindList) //空的 } else { err = nil } From d7eead39ff9f5a0fa8644c61db88fc99f1d0835c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 14:46:16 +0800 Subject: [PATCH 09/34] dd --- business/model/dao/dao_auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 10181a85f..34cbe095f 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -53,7 +53,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sqlParams = append(sqlParams, authID) } if authID2 != "" { - sql += " AND t1.auth_id2 = ?" + sql += " OR t1.auth_id2 = ?" sqlParams = append(sqlParams, authID2) } if len(typeIDs) > 0 { From 5ad7351b753657143999358148a5c033cc480f5e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 14:52:14 +0800 Subject: [PATCH 10/34] dd --- business/auth2/authprovider/defauther.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 18e80688e..39d9cf4e4 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -83,7 +83,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu if unionID != "" || openID != "" { // 且有unionID var authBindList []*model.AuthBind globals.SugarLogger.Debug("输出一下", unionAuthTypeList) - globals.SugarLogger.Debug("=====================输出一下openID,unionID", openID, unionID) + globals.SugarLogger.Debug("=====================输出一下model.AuthBindTypeAuth,openID,unionID", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID) if authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil); err == nil && len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 authBind = authBindList[0] authBind.Type = curAuthType From 68530da1db9f1b539e289962f88ecf2e221c094d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 14:58:56 +0800 Subject: [PATCH 11/34] dd --- business/model/dao/dao_auth2.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 34cbe095f..5eda1df1b 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -48,14 +48,18 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" sqlParams = append(sqlParams, typeList) } - if authID != "" { - sql += " AND t1.auth_id = ?" - sqlParams = append(sqlParams, authID) - } - if authID2 != "" { - sql += " OR t1.auth_id2 = ?" - sqlParams = append(sqlParams, authID2) + if authID != "" && authID2 != "" { + sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ?)" + sqlParams = append(sqlParams, authID, authID2) } + //if authID != "" { + // sql += " AND t1.auth_id = ?" + // sqlParams = append(sqlParams, authID) + //} + //if authID2 != "" { + // sql += " AND t1.auth_id2 = ?" + // sqlParams = append(sqlParams, authID2) + //} if len(typeIDs) > 0 { sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) From a52658b56b01d71a210a38df42bac7f6c1578465 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:12:50 +0800 Subject: [PATCH 12/34] dd --- business/auth2/authprovider/defauther.go | 3 +++ business/model/dao/dao_auth2.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 39d9cf4e4..9957c9fe7 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -75,6 +75,9 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu if authDetail != nil { authBindEx.DetailData = string(utils.MustMarshal(authDetail)) } + globals.SugarLogger.Debug("检查一下数据样式===================", authBindEx) + globals.SugarLogger.Debug("检查一下数据样式===================", authDetail) + globals.SugarLogger.Debug("检查一下数据样式===================", authBindEx.DetailData) if authBind.TypeID == "" { authBind.TypeID = curAuthTypeID dao.UpdateEntity(db, authBind, "TypeID") diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 5eda1df1b..ecf9d9263 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -48,7 +48,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" sqlParams = append(sqlParams, typeList) } - if authID != "" && authID2 != "" { + if authID != "" || authID2 != "" { sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ?)" sqlParams = append(sqlParams, authID, authID2) } From 448db81bf19d2d5ab34883aff003ece98da3aaea Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:20:08 +0800 Subject: [PATCH 13/34] dd --- business/model/dao/dao_auth2.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index ecf9d9263..a944f63b0 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -36,10 +36,10 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri utils.DefaultTimeValue, model.UserStatusNormal, } - if userID != "" { - sql += " AND t1.user_id = ?" - sqlParams = append(sqlParams, userID) - } + //if userID != "" { + // sql += " AND t1.user_id = ?" + // sqlParams = append(sqlParams, userID) + //} if bindType != model.AuthBindTypeAll { sql += " AND t1.bind_type = ?" sqlParams = append(sqlParams, bindType) @@ -48,9 +48,9 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" sqlParams = append(sqlParams, typeList) } - if authID != "" || authID2 != "" { - sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ?)" - sqlParams = append(sqlParams, authID, authID2) + if authID != "" || authID2 != "" || userID != "" { + sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" + sqlParams = append(sqlParams, authID, authID2, userID) } //if authID != "" { // sql += " AND t1.auth_id = ?" From a065dc50f4f621feb4869af70049358b8693049e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:26:09 +0800 Subject: [PATCH 14/34] dd --- business/model/dao/dao_auth2.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index a944f63b0..51a9e8d68 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -2,6 +2,7 @@ package dao import ( "errors" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" @@ -44,10 +45,12 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.bind_type = ?" sqlParams = append(sqlParams, bindType) } + globals.SugarLogger.Debug("输出一下传入的GenQuestionMarks(len(typeList))", GenQuestionMarks(len(typeList))) if len(typeList) > 0 { sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" sqlParams = append(sqlParams, typeList) } + globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2, userID) if authID != "" || authID2 != "" || userID != "" { sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" sqlParams = append(sqlParams, authID, authID2, userID) @@ -60,6 +63,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri // sql += " AND t1.auth_id2 = ?" // sqlParams = append(sqlParams, authID2) //} + globals.SugarLogger.Debug("输出一下传入的GenQuestionMarks(len(typeIDs))", GenQuestionMarks(len(typeIDs))) if len(typeIDs) > 0 { sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) From ed5bf43e7aabad00a01f0c4c881c524a93fce7f9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:29:56 +0800 Subject: [PATCH 15/34] dd --- business/model/dao/dao_auth2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 51a9e8d68..26009299e 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -69,6 +69,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sqlParams = append(sqlParams, typeIDs) } sql += " ORDER BY t1.type" + globals.SugarLogger.Debug("输出一下sql", sql) err = GetRows(db, &authList, sql, sqlParams...) return authList, err } From 1cb82cb4e9341fd44e62a69cbb56a9d89d05a637 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:39:20 +0800 Subject: [PATCH 16/34] dd --- business/model/dao/dao_utils.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/model/dao/dao_utils.go b/business/model/dao/dao_utils.go index eaca61326..486faa671 100644 --- a/business/model/dao/dao_utils.go +++ b/business/model/dao/dao_utils.go @@ -2,6 +2,7 @@ package dao import ( "fmt" + "git.rosy.net.cn/jx-callback/globals" "reflect" "strings" "time" @@ -97,6 +98,7 @@ func GenQuestionMarks(count int) (marks string) { marks = builder.String() } } + globals.SugarLogger.Debug("输出一下marks", marks) return marks } From ad22eebee80636c320b3f1c954b3a4bd3f104906 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:42:52 +0800 Subject: [PATCH 17/34] dd --- business/model/dao/dao_utils.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/model/dao/dao_utils.go b/business/model/dao/dao_utils.go index 486faa671..3144a5e29 100644 --- a/business/model/dao/dao_utils.go +++ b/business/model/dao/dao_utils.go @@ -98,7 +98,8 @@ func GenQuestionMarks(count int) (marks string) { marks = builder.String() } } - globals.SugarLogger.Debug("输出一下marks", marks) + result := string(marks) + globals.SugarLogger.Debug("输出一下marks", result) return marks } From ce7a72019268abd6c7dd2d95fbd1f75902f319e7 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:46:20 +0800 Subject: [PATCH 18/34] dd --- business/model/dao/dao_auth2.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 26009299e..8dcd99756 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -46,10 +46,10 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sqlParams = append(sqlParams, bindType) } globals.SugarLogger.Debug("输出一下传入的GenQuestionMarks(len(typeList))", GenQuestionMarks(len(typeList))) - if len(typeList) > 0 { - sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" - sqlParams = append(sqlParams, typeList) - } + //if len(typeList) > 0 { + // sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" + // sqlParams = append(sqlParams, typeList) + //} globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2, userID) if authID != "" || authID2 != "" || userID != "" { sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" From 89d233e1cba244b219d69181caa8adf7d9241ec6 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 15:51:20 +0800 Subject: [PATCH 19/34] dd --- business/model/dao/dao_auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 8dcd99756..f8f5420ff 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -52,7 +52,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri //} globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2, userID) if authID != "" || authID2 != "" || userID != "" { - sql += "AND (t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" + sql += " AND (t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" sqlParams = append(sqlParams, authID, authID2, userID) } //if authID != "" { From e3ab7f68cd71eb1eb7ac332b03df33f53db80831 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:14:51 +0800 Subject: [PATCH 20/34] dd --- business/auth2/authprovider/defauther.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 9957c9fe7..d0e89c3ea 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -98,6 +98,8 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu authBindEx = &auth2.AuthBindEx{ AuthBind: *authBind, } + globals.SugarLogger.Debug("输出赋值后的authBind.DetailData", authBind.DetailData) + globals.SugarLogger.Debug("输出赋值后的authBindEx", authBindEx) a.UnbindAuth(authBind.UserID, curAuthType, curAuthTypeID, model.AdminName) err = a.AddAuthBind(authBindEx, model.AdminName) // 自动绑定 } else if dao.IsNoRowsError(err) { From 24668d4917e627ecfbbbf5840ee3597eaaa690ae Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:26:52 +0800 Subject: [PATCH 21/34] dd --- business/auth2/authprovider/defauther.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index d0e89c3ea..7c914cbf0 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -88,6 +88,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu globals.SugarLogger.Debug("输出一下", unionAuthTypeList) globals.SugarLogger.Debug("=====================输出一下model.AuthBindTypeAuth,openID,unionID", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID) if authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil); err == nil && len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 + globals.SugarLogger.Debug("进入authBindList, err = dao.GetUserBindAuthInfo 这里了") authBind = authBindList[0] authBind.Type = curAuthType authBind.TypeID = curAuthTypeID From c9a6f0f07080be5b49b0dd35ae1ea1a679db19bb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:32:40 +0800 Subject: [PATCH 22/34] dd --- business/auth2/authprovider/defauther.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 7c914cbf0..cfbc9c8cb 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -87,7 +87,11 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu var authBindList []*model.AuthBind globals.SugarLogger.Debug("输出一下", unionAuthTypeList) globals.SugarLogger.Debug("=====================输出一下model.AuthBindTypeAuth,openID,unionID", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID) - if authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil); err == nil && len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 + authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil) + if err != nil { + return nil, err + } + if len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 globals.SugarLogger.Debug("进入authBindList, err = dao.GetUserBindAuthInfo 这里了") authBind = authBindList[0] authBind.Type = curAuthType From 8da1acb94664a068471651bbd2ea75899efd2aee Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:37:08 +0800 Subject: [PATCH 23/34] dd --- business/auth2/authprovider/defauther.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index cfbc9c8cb..9c1310336 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -89,8 +89,10 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu globals.SugarLogger.Debug("=====================输出一下model.AuthBindTypeAuth,openID,unionID", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID) authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil) if err != nil { + globals.SugarLogger.Debug("authBindList输出错误", err) return nil, err } + globals.SugarLogger.Debug("检测这个authBindList", authBindList) if len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 globals.SugarLogger.Debug("进入authBindList, err = dao.GetUserBindAuthInfo 这里了") authBind = authBindList[0] From 1fbc1c7107776023359a06ef601a9df84aea24bf Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:44:49 +0800 Subject: [PATCH 24/34] dd --- business/model/dao/dao_auth2.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index f8f5420ff..f3c99a8e6 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -33,6 +33,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri SELECT * FROM auth_bind t1 WHERE t1.deleted_at = ? AND t1.status = ?` + globals.SugarLogger.Debug("输出一下传入的utils.DefaultTimeValue，model.UserStatusNormal", utils.DefaultTimeValue, model.UserStatusNormal) sqlParams := []interface{}{ utils.DefaultTimeValue, model.UserStatusNormal, @@ -41,11 +42,12 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri // sql += " AND t1.user_id = ?" // sqlParams = append(sqlParams, userID) //} + globals.SugarLogger.Debug("输出一下传入的bindType", bindType) if bindType != model.AuthBindTypeAll { sql += " AND t1.bind_type = ?" sqlParams = append(sqlParams, bindType) } - globals.SugarLogger.Debug("输出一下传入的GenQuestionMarks(len(typeList))", GenQuestionMarks(len(typeList))) + //if len(typeList) > 0 { // sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" // sqlParams = append(sqlParams, typeList) @@ -65,6 +67,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri //} globals.SugarLogger.Debug("输出一下传入的GenQuestionMarks(len(typeIDs))", GenQuestionMarks(len(typeIDs))) if len(typeIDs) > 0 { + globals.SugarLogger.Debug("我进来了typeID") sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) } From 4bfc4b8e75b5d42a767cafe146fa76aadbe1856a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:51:21 +0800 Subject: [PATCH 25/34] dd --- business/model/dao/dao_auth2.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index f3c99a8e6..67d9e9fa8 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -54,7 +54,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri //} globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2, userID) if authID != "" || authID2 != "" || userID != "" { - sql += " AND (t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" + sql += " AND ( t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" sqlParams = append(sqlParams, authID, authID2, userID) } //if authID != "" { @@ -74,5 +74,6 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " ORDER BY t1.type" globals.SugarLogger.Debug("输出一下sql", sql) err = GetRows(db, &authList, sql, sqlParams...) + globals.SugarLogger.Debug("authList==================", authList) return authList, err } From 240d40ce413696b78b12fd11009acedac4dfc1f2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 16:55:13 +0800 Subject: [PATCH 26/34] dd --- business/model/dao/dao_auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 67d9e9fa8..15e2e47a9 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -73,7 +73,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri } sql += " ORDER BY t1.type" globals.SugarLogger.Debug("输出一下sql", sql) - err = GetRows(db, &authList, sql, sqlParams...) + err = GetRow(db, &authList, sql, sqlParams...) globals.SugarLogger.Debug("authList==================", authList) return authList, err } From 7203690aa7261be2a649b18ee2d2ada38c0f9c60 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 17:01:36 +0800 Subject: [PATCH 27/34] dd --- business/model/dao/dao_auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 15e2e47a9..9b4b31d59 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -73,7 +73,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri } sql += " ORDER BY t1.type" globals.SugarLogger.Debug("输出一下sql", sql) - err = GetRow(db, &authList, sql, sqlParams...) + err = GetRows(db, authList, sql, sqlParams) globals.SugarLogger.Debug("authList==================", authList) return authList, err } From 59838111662f86674c1bdc44192e5561deb80098 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 17:01:52 +0800 Subject: [PATCH 28/34] dd --- business/model/dao/dao_auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 9b4b31d59..b641fa575 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -73,7 +73,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri } sql += " ORDER BY t1.type" globals.SugarLogger.Debug("输出一下sql", sql) - err = GetRows(db, authList, sql, sqlParams) + err = GetRows(db, &authList, sql, sqlParams) globals.SugarLogger.Debug("authList==================", authList) return authList, err } From 42ee03765ef940f356afbc5b6a3872f199e0bd8d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 17:07:17 +0800 Subject: [PATCH 29/34] dd --- business/model/dao/dao_auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index b641fa575..2a3d01174 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -71,7 +71,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) } - sql += " ORDER BY t1.type" + //sql += " ORDER BY t1.type" globals.SugarLogger.Debug("输出一下sql", sql) err = GetRows(db, &authList, sql, sqlParams) globals.SugarLogger.Debug("authList==================", authList) From 3f41d598ecfa4d985a58720786b41ac31564330a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 18:22:21 +0800 Subject: [PATCH 30/34] dd --- business/model/dao/dao_auth2.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 2a3d01174..e9a61a959 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -38,10 +38,10 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri utils.DefaultTimeValue, model.UserStatusNormal, } - //if userID != "" { - // sql += " AND t1.user_id = ?" - // sqlParams = append(sqlParams, userID) - //} + if userID != "" { + sql += " AND t1.user_id = ?" + sqlParams = append(sqlParams, userID) + } globals.SugarLogger.Debug("输出一下传入的bindType", bindType) if bindType != model.AuthBindTypeAll { sql += " AND t1.bind_type = ?" @@ -52,10 +52,10 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri // sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" // sqlParams = append(sqlParams, typeList) //} - globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2, userID) - if authID != "" || authID2 != "" || userID != "" { - sql += " AND ( t1.auth_id = ? OR t1.auth_id2 = ? OR t1.user_id = ? )" - sqlParams = append(sqlParams, authID, authID2, userID) + globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2) + if authID != "" || authID2 != "" { + sql += " AND ( t1.auth_id = ? OR t1.auth_id2 = ? )" + sqlParams = append(sqlParams, authID, authID2) } //if authID != "" { // sql += " AND t1.auth_id = ?" @@ -71,7 +71,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) } - //sql += " ORDER BY t1.type" + sql += " ORDER BY t1.type" globals.SugarLogger.Debug("输出一下sql", sql) err = GetRows(db, &authList, sql, sqlParams) globals.SugarLogger.Debug("authList==================", authList) From 6419ea00de89d259d979945ff657349edfd000a5 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 10 Aug 2022 18:38:01 +0800 Subject: [PATCH 31/34] dd --- business/model/dao/dao_auth2.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index e9a61a959..5786aaeac 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -33,7 +33,6 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri SELECT * FROM auth_bind t1 WHERE t1.deleted_at = ? AND t1.status = ?` - globals.SugarLogger.Debug("输出一下传入的utils.DefaultTimeValue，model.UserStatusNormal", utils.DefaultTimeValue, model.UserStatusNormal) sqlParams := []interface{}{ utils.DefaultTimeValue, model.UserStatusNormal, @@ -42,7 +41,6 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.user_id = ?" sqlParams = append(sqlParams, userID) } - globals.SugarLogger.Debug("输出一下传入的bindType", bindType) if bindType != model.AuthBindTypeAll { sql += " AND t1.bind_type = ?" sqlParams = append(sqlParams, bindType) @@ -52,7 +50,6 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri // sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" // sqlParams = append(sqlParams, typeList) //} - globals.SugarLogger.Debug("输出一下传入的authID，authID2", authID, authID2) if authID != "" || authID2 != "" { sql += " AND ( t1.auth_id = ? OR t1.auth_id2 = ? )" sqlParams = append(sqlParams, authID, authID2) @@ -65,15 +62,16 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri // sql += " AND t1.auth_id2 = ?" // sqlParams = append(sqlParams, authID2) //} - globals.SugarLogger.Debug("输出一下传入的GenQuestionMarks(len(typeIDs))", GenQuestionMarks(len(typeIDs))) if len(typeIDs) > 0 { - globals.SugarLogger.Debug("我进来了typeID") sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) } sql += " ORDER BY t1.type" + err = GetRows(db, &authList, sql, sqlParams...) globals.SugarLogger.Debug("输出一下sql", sql) - err = GetRows(db, &authList, sql, sqlParams) globals.SugarLogger.Debug("authList==================", authList) + globals.SugarLogger.Debug("param==================", sqlParams) + globals.SugarLogger.Debug("err==================", err) + globals.SugarLogger.Debug("err==================", err) return authList, err } From ac465dcc7ba20b3f490968f84d6a0d72e4ce230b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 10:25:13 +0800 Subject: [PATCH 32/34] rollback --- business/model/dao/dao_auth2.go | 26 +++++++++------------ business/partner/purchase/ebai/order.go | 6 ----- business/partner/purchase/ebai/order_afs.go | 9 ------- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 5786aaeac..4fdd2976b 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -46,22 +46,18 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sqlParams = append(sqlParams, bindType) } - //if len(typeList) > 0 { - // sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" - // sqlParams = append(sqlParams, typeList) - //} - if authID != "" || authID2 != "" { - sql += " AND ( t1.auth_id = ? OR t1.auth_id2 = ? )" - sqlParams = append(sqlParams, authID, authID2) + if len(typeList) > 0 { + sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" + sqlParams = append(sqlParams, typeList) + } + if authID != "" { + sql += " AND t1.auth_id = ?" + sqlParams = append(sqlParams, authID) + } + if authID2 != "" { + sql += " AND t1.auth_id2 = ?" + sqlParams = append(sqlParams, authID2) } - //if authID != "" { - // sql += " AND t1.auth_id = ?" - // sqlParams = append(sqlParams, authID) - //} - //if authID2 != "" { - // sql += " AND t1.auth_id2 = ?" - // sqlParams = append(sqlParams, authID2) - //} if len(typeIDs) > 0 { sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sqlParams = append(sqlParams, typeIDs) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 5d47cc607..6750b6dc9 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -641,13 +641,7 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { if globals.EnableEbaiStoreWrite { if isAgree { - //售后同意多次取消 err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) - //if order.Status > model.OrderStatusEndBegin { - // err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID) - //} else { - // - //} } else { err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason) } diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 85dc2e921..9149dbfe2 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -256,15 +256,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G return err } afsOrderInfo = CurPurchaseHandler.AfsOrderDetail2Financial(result) - //var param1 []*ebaiapi.RefundSku - //for _, v := range afsOrderInfo.Skus { - // param1 = append(param1, &ebaiapi.RefundSku{ - // SkuID: v.SkuID, - // Upc: v, - // CustomeSkuID: "", - // Number: "", - // }) - //} if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil { return err } From 21580775c7f34f12f695fe65bebc1b3b67865e57 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 11:28:17 +0800 Subject: [PATCH 33/34] ebai minnum --- business/partner/purchase/ebai/store_sku2.go | 5 +++++ controllers/cms_sync.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 49b285f4e..4fc1a1cf9 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -510,6 +510,11 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE // if storeSku.Upc != "" { // params["upc"] = storeSku.Upc // } + + //测试ebai 目前未考虑称重商品 + if storeSku.MinOrderCount > 0 { + params["minimum"] = utils.Int2Float64(storeSku.MinOrderCount) + } return params } diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go index 4edcdb18e..c3030a9a7 100644 --- a/controllers/cms_sync.go +++ b/controllers/cms_sync.go @@ -31,7 +31,7 @@ type SyncController struct { // @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /SyncStoresSkus [put] +// @router pay [put] func (c *SyncController) SyncStoresSkus() { c.callSyncStoresSkus(func(params *tSyncSyncStoresSkusParams) (retVal interface{}, errCode string, err error) { db := dao.GetDB() From 56bed3d517ec8165fb19e852fe052fa841c9c31d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 11:51:13 +0800 Subject: [PATCH 34/34] ebai minnum --- controllers/cms_sync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go index c3030a9a7..4edcdb18e 100644 --- a/controllers/cms_sync.go +++ b/controllers/cms_sync.go @@ -31,7 +31,7 @@ type SyncController struct { // @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router pay [put] +// @router /SyncStoresSkus [put] func (c *SyncController) SyncStoresSkus() { c.callSyncStoresSkus(func(params *tSyncSyncStoresSkusParams) (retVal interface{}, errCode string, err error) { db := dao.GetDB()