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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-10-16 09:31:33 +08:00
parent b4db103d2b e416962084
commit 9aa30437d4
20 changed files with 287 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/jx_order.go
View File

@@ -6,7 +6,6 @@ import (
"fmt"
"git.rosy.net.cn/jx-callback/business/bidding"
"git.rosy.net.cn/jx-callback/business/partner/delivery"
"git.rosy.net.cn/jx-callback/globals"
"strings"
"time"
@@ -872,7 +871,6 @@ func (c *OrderController) PartRefundOrder() {
order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID)
if err == nil {
removedAll, err2 := fillSkuList(skuList, order.Skus)
globals.SugarLogger.Debugf("========removedAll := %v", removedAll)
if err = err2; err == nil {
if removedAll {
err = defsch.FixedScheduler.RefundOrder(params.Ctx, order, params.Reason)

5
controllers/taobao_vegetable.go
View File

@@ -223,8 +223,9 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
return
}
default:
callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder)
c.Data["json"] = callbackResponse
//callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder)
//c.Data["json"] = callbackResponse
c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消"))
c.ServeJSON()
return
}