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:
邹宗楠
2024-07-24 15:25:26 +08:00
parent f09cc25e07
commit 9d73cf1cd0
4 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
business/partner/purchase/mtwm/order.go
View File

@@ -3,6 +3,8 @@ package mtwm
import (
"errors"
"fmt"
push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
"math"
"net/url"
"regexp"
@@ -362,19 +364,42 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
})
}
}
} else if msg.Cmd == mtwmapi.MsgTypeOrderModified {
order, _, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
if err = err2; err == nil {
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
localOrder.ConsigneeName = order.ConsigneeName
localOrder.ConsigneeMobile = order.ConsigneeMobile
localOrder.BuyerComment = order.BuyerComment
localOrder.ExpectedDeliveredTime = order.ExpectedDeliveredTime
localOrder.ConsigneeAddress = order.ConsigneeAddress
localOrder.ConsigneeLat = order.ConsigneeLat
localOrder.ConsigneeLng = order.ConsigneeLng
dao.UpdateEntity(dao.GetDB(), localOrder, "ConsigneeName", "ConsigneeMobile", "BuyerComment", "ExpectedDeliveredTime", "ConsigneeAddress", "ConsigneeLat", "ConsigneeLng")
} else if msg.Cmd == mtwmapi.MsgTypeOrderModified || msg.Cmd == mtwmapi.MsgTypeOrderDeliveryFeeChange {
order, orderObj, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
if err2 == nil {
switch msg.Cmd {
case mtwmapi.MsgTypeOrderModified:
// 推送订单信息变更(可能包含地址变更)
localOrder.ConsigneeName = order.ConsigneeName
localOrder.ConsigneeMobile = order.ConsigneeMobile
localOrder.BuyerComment = order.BuyerComment
localOrder.ExpectedDeliveredTime = order.ExpectedDeliveredTime
localOrder.ConsigneeAddress = order.ConsigneeAddress
localOrder.ConsigneeLat = order.ConsigneeLat
localOrder.ConsigneeLng = order.ConsigneeLng
var changeFee int64 = 0
if addressChangeFee, ok := orderObj["address_change_fee"]; ok {
changeFee = utils.Float64TwoInt64(utils.Str2Float64(utils.Interface2String(addressChangeFee)) * 100)
localOrder.TotalShopMoney += changeFee
}
dao.UpdateEntity(dao.GetDB(), localOrder, "TotalShopMoney", "ConsigneeName", "ConsigneeMobile", "BuyerComment", "ExpectedDeliveredTime", "ConsigneeAddress", "ConsigneeLat", "ConsigneeLng")
weixinmsg.NotifyAdjustOrder(order)
push.NotifyAdjustOrder(order)
partner.CurOrderManager.OnOrderMsg(localOrder, fmt.Sprintf("订单[%s],被用户发起修改,补充运费差价[%d]", order.VendorOrderID, changeFee), "")
case mtwmapi.MsgTypeOrderDeliveryFeeChange:
// 推送自配订单地址变更费退款详情，当订单为自配订单且用户修改地址时支付了地址变更费，如果订单最终流转到了取消状态，当地址变更费退款成功时平台会通过此接口推送退款详情
var changeFee int64 = 0
if addressChangeFee, ok := orderObj["address_change_fee"]; ok {
changeFee = utils.Float64TwoInt64(utils.Str2Float64(utils.Interface2String(addressChangeFee)) * 100)
localOrder.TotalShopMoney -= changeFee
}
dao.UpdateEntity(dao.GetDB(), localOrder, "TotalShopMoney")
partner.CurOrderManager.OnOrderMsg(localOrder, fmt.Sprintf("订单[%s],地址发送改变且订单被取消,返回推送配送差价[%s]元,{接口[%.2f]元}", order.VendorOrderID, msg.FormData.Get("money"), float64(changeFee)/float64(100)), "")
}
}
} else {
if status != nil {
var order *model.GoodsOrder