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

1

Browse Source
This commit is contained in:
邹宗楠
2022-07-25 10:09:37 +08:00
parent 9a3c23cb93
commit dd77bc44b9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/financial/financial.go
View File

@@ -283,7 +283,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
return err return err
} }
userOrder := model.UserVendorOrder{LocalWayBill: order.OrderID} 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) dao.Rollback(db, txdb)
return err return err
} }
@@ -296,7 +296,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
if call.TrxStatus == tonglianpayapi.TrxStatusSuccess { if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
switch order.OrderType { switch order.OrderType {
case model.PayType4Express: case model.PayType4Express:
err = q_bida.CreateOrder2QBiDa(&userOrder) err = q_bida.CreateOrder2QBiDa(&userOrder, order.OrderID)
case model.PayType4Member, model.PayType4Recharge: case model.PayType4Member, model.PayType4Recharge:
err = OnPayFinished(order) err = OnPayFinished(order)
} }

4
business/q_bida/q_bida_server.go
View File

@@ -336,7 +336,7 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa
} }
// CreateOrder2QBiDa 订单回调成功，且为运费支付时使用该接口 // CreateOrder2QBiDa 订单回调成功，且为运费支付时使用该接口
func CreateOrder2QBiDa(order *model.UserVendorOrder) error { func CreateOrder2QBiDa(order *model.UserVendorOrder, orderId string) error {
//// 加载订单 //// 加载订单
//order := &model.UserVendorOrder{} //order := &model.UserVendorOrder{}
//sql := `SELECT * FROM user_vendor_order WHERE local_way_bill = ? ` //sql := `SELECT * FROM user_vendor_order WHERE local_way_bill = ? `
@@ -384,10 +384,10 @@ func CreateOrder2QBiDa(order *model.UserVendorOrder) error {
makeOrder.ReceivePhone = receiveAddress.ConsigneeMobile makeOrder.ReceivePhone = receiveAddress.ConsigneeMobile
otherId, err := createOtherOrder(makeOrder) otherId, err := createOtherOrder(makeOrder)
if err != nil { if err != nil {
order.ErrorMsg = err.Error()
globals.SugarLogger.Debug("err==========", err) globals.SugarLogger.Debug("err==========", err)
} }
globals.SugarLogger.Debug("otherId==========", otherId) globals.SugarLogger.Debug("otherId==========", otherId)
order.ErrorMsg = err.Error()
order.OtherWayBill = otherId order.OtherWayBill = otherId
order.OrderStatus = model.OrderStatusWaitPickup order.OrderStatus = model.OrderStatusWaitPickup
order.UpdatedAt = time.Now() order.UpdatedAt = time.Now()