diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 5d81f52bf..cb222f4c2 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -283,7 +283,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { return err } userOrder := model.UserVendorOrder{LocalWayBill: order.OrderID} - if err := dao.GetEntity(db, &userOrder, `LocalWayBill`); err != nil { + if err := dao.GetEntity(db, &userOrder, "LocalWayBill"); err != nil { dao.Rollback(db, txdb) return err } @@ -296,7 +296,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { switch order.OrderType { case model.PayType4Express: - err = q_bida.CreateOrder2QBiDa(&userOrder) + err = q_bida.CreateOrder2QBiDa(&userOrder, order.OrderID) case model.PayType4Member, model.PayType4Recharge: err = OnPayFinished(order) } diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index 8acb2c4f6..536f4bc50 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -336,7 +336,7 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa } // CreateOrder2QBiDa 订单回调成功,且为运费支付时使用该接口 -func CreateOrder2QBiDa(order *model.UserVendorOrder) error { +func CreateOrder2QBiDa(order *model.UserVendorOrder, orderId string) error { //// 加载订单 //order := &model.UserVendorOrder{} //sql := `SELECT * FROM user_vendor_order WHERE local_way_bill = ? ` @@ -384,10 +384,10 @@ func CreateOrder2QBiDa(order *model.UserVendorOrder) error { makeOrder.ReceivePhone = receiveAddress.ConsigneeMobile otherId, err := createOtherOrder(makeOrder) if err != nil { + order.ErrorMsg = err.Error() globals.SugarLogger.Debug("err==========", err) } globals.SugarLogger.Debug("otherId==========", otherId) - order.ErrorMsg = err.Error() order.OtherWayBill = otherId order.OrderStatus = model.OrderStatusWaitPickup order.UpdatedAt = time.Now()