1
This commit is contained in:
@@ -641,6 +641,17 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
|
||||
// CancelOrder 商户取消订单(取消订单全部商品)
|
||||
func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
|
||||
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)
|
||||
skuMap := make(map[string]*model.OrderSku, 0)
|
||||
for _, v := range localSkuList {
|
||||
@@ -677,22 +688,13 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
|
||||
Memo: utils.String2Pointer(reason),
|
||||
SubRefundOrders: &outSubOrderIds,
|
||||
RefundReason: utils.String2Pointer(reason),
|
||||
OrderFrom: utils.Int64ToPointer(tao_vegetable.ChannelCome),
|
||||
},
|
||||
}
|
||||
|
||||
if err = api.PartialRefund(param); err == nil {
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user