diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 08e731180..9c1310336 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") @@ -82,7 +85,16 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } else if dao.IsNoRowsError(err) { // 直接找不到，尝试unionID if unionID != "" || openID != "" { // 且有unionID var authBindList []*model.AuthBind - if authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil); err == nil && len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 + globals.SugarLogger.Debug("输出一下", unionAuthTypeList) + 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] authBind.Type = curAuthType authBind.TypeID = curAuthTypeID @@ -93,16 +105,20 @@ 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) { err = nil } + globals.SugarLogger.Debug("输出一下authBindList", authBindList) //空的 } else { err = nil } } if err == nil && authBindEx == nil { //如果没有报错，且没有找到一个认证方式，创建无用户（UserID为空）的认证方式 + globals.SugarLogger.Debug("没有找到一个认证方式") authBindEx = &auth2.AuthBindEx{ AuthBind: model.AuthBind{ Type: curAuthType, @@ -111,6 +127,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/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 10181a85f..4fdd2976b 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,6 +45,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri sql += " AND t1.bind_type = ?" sqlParams = append(sqlParams, bindType) } + if len(typeList) > 0 { sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" sqlParams = append(sqlParams, typeList) @@ -62,5 +64,10 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri } sql += " ORDER BY t1.type" err = GetRows(db, &authList, sql, sqlParams...) + globals.SugarLogger.Debug("输出一下sql", sql) + globals.SugarLogger.Debug("authList==================", authList) + globals.SugarLogger.Debug("param==================", sqlParams) + globals.SugarLogger.Debug("err==================", err) + globals.SugarLogger.Debug("err==================", err) return authList, err } diff --git a/business/model/dao/dao_utils.go b/business/model/dao/dao_utils.go index eaca61326..3144a5e29 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,8 @@ func GenQuestionMarks(count int) (marks string) { marks = builder.String() } } + result := string(marks) + globals.SugarLogger.Debug("输出一下marks", result) return marks } diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index d9149d38a..6750b6dc9 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -641,12 +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 { - //售后同意多次取消 - if order.Status > model.OrderStatusEndBegin { - err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID) - } else { - err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) - } + err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) } 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 2d6595b90..9149dbfe2 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -220,7 +220,7 @@ 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 { @@ -240,6 +240,7 @@ 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) } @@ -248,7 +249,14 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G if globals.EnableEbaiStoreWrite { //售后部分多次退款 if order.Status > model.OrderStatusEndBegin { - if err := api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID); err != nil { + //获取afsOrder + var afsOrderInfo *model.AfsOrder + result, err := api.EbaiAPI.OrderPartRefundGet(order.VendorOrderID) + if err != nil { + return err + } + afsOrderInfo = CurPurchaseHandler.AfsOrderDetail2Financial(result) + if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil { return err } } else { 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 }