diff --git a/business/model/user_vendor_order.go b/business/model/user_vendor_order.go index 9f33b7c3a..2af5e6db3 100644 --- a/business/model/user_vendor_order.go +++ b/business/model/user_vendor_order.go @@ -5,7 +5,7 @@ import ( ) type UserVendorOrder struct { - ModelIDCUL + ModelIDCULD UserId string `orm:"size(128);column(user_id);index" json:"userID"` // 用户ID LocalWayBill string `orm:"size(128);column(local_way_bill);index" json:"localWayBill"` // 本地订单ID OtherWayBill string `orm:"size(128);column(other_way_bill);index" json:"otherWayBill"` // 第三方运单ID diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go index c08ae9792..3a7a05ffd 100644 --- a/business/q_bida/q_bida_server.go +++ b/business/q_bida/q_bida_server.go @@ -159,7 +159,7 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user }() // 添加运单表 - dao.WrapAddIDCULEntity(vendorOrder, ctx.GetUserName()) + dao.WrapAddIDCULDEntity(vendorOrder, ctx.GetUserName()) if err := dao.CreateEntity(db, vendorOrder); err != nil { dao.Rollback(db, tdb) return nil, err @@ -279,9 +279,10 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa LEFT JOIN user_delivery_address add2 ON a.receive_address_id = add2.id LEFT JOIN place district ON district.code = add1.city_code LEFT JOIN place city ON city.code = add2.city_code - WHERE a.user_id = ? + WHERE a.delete_at = ? AND a.user_id = ? ` param := make([]interface{}, 0, 0) + param = append(param, utils.DefaultTimeValue) param = append(param, userId) if orderNo != "" { sql = sql + `AND a.other_way_bill = ? OR a.local_way_bill = ? ` @@ -472,13 +473,14 @@ func DeleteOrderByLocalId(userId, localId string) (int64, error) { return 0, errors.New("用户数据不存在") } // 待支付,支付失败,取消,可以删除 + data.DeletedAt = utils.DefaultTimeValue if data.OrderStatus == 2 || data.OrderStatus == 3 || data.OrderStatus == 150 { - return dao.DeleteEntity(dao.GetDB(), &model.UserVendorOrder{UserId: userId, LocalWayBill: localId}, "UserId", "LocalWayBill") + return dao.UpdateEntity(dao.GetDB(), &data, "DeletedAt") } // 支付成功保留15天,可以删除 if !data.CreatedAt.IsZero() && data.CreatedAt.AddDate(0, 0, 15).Unix() > time.Now().Unix() { - return dao.DeleteEntity(dao.GetDB(), &model.UserVendorOrder{UserId: userId, LocalWayBill: localId}, "UserId", "LocalWayBill") + return dao.UpdateEntity(dao.GetDB(), &data, "DeletedAt") } return 0, errors.New("订单完成后保存15天,才可以删除") } @@ -487,9 +489,10 @@ func DeleteOrderByLocalId(userId, localId string) (int64, error) { func UpdateOrderStatus() { // 查询状态值为【4-支付成功,10预下单11待取件12运输中17终止揽收】//2,3 15已签收16取消订单 完成订单 db := dao.GetDB() - sql := `SELECT * FROM user_vendor_order WHERE order_status IN (4,10,11,12,17) ` + sql := `SELECT * FROM user_vendor_order WHERE order_status IN (4,10,11,12,17) AND deleted_at = ?` + param := []interface{}{utils.DefaultTimeValue} var data []*model.UserVendorOrder - if err := dao.GetRows(db, &data, sql); err != nil { + if err := dao.GetRows(db, &data, sql, param...); err != nil { globals.SugarLogger.Debug("Scheduled task Err = ", err) return } @@ -507,7 +510,7 @@ func UpdateOrderStatus() { globals.SugarLogger.Debug("Get Order Fail To QBiDa:", err) continue } - param := model.UserVendorOrder{ModelIDCUL: model.ModelIDCUL{ID: v.ModelIDCUL.ID}} + param := model.UserVendorOrder{ModelIDCULD: model.ModelIDCULD{ID: v.ModelIDCULD.ID}} param.OrderStatus = otherOrder.Status + 10 if _, err := dao.UpdateEntity(db, ¶m, "OrderStatus"); err != nil { globals.SugarLogger.Debug("Update Order Status Fail ", err)