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

京东售后单修改

Browse Source
This commit is contained in:
苏尹岚
2020-06-27 13:48:23 +08:00
parent 9b7c4c9a42
commit 6e07a0a637
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/order.go
View File

@@ -208,9 +208,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
return err
}
func (c *OrderManager) ChangeOrderInfo(order *model.GoodsOrder, valid map[string]interface{}) (err error) {
func (c *OrderManager) ChangeOrderInfo(order *model.GoodsOrder) (err error) {
db := dao.GetDB()
dao.UpdateEntityLogically(db, order, valid, "jxadmin", nil)
_, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment")
return err
}

2
business/partner/partner.go
View File

@@ -114,7 +114,7 @@ type IOrderManager interface {
GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isNotEnded, isGetPos bool) (bills []*model.WaybillExt, err error)
ChangeOrderInfo(order *model.GoodsOrder, valid map[string]interface{}) (err error)
ChangeOrderInfo(order *model.GoodsOrder (err error)
// afs order
OnAfsOrderAdjust(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error)
OnAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *model.OrderStatus) (err error)

20
business/partner/purchase/jd/order.go
View File

@@ -127,8 +127,8 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
order, _, err := c.getOrder(a, msg.BillID)
if err == nil {
globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID)
valid := orderInfoChangeSet(order, msg)
partner.CurOrderManager.ChangeOrderInfo(order, valid)
orderInfoChangeSet(order, msg)
partner.CurOrderManager.ChangeOrderInfo(order)
}
return retVal
}
@@ -574,25 +574,23 @@ func (c *PurchaseHandler) ConfirmSelfTake(ctx *jxcontext.Context, order *model.G
return err
}
func orderInfoChangeSet(order *model.GoodsOrder, msg *jdapi.CallbackOrderInfoChangeMsg) (valid map[string]interface{}) {
valid = make(map[string]interface{})
func orderInfoChangeSet(order *model.GoodsOrder, msg *jdapi.CallbackOrderInfoChangeMsg) {
if msg.BuyerFullAddress != "" {
valid["consigneeAddress"] = msg.BuyerFullAddress
order.ConsigneeAddress = msg.BuyerFullAddress
}
if msg.BuyerFullName != "" {
valid["consigneeName"] = msg.BuyerFullName
order.ConsigneeName = msg.BuyerFullName
}
if msg.BuyerMobile != "" {
valid["consigneeMobile"] = msg.BuyerMobile
order.ConsigneeMobile = msg.BuyerMobile
}
if msg.BuyerLat != 0 {
valid["consigneeLat"] = jxutils.StandardCoordinate2Int(msg.BuyerLat)
order.ConsigneeLat = jxutils.StandardCoordinate2Int(msg.BuyerLat)
}
if msg.BuyerLng != 0 {
valid["consigneeLng"] = jxutils.StandardCoordinate2Int(msg.BuyerLng)
order.ConsigneeLng = jxutils.StandardCoordinate2Int(msg.BuyerLng)
}
if msg.OrderBuyerRemark != "" {
valid["buyerComment"] = msg.OrderBuyerRemark
order.BuyerComment = msg.OrderBuyerRemark
}
return valid
}

2
business/partner/purchase/jx/order_afs.go
View File

@@ -58,7 +58,7 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
// 发起全款退款
func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
c.PartRefundOrder(ctx, order, order.Skus, reason)
err = c.PartRefundOrder(ctx, order, order.Skus, reason)
return err
}