diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 20460608a..340eb7b5a 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1630,6 +1630,17 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int) return "", err } order.Status = model.OrderStatusNew + if order.ActualPayPrice == 0 { + msg, err := jdshop.GetJdsOrder(order.VendorOrderID2) + if err == nil { + if jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment)) == 0 { + order.ActualPayPrice = jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderTotalPrice) + utils.Str2Float64(msg.FreightPrice) - utils.Str2Float64(msg.SellerDiscount)) + } else { + order.ActualPayPrice = jxutils.StandardPrice2Int(utils.Str2Float64(msg.OrderPayment)) + } + order.TotalShopMoney = utils.Float64TwoInt64(float64(order.ActualPayPrice) * jdshopapi.JdsPayPercentage) + } + } } else { order.VendorOrderID2 = order.VendorOrderID order.VendorOrderID = utils.Int64ToStr(jxutils.GenOrderNo()) diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 5814c90e5..9459daa82 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -246,7 +246,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err } billParams, _ := GetDaDaBillParams(dao.GetDB(), order) if result, err := api.DadaAPI.QueryDeliverFee(billParams); err == nil { - if jxutils.StandardPrice2Int(result.Fee) > 10 { + if result.Fee > 10 { buildOrderTo102919(order) } }