diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go index 6c5cb6ebf..9e3eb9c2a 100644 --- a/business/model/dao/dao_user.go +++ b/business/model/dao/dao_user.go @@ -437,12 +437,12 @@ func GetUserUnionBindImg(db *DaoDB, unionID, actID string) (userBinds *model.Use return userBinds, err } func GetUserVendorOrder(db *DaoDB, userID, localWayBill string) (userVendorOrder *model.UserVendorOrder, err error) { - sql := `SELECT * FROM user_vendor_order WHERE ` + sql := `SELECT * FROM user_vendor_order WHERE deleted_at = ? ` sqlParams := []interface{}{ utils.DefaultTimeValue, } if userID != "" { - sql += " user_id = ?" + sql += "AND user_id = ?" sqlParams = append(sqlParams, userID) } if localWayBill != "" { diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index bc5c67e8d..2a4a20d13 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -210,9 +210,9 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd globals.SugarLogger.Debugf("dgergergesgreger== %s ", order.OtherWayBill) globals.SugarLogger.Debugf("hjghauifhwquihfuiojqw== %s ", order.LastOperator) - if err := dao.GetEntity(dao.GetDB(), order, "UserId", "LocalWayBill"); err != nil { - return err - } + //if err := dao.GetEntity(dao.GetDB(), order, "UserId", "LocalWayBill"); err != nil { + // return err + //} globals.SugarLogger.Debugf("sdhgeagqweg344w33qgweag== %s ", order.OtherWayBill) globals.SugarLogger.Debugf("jbhbhjdsgbgjhghiwsg== %s ", order.LastOperator) if time.Now().Unix()-order.CreatedAt.Unix() <= 30 {