diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index 8164070ce..61d782d9a 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -290,29 +290,29 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` sqlParams := []interface{}{req.OriginID} dao.GetRow(dao.GetDB(), &good, sql, sqlParams) - uuPrice, err := getOrderPrice(good) + //uuPrice, err := getOrderPrice(good) globals.SugarLogger.Debugf("uupt OnWaybillMsg good=====%s uuGetPriceErr====%v", utils.Format4Output(good, false), err) param.OrderVendorID = good.VendorID switch req.State { case uuptapi.StateConfirmSuccess: param.Status = model.WaybillStatusNew //5 待调度 - param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) + //param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateRMGrabsOrder: param.Status = model.WaybillStatusCourierAssigned param.Remark = req.DriverName + "," + req.DriverMobile - param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) + //param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateArrivedStore: param.Status = model.WaybillStatusCourierArrived - param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) + //param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StatePickUp: param.Status = model.WaybillStatusUuPickUp - param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) + //param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateArrivedDestination: param.Status = model.WaybillStatusUuArrivedDestination - param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) + //param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateReceiverGetGoods: param.Status = model.WaybillStatusDelivered - param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) + //param.DesiredFee = utils.Str2Int64(uuPrice.NeedPayMoney) case uuptapi.StateOrderCancel: param.Status = model.WaybillStatusCanceled default: