From de369b4b3d87a5c1e4c8848c5b0d75fbac45459f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/resources/mapper/modules/MallVipConfigMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallVipConfigMapper.xml b/src/main/resources/mapper/modules/MallVipConfigMapper.xml
index 4b9675a..111b17c 100644
--- a/src/main/resources/mapper/modules/MallVipConfigMapper.xml
+++ b/src/main/resources/mapper/modules/MallVipConfigMapper.xml
@@ -8,8 +8,9 @@
<result property="thumb" column="thumb" />
<result property="level" column="level" />
<result property="validTime" column="valid_time" />
- <result property="validType" column="valid_time" />
+ <result property="validType" column="valid_type" />
<result property="type" column="type" />
+ <result property="code" column="code" />
<result property="amount" column="amount" />
<result property="times" column="times" />
<result property="targetId" column="target_id" />
@@ -18,6 +19,13 @@
<id property="id" column="c_id" />
<result property="name" column="c_name" />
<result property="icon" column="c_icon" />
+ <result property="scoreMultiple" column="score_multiple" />
+ <result property="gainType" column="gain_type" />
+ <result property="isShow" column="is_show" />
+
+ <collection property="details" ofType="cc.mrbird.febs.vip.entity.MallVipBenefitsDetails">
+ <id property="id" column="d_id" />
+ </collection>
</collection>
</resultMap>
@@ -31,9 +39,12 @@
,benefits.id c_id
,benefits.name c_name
,benefits.icon c_icon
+ ,benefits.is_show
+ ,details.id d_id
from mall_vip_config config
inner join mall_vip_config_benefits configBenefits on config.id=configBenefits.config_id
inner join mall_vip_benefits benefits on configBenefits.benefits_id=benefits.id
+ left join mall_vip_benefits_details details on benefits.id = details.benefits_id
order by level
</select>
@@ -43,6 +54,8 @@
,benefits.id c_id
,benefits.name c_name
,benefits.icon c_icon
+ ,benefits.score_multiple
+ ,benefits.gain_type
from mall_vip_config config
inner join mall_vip_config_benefits configBenefits on config.id=configBenefits.config_id
inner join mall_vip_benefits benefits on configBenefits.benefits_id=benefits.id
--
Gitblit v1.9.1