aa
This commit is contained in:
@@ -225,6 +225,19 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
|
|||||||
}
|
}
|
||||||
dao.UpdateEntity(db, order, "NewEarningPrice")
|
dao.UpdateEntity(db, order, "NewEarningPrice")
|
||||||
}
|
}
|
||||||
|
//美团订单如果有售后的话,订单完成后才能查到售后结算
|
||||||
|
if order.VendorID == model.VendorIDMTWM {
|
||||||
|
if afsOrders, _ := dao.GetAfsOrders(db, order.VendorID, order.VendorOrderID, ""); len(afsOrders) > 0 {
|
||||||
|
for _, v := range afsOrders {
|
||||||
|
if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil {
|
||||||
|
if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, v.VendorOrderID, v.AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 {
|
||||||
|
v.AfsTotalShopMoney = orderAfsInfo.AfsTotalShopMoney
|
||||||
|
}
|
||||||
|
dao.UpdateEntity(db, v, "AfsTotalShopMoney")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if orderStatus.Status == model.OrderStatusCanceled {
|
} else if orderStatus.Status == model.OrderStatusCanceled {
|
||||||
//如果取消订单则要把库存加回去
|
//如果取消订单则要把库存加回去
|
||||||
@@ -1797,9 +1810,9 @@ func UpdateOrderInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int,
|
|||||||
}
|
}
|
||||||
if payload["jxSubsidyMoney"] != nil {
|
if payload["jxSubsidyMoney"] != nil {
|
||||||
jxSubsidyMoney = utils.Interface2Int64WithDefault(payload["jxSubsidyMoney"], 0)
|
jxSubsidyMoney = utils.Interface2Int64WithDefault(payload["jxSubsidyMoney"], 0)
|
||||||
if order.EarningType == model.EarningTypeQuote {
|
//if order.EarningType == model.EarningTypeQuote {
|
||||||
payload["earningPrice"] = order.EarningPrice - order.JxSubsidyMoney + jxSubsidyMoney
|
// payload["earningPrice"] = order.EarningPrice - order.JxSubsidyMoney + jxSubsidyMoney
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
valid := dao.StrictMakeMapByStructObject(payload, order, ctx.GetUserName())
|
valid := dao.StrictMakeMapByStructObject(payload, order, ctx.GetUserName())
|
||||||
if len(valid) > 0 {
|
if len(valid) > 0 {
|
||||||
|
|||||||
Reference in New Issue
Block a user