From 51f1c674fa4ad47fc0b9a9dd55033fd70d28fc14 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Fri, 12 Sep 2025 10:44:49 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E8=B0=83=E6=95=B4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleDao.go | 9 ++++++++- internal/logic/bundleLogic.go | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/dao/bundleDao.go b/internal/dao/bundleDao.go index c380272..26a4b87 100644 --- a/internal/dao/bundleDao.go +++ b/internal/dao/bundleDao.go @@ -326,8 +326,15 @@ func UpdateBundleToValueAddService(tx *gorm.DB, records []*model.BundleToValueAd } 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 + } -func GetValueAddServiceUuidsByBundleUuid(bundleUuid string) ([]*model.ValueUidWithBenefits, 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 + return uuids, err +} + +func GetValueAddServiceUuidsByAndBenefitsBundleUuid(bundleUuid string) ([]*model.ValueUidWithBenefits, error) { var result []*model.ValueUidWithBenefits err := app.ModuleClients.BundleDB.Model(&model.BundleToValueAddService{}).Select("value_uid, benefits_type").Where("bundle_uuid = ? and deleted_at = 0", bundleUuid).Scan(&result).Error return result, err diff --git a/internal/logic/bundleLogic.go b/internal/logic/bundleLogic.go index fc3505e..ac08f40 100644 --- a/internal/logic/bundleLogic.go +++ b/internal/logic/bundleLogic.go @@ -453,7 +453,7 @@ func HandleShelf(req *bundle.HandShelfRequest) (*bundle.CommonResponse, error) { // 差异更新套餐与增值服务中间表 func diffUpdateBundleToValueAddService(tx *gorm.DB, bundleUuid string, selectService []*model.BundleToValueAddService) error { // 获取现有的关联记录（包含value_uid和benefits_type） - oldRecords, err := dao.GetValueAddServiceUuidsByBundleUuid(bundleUuid) + oldRecords, err := dao.GetValueAddServiceUuidsByAndBenefitsBundleUuid(bundleUuid) if err != nil { return errors.New("查询套餐与增值服务关联失败") }