internal/dao/bundleDao.go

@@ -224,7 +224,7 @@ func BundleListV2(req *bundle.BundleListRequest) (res *bundle.BundleListResponse
 
 func BundleDetailV2(req *bundle.BundleDetailRequest) (res *model.BundleProfile, err error) {
 	var data model.BundleProfile
-	err = app.ModuleClients.BundleDB.Model(&model.BundleProfile{}).Where("uuid = ? AND deleted_at = 0", req.Uuid).
+	err = app.ModuleClients.BundleDB.Model(&model.BundleProfile{}).Where("uuid = ?", req.Uuid).
 		Preload("BundleProfileLang").
 		Preload("BundleToValueAddService").
 		First(&data).Error
@@ -237,8 +237,7 @@ func BundleDetailV2(req *bundle.BundleDetailRequest) (res *model.BundleProfile,
 // 套餐上下架
 func HandShelf(uuid string, shelfStatus int64) (res *bundle.CommonResponse, err error) {
 	res = new(bundle.CommonResponse)
-	err = app.ModuleClients.BundleDB.Model(&model.BundleProfile{}).Where("uuid = ? AND deleted_at = 0", uuid).Update("shelf_status", shelfStatus).Error
-
+	err = app.ModuleClients.BundleDB.Model(&model.BundleProfile{}).Where("uuid = ?", uuid).Update("shelf_status", shelfStatus).Error
 	if err != nil {
 		res.Msg = "套餐上下架操作失败"
 		return res, err
@@ -249,8 +248,7 @@ func HandShelf(uuid string, shelfStatus int64) (res *bundle.CommonResponse, err
 
 // 通过uuid和language查询套餐语言表
 func BundleDetailByUuidAndLanguage(uuid string, language string) (bundleProfileLang *model.BundleProfileLang, err error) {
-	err = app.ModuleClients.BundleDB.Where("uuid = ? AND language = ? AND deleted_at = 0", uuid, language).First(&bundleProfileLang).Error
-
+	err = app.ModuleClients.BundleDB.Where("uuid = ? AND language = ?", uuid, language).First(&bundleProfileLang).Error
 	if err != nil {
 		return nil, err
 	}
@@ -275,15 +273,14 @@ func TxCreateBundleLang(tx *gorm.DB, req *model.BundleProfileLang) (err error) {
 	return
 }
 func TxUpdateBundle(tx *gorm.DB, uuid string, columns map[string]interface{}) (err error) {
-	err = tx.Model(&model.BundleProfile{}).Where("uuid =? and deleted_at = 0", uuid).Updates(columns).Error
+	err = tx.Model(&model.BundleProfile{}).Where("uuid =?", uuid).Updates(columns).Error
 	if err != nil {
 		return commonErr.ReturnError(err, msg.ErrorUpdateBundleInfo, "更新套餐信息失败: ")
 	}
 	return
 }
 func TxUpdateBundleLang(tx *gorm.DB, uuid string, language string, columns map[string]interface{}) (err error) {
-	err = tx.Model(&model.BundleProfileLang{}).Where("uuid =? and language=? and deleted_at = 0", uuid, language).Updates(columns).Error
-
+	err = tx.Model(&model.BundleProfileLang{}).Where("uuid =? and language=?", uuid, language).Updates(columns).Error
 	if err != nil {
 		return commonErr.ReturnError(err, msg.ErrorUpdateBundleInfo, "更新套餐信息失败: ")
 	}
@@ -296,7 +293,7 @@ func UpdateBundleToValueAddService(tx *gorm.DB, records []*model.BundleToValueAd
 	columns := make(map[string]interface{})
 	for _, record := range records {
 		columns["is_display"] = record.IsDisplay
-		err := tx.Model(&model.BundleToValueAddService{}).Where("bundle_uuid = ? AND value_uid = ? AND deleted_at = 0", record.BundleUuid, record.ValueUid).Updates(columns).Error
+		err := tx.Model(&model.BundleToValueAddService{}).Where("bundle_uuid = ? AND value_uid = ?", record.BundleUuid, record.ValueUid).Updates(columns).Error
 		if err != nil {
 			return commonErr.ReturnError(err, msg.ErrorUpdateBundleInfo, "更新套餐信息失败: ")
 		}
@@ -304,12 +301,11 @@ func UpdateBundleToValueAddService(tx *gorm.DB, records []*model.BundleToValueAd
 	return nil
 }
 func DeleteBundleToValueAddService(tx *gorm.DB, bundleUuid, valueUid string) error {
-	return tx.Where("bundle_uuid = ? AND value_uid = ? AND deleted_at = 0", bundleUuid, valueUid).Delete(&model.BundleToValueAddService{}).Error
-
+	return tx.Where("bundle_uuid = ? AND value_uid = ?", bundleUuid, valueUid).Delete(&model.BundleToValueAddService{}).Error
 }
 func GetValueAddServiceUuidsByBundleUuid(bundleUuid string) ([]string, error) {
 	var uuids []string
-	err := app.ModuleClients.BundleDB.Model(&model.BundleToValueAddService{}).Where("bundle_uuid = ? and deleted_at = 0", bundleUuid).Pluck("value_uid", &uuids).Error
+	err := app.ModuleClients.BundleDB.Model(&model.BundleToValueAddService{}).Where("bundle_uuid = ?", bundleUuid).Pluck("value_uid", &uuids).Error
 	return uuids, err
 }
 
@@ -317,7 +313,7 @@ func GetValueAddServiceUuidsByBundleUuid(bundleUuid string) ([]string, error) {
 func GetBundleToValueAddServiceByBundleUuid(bundleUuid string) ([]*model.BundleToValueAddService, error) {
 	var result []*model.BundleToValueAddService
 	err := app.ModuleClients.BundleDB.Model(&model.BundleToValueAddService{}).
-		Where("bundle_uuid = ? and deleted_at = 0", bundleUuid).
+		Where("bundle_uuid = ?", bundleUuid).
 		Find(&result).Error
 	return result, err
 }
@@ -325,11 +321,8 @@ func GetBundleToValueAddServiceByBundleUuid(bundleUuid string) ([]*model.BundleT
 func GetBundleLangsByUuid(uuid string) ([]*model.BundleProfileLang, error) {
 	var result []*model.BundleProfileLang
 	err := app.ModuleClients.BundleDB.Model(&model.BundleProfileLang{}).
-		Where("uuid =? and deleted_at = 0", uuid).
+		Where("uuid =?", uuid).
 		Find(&result).Error
-	if err != nil {
-		return nil, err
-	}
 	return result, err
 }
 func GetBundleDetailByUuid(uuid string) (*model.BundleProfile, error) {

internal/dao/valueAddBundleDao.go

@@ -97,15 +97,15 @@ func CreateValueAddServiceLang(tx *gorm.DB, req *model.ValueAddServiceLang) (err
 
 // 增值套餐主表更新
 func UpdateValueAddService(tx *gorm.DB, columns map[string]interface{}) (err error) {
-	err = tx.Model(&model.ValueAddService{}).Where("uuid = ? and deleted_at = 0", columns["uuid"]).Updates(columns).Error
+	err = tx.Model(&model.ValueAddService{}).Where("uuid = ?", columns["uuid"]).Updates(columns).Error
 	if err != nil {
 		return
 	}
 	return
 }
 func UpdateValueAddServiceLang(tx *gorm.DB, columns map[string]interface{}) (err error) {
-	err = tx.Model(&model.ValueAddServiceLang{}).Where("uuid =? and deleted_at = 0", columns["uuid"]).
-		Where("language = ?", columns["language"]).Updates(columns).Error
+	err = tx.Model(&model.ValueAddServiceLang{}).Where("uuid =?", columns["uuid"]).
+		Where("language", columns["language"]).Updates(columns).Error
 	if err != nil {
 		return
 	}
@@ -115,7 +115,6 @@ func UpdateValueAddServiceLang(tx *gorm.DB, columns map[string]interface{}) (err
 // 增值套餐列表
 func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res []*model.ValueAddService, total int64, err error) {
 	query := app.ModuleClients.BundleDB.Model(&model.ValueAddService{}).
-		Where("deleted_at = 0").
 		Preload("ValueAddServiceLang", func(db *gorm.DB) *gorm.DB {
 			return db.Select("uuid,service_name,service_type,price_mode,original_price,unit,language,price_type,options,created_at,updated_at")
 		})
@@ -135,7 +134,7 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res []*model.V
 // 增值套餐详情
 func ValueAddServiceDetail(uuid string) (valueAddServiceDetail *model.ValueAddService, err error) {
 	var data model.ValueAddService
-	err = app.ModuleClients.BundleDB.Where("uuid = ? and deleted_at = 0", uuid).Preload("ValueAddServiceLang").First(&data).Error
+	err = app.ModuleClients.BundleDB.Where("uuid = ?", uuid).Preload("ValueAddServiceLang").First(&data).Error
 	if err != nil {
 		return nil, err
 	}
@@ -144,8 +143,7 @@ func ValueAddServiceDetail(uuid string) (valueAddServiceDetail *model.ValueAddSe
 
 // 通过uuid和language查询增值套餐
 func ValueAddServiceDetailByUuidAndLanguage(uuid string, language string) (valueAddServiceLang *model.ValueAddServiceLang, err error) {
-	err = app.ModuleClients.BundleDB.Where("uuid = ? AND language = ? and deleted_at = 0", uuid, language).First(&valueAddServiceLang).Error
-
+	err = app.ModuleClients.BundleDB.Where("uuid = ? AND language = ?", uuid, language).First(&valueAddServiceLang).Error
 	if err != nil {
 		return nil, err
 	}
@@ -156,7 +154,7 @@ func ValueAddServiceDetailByUuidAndLanguage(uuid string, language string) (value
 func GetBundleToValueAddServiceByValueUid(valueUid string) ([]model.BundleToValueAddService, error) {
 	var rels []model.BundleToValueAddService
 	err := app.ModuleClients.BundleDB.Model(&model.BundleToValueAddService{}).
-		Where("value_uid = ? and deleted_at = 0", valueUid).
+		Where("value_uid = ?", valueUid).
 		Find(&rels).Error
 	return rels, err
 }