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

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-11 09:09:31 +08:00
parent 1628d5cf0e
commit 5cb534a4a7
1 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/partner/purchase/tao_vegetable/order.go
View File

@@ -641,6 +641,17 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
// CancelOrder 商户取消订单(取消订单全部商品) // CancelOrder 商户取消订单(取消订单全部商品)
func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
if order.Status < model.OrderStatusEndBegin {
// 发送取消状态,商户取消
err = api.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{
WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
StoreId: utils.String2Pointer(order.VendorStoreID),
BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
Status: utils.String2Pointer(tao_vegetable.OrderStatusMerchantCancel),
},
})
} else {
localSkuList, _ := dao.GetSimpleOrderSkus(dao.GetDB(), order.VendorOrderID, nil) localSkuList, _ := dao.GetSimpleOrderSkus(dao.GetDB(), order.VendorOrderID, nil)
skuMap := make(map[string]*model.OrderSku, 0) skuMap := make(map[string]*model.OrderSku, 0)
for _, v := range localSkuList { for _, v := range localSkuList {
@@ -677,22 +688,13 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
Memo: utils.String2Pointer(reason), Memo: utils.String2Pointer(reason),
SubRefundOrders: &outSubOrderIds, SubRefundOrders: &outSubOrderIds,
RefundReason: utils.String2Pointer(reason), RefundReason: utils.String2Pointer(reason),
OrderFrom: utils.Int64ToPointer(tao_vegetable.ChannelCome),
}, },
} }
if err = api.PartialRefund(param); err == nil { if err = api.PartialRefund(param); err == nil {
c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusMerchantCancel, tao_vegetable.OrderStatusMerchantCancel) c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusMerchantCancel, tao_vegetable.OrderStatusMerchantCancel)
} }
if order.Status < model.OrderStatusEndBegin {
// 发送取消状态,商户取消
err = api.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{
WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
StoreId: utils.String2Pointer(order.VendorStoreID),
BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
Status: utils.String2Pointer(tao_vegetable.OrderStatusMerchantCancel),
},
})
} }
return err return err
} }