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 }