Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
6a08071f
Commit
6a08071f
authored
Oct 10, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat-508: 分享详情新增点击IP,记录非有效点击
parent
64e344fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
4 deletions
+35
-4
ScoreRuleShareRecordServiceImpl.java
...ScoreRuleShareRecord/ScoreRuleShareRecordServiceImpl.java
+2
-0
ScoreRuleShareRecordMapper.xml
...main/resources/mapper/user/ScoreRuleShareRecordMapper.xml
+33
-4
No files found.
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/ScoreRuleShareRecord/ScoreRuleShareRecordServiceImpl.java
View file @
6a08071f
...
@@ -72,6 +72,8 @@ public class ScoreRuleShareRecordServiceImpl extends AbstractService<ScoreRuleSh
...
@@ -72,6 +72,8 @@ public class ScoreRuleShareRecordServiceImpl extends AbstractService<ScoreRuleSh
if
(
item
.
getIpAddress
().
contains
(
"SHARE"
))
{
if
(
item
.
getIpAddress
().
contains
(
"SHARE"
))
{
String
[]
split
=
item
.
getIpAddress
().
split
(
"_"
);
String
[]
split
=
item
.
getIpAddress
().
split
(
"_"
);
item
.
setIpAddress
(
split
[
split
.
length
-
1
]);
item
.
setIpAddress
(
split
[
split
.
length
-
1
]);
}
else
{
item
.
setIpAddress
(
"-"
);
}
}
item
.
setTypeZh
(
DictFrameworkUtils
.
getDictDataFromCache
(
"score_rule_type"
,
item
.
getType
().
toString
()).
getLabel
());
item
.
setTypeZh
(
DictFrameworkUtils
.
getDictDataFromCache
(
"score_rule_type"
,
item
.
getType
().
toString
()).
getLabel
());
item
.
setTypeEn
(
DictFrameworkUtils
.
getDictDataFromCache
(
"score_rule_type"
,
item
.
getType
().
toString
()).
getLabelEn
());
item
.
setTypeEn
(
DictFrameworkUtils
.
getDictDataFromCache
(
"score_rule_type"
,
item
.
getType
().
toString
()).
getLabelEn
());
...
...
yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/ScoreRuleShareRecordMapper.xml
View file @
6a08071f
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</if>
</if>
<include
refid=
"shareRecordDetailCondition"
/>
<include
refid=
"shareRecordDetailCondition"
/>
<if
test=
"query.id == null
and query.relationSymbol == null
"
>
<if
test=
"query.id == null"
>
UNION
UNION
SELECT
SELECT
srsr.id,
srsr.id,
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
LEFT JOIN member_user mu ON srsr.member_id = mu.id
LEFT JOIN member_user mu ON srsr.member_id = mu.id
LEFT JOIN score_rule sr ON srsr.rule_id = sr.id
LEFT JOIN score_rule sr ON srsr.rule_id = sr.id
where srsr.deleted = 0
where srsr.deleted = 0
<include
refid=
"shareRecordDetailCondition"
/>
<include
refid=
"shareRecord
Fail
DetailCondition"
/>
</if>
</if>
order by createTime desc, triggerTime desc
order by createTime desc, triggerTime desc
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
AND srsr.id = #{query.id}
AND srsr.id = #{query.id}
</if>
</if>
<include
refid=
"shareRecordDetailCondition"
/>
<include
refid=
"shareRecordDetailCondition"
/>
<if
test=
"query.id == null
and query.relationSymbol == null
"
>
<if
test=
"query.id == null"
>
UNION ALL
UNION ALL
SELECT srsr.id
SELECT srsr.id
FROM score_rule_share_fail_trigger srsf
FROM score_rule_share_fail_trigger srsf
...
@@ -104,7 +104,7 @@
...
@@ -104,7 +104,7 @@
LEFT JOIN member_user mu ON srsr.member_id = mu.id
LEFT JOIN member_user mu ON srsr.member_id = mu.id
LEFT JOIN score_rule sr ON srsr.rule_id = sr.id
LEFT JOIN score_rule sr ON srsr.rule_id = sr.id
where srsr.deleted = 0
where srsr.deleted = 0
<include
refid=
"shareRecordDetailCondition"
/>
<include
refid=
"shareRecord
Fail
DetailCondition"
/>
</if>
</if>
) subquery
) subquery
</select>
</select>
...
@@ -169,4 +169,33 @@
...
@@ -169,4 +169,33 @@
</if>
</if>
</if>
</if>
</sql>
</sql>
<sql
id=
"shareRecordFailDetailCondition"
>
<if
test=
"query.memberName != null and query.memberName != ''"
>
AND mu.nickname = #{query.memberName}
</if>
<if
test=
"query.type != null"
>
AND sr.type = #{query.type}
</if>
<if
test=
"query.title != null and query.title != ''"
>
AND ( sr.title_zh LIKE concat('%', #{query.title}, '%') OR sr.title_en LIKE concat('%', #{query.title}, '%') )
</if>
<if
test=
"query.code != null and query.code != ''"
>
AND srsr.code = #{query.code}
</if>
<if
test=
"query.beginCreateTime != null and query.endCreateTime != null"
>
AND ( srsr.create_time BETWEEN #{query.beginCreateTime} AND #{query.endCreateTime} )
</if>
<if
test=
"query.relationSymbol != null and query.totalScore != null"
>
<!--1:大于 2:等于 3:小于-->
<if
test=
"query.relationSymbol == 1"
>
AND 0
>
#{query.totalScore}
</if>
<if
test=
"query.relationSymbol == 2"
>
AND 0 = #{query.totalScore}
</if>
<if
test=
"query.relationSymbol == 3"
>
AND 0
<
#{query.totalScore}
</if>
</if>
</sql>
</mapper>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment