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

add

Browse Source
This commit is contained in:
richboo111
2022-07-27 10:48:29 +08:00
parent e2b3637d9a
commit 2a19d7a4a7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/dao_user.go
View File

@@ -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 != "" {

6
business/q_bida/q_bida_server.go
View File

@@ -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 {