liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rollback

Browse Source
This commit is contained in:
richboo111
2022-08-11 10:25:13 +08:00
parent 6419ea00de
commit ac465dcc7b
3 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/model/dao/dao_auth2.go
View File

@@ -46,22 +46,18 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri
sqlParams = append(sqlParams, bindType) sqlParams = append(sqlParams, bindType)
} }
//if len(typeList) > 0 { if len(typeList) > 0 {
// sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")" sql += " AND t1.type IN (" + GenQuestionMarks(len(typeList)) + ")"
// sqlParams = append(sqlParams, typeList) sqlParams = append(sqlParams, typeList)
//} }
if authID != "" || authID2 != "" { if authID != "" {
sql += " AND ( t1.auth_id = ? OR t1.auth_id2 = ? )" sql += " AND t1.auth_id = ?"
sqlParams = append(sqlParams, authID, authID2) 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 { if len(typeIDs) > 0 {
sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")" sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")"
sqlParams = append(sqlParams, typeIDs) sqlParams = append(sqlParams, typeIDs)

6
business/partner/purchase/ebai/order.go
View File

@@ -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) { func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) {
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
if isAgree { if isAgree {
//售后同意多次取消
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 { } else {
err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason) err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason)
} }

9
business/partner/purchase/ebai/order_afs.go
View File

@@ -256,15 +256,6 @@ func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.G
return err return err
} }
afsOrderInfo = CurPurchaseHandler.AfsOrderDetail2Financial(result) 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 { if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil {
return err return err
} }