This commit is contained in:
richboo111
2022-08-04 14:43:18 +08:00
parent 8f9e334e0b
commit 3af95bd88f

View File

@@ -222,6 +222,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
return nil, "更新user_vendor_order状态失败", err return nil, "更新user_vendor_order状态失败", err
} }
dao.Commit(db, txDB)
//再次从数据库获取order、userOrder //再次从数据库获取order、userOrder
orderNew, err := dao.GetOrderByID(db, orderID) orderNew, err := dao.GetOrderByID(db, orderID)
if err != nil { if err != nil {
@@ -234,13 +235,14 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
} }
globals.SugarLogger.Debug("再次获取user_vendor_order数据进行检验", userOrder.OrderStatus) globals.SugarLogger.Debug("再次获取user_vendor_order数据进行检验", userOrder.OrderStatus)
//快递单 同步到qbd //快递单 同步到qbd
globals.SugarLogger.Debug("输出一下", orderInfo.Status, userOrder.OrderStatus)
if orderInfo.Status == 110 && userOrder.OrderStatus == 4 { if orderInfo.Status == 110 && userOrder.OrderStatus == 4 {
globals.SugarLogger.Debug("进入qbd创建订单流程") globals.SugarLogger.Debug("进入qbd创建订单流程")
if err := q_bida.CreateOrder2QBiDa(userOrder, orderInfo.OrderID); err != nil { if err := q_bida.CreateOrder2QBiDa(userOrder, orderInfo.OrderID); err != nil {
return nil, "", err return nil, "", err
} }
} }
dao.Commit(db, txDB)
} }
if isChoose == Choose { if isChoose == Choose {
//1用户不使用余额或者余额=0 即直接微信支付 //1用户不使用余额或者余额=0 即直接微信支付