From adea5615891e59fcc643c3a4b57a0fc1c61bb08d Mon Sep 17 00:00:00 2001 From: songchuang <192749120@qq.com> Date: Sat, 29 Mar 2025 11:22:19 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/AugmentWebviewStateStore.xml | 10 ++++++++++ internal/dao/valueAddBundleDao.go | 4 ++-- internal/logic/valueAddBundleLogic.go | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .idea/AugmentWebviewStateStore.xml diff --git a/.idea/AugmentWebviewStateStore.xml b/.idea/AugmentWebviewStateStore.xml new file mode 100644 index 0000000..ecad9a3 --- /dev/null +++ b/.idea/AugmentWebviewStateStore.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/internal/dao/valueAddBundleDao.go b/internal/dao/valueAddBundleDao.go index aad9c46..fe78357 100644 --- a/internal/dao/valueAddBundleDao.go +++ b/internal/dao/valueAddBundleDao.go @@ -64,9 +64,9 @@ func GetBundleOrderRecordsByUserIdAndBundleUuid(userId int32, uuid string) (bund return } -func GetBundleOrderRecordsByCommonUid(commonUid string) (bundleOrderRecords *model.BundleOrderRecords, err error) { +func GetBundleOrderRecordsByCommonUidAndUserId(commonUid string, userId int32) (bundleOrderRecords *model.BundleOrderRecords, err error) { - err = app.ModuleClients.BundleDB.Where("bundle_common_uid = ?", commonUid).First(&bundleOrderRecords).Error + err = app.ModuleClients.BundleDB.Where("bundle_common_uid = ? AND customer_id = ?", commonUid, userId).First(&bundleOrderRecords).Error if err != nil { return } diff --git a/internal/logic/valueAddBundleLogic.go b/internal/logic/valueAddBundleLogic.go index ae35aae..a5a5ddc 100644 --- a/internal/logic/valueAddBundleLogic.go +++ b/internal/logic/valueAddBundleLogic.go @@ -50,7 +50,7 @@ func ValueAddBundleList(req *bundle.ValueAddBundleListRequest) (res *bundle.Valu return } else { var bundleOrderRecord *model.BundleOrderRecords - bundleOrderRecord, err = dao.GetBundleOrderRecordsByCommonUid(bundleProfile.BundleCommonUid) + bundleOrderRecord, err = dao.GetBundleOrderRecordsByCommonUidAndUserId(bundleProfile.BundleCommonUid, req.UserId) if err != nil { err = nil } else {