Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
youjj
cloud-platform
Commits
10ea4240
Commit
10ea4240
authored
Jul 19, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加积分消息队列接口
parent
7647b2fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
IntegralUserRecord.java
...com/xxfc/platform/activity/entity/IntegralUserRecord.java
+1
-1
IntegralUserRecordDto.java
.../com/xxfc/platform/activity/vo/IntegralUserRecordDto.java
+1
-1
IntegralSignRecordBiz.java
...com/xxfc/platform/activity/biz/IntegralSignRecordBiz.java
+1
-1
OrderPayBiz.java
...ain/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
+1
-1
No files found.
xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/IntegralUserRecord.java
View file @
10ea4240
...
@@ -58,7 +58,7 @@ public class IntegralUserRecord {
...
@@ -58,7 +58,7 @@ public class IntegralUserRecord {
* 获取积分的途径id:如订单id,评论id,签到记录id
* 获取积分的途径id:如订单id,评论id,签到记录id
*/
*/
@Column
(
name
=
"channel_id"
)
@Column
(
name
=
"channel_id"
)
private
Integer
channelId
;
private
String
channelId
;
}
}
\ No newline at end of file
xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/IntegralUserRecordDto.java
View file @
10ea4240
...
@@ -23,7 +23,7 @@ public class IntegralUserRecordDto extends PageParam {
...
@@ -23,7 +23,7 @@ public class IntegralUserRecordDto extends PageParam {
/**
/**
* 获取积分的途径id:如订单id,评论id,签到记录id
* 获取积分的途径id:如订单id,评论id,签到记录id
*/
*/
private
Integer
channelId
;
private
String
channelId
;
public
IntegralUserRecord
getIntegralUserRecord
()
{
public
IntegralUserRecord
getIntegralUserRecord
()
{
IntegralUserRecord
integralUserRecord
=
new
IntegralUserRecord
();
IntegralUserRecord
integralUserRecord
=
new
IntegralUserRecord
();
...
...
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralSignRecordBiz.java
View file @
10ea4240
...
@@ -138,7 +138,7 @@ public class IntegralSignRecordBiz extends BaseBiz<IntegralSignRecordMapper, Int
...
@@ -138,7 +138,7 @@ public class IntegralSignRecordBiz extends BaseBiz<IntegralSignRecordMapper, Int
IntegralUserRecordDto
integralUserRecord
=
new
IntegralUserRecordDto
();
IntegralUserRecordDto
integralUserRecord
=
new
IntegralUserRecordDto
();
integralUserRecord
.
setUserId
(
appUserDTO
.
getUserid
());
integralUserRecord
.
setUserId
(
appUserDTO
.
getUserid
());
integralUserRecord
.
setType
(
0
);
integralUserRecord
.
setType
(
0
);
integralUserRecord
.
setChannelId
(
integralSignRecords
.
get
(
0
).
getId
());
integralUserRecord
.
setChannelId
(
integralSignRecords
.
get
(
0
).
getId
()
.
toString
()
);
integralUserRecord
.
setIntegralRuleCode
(
integralRule
.
getCode
());
integralUserRecord
.
setIntegralRuleCode
(
integralRule
.
getCode
());
integralUserRecord
.
setPoint
(
point
);
integralUserRecord
.
setPoint
(
point
);
integralUserRecordBiz
.
add
(
integralUserRecord
);
integralUserRecordBiz
.
add
(
integralUserRecord
);
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
View file @
10ea4240
...
@@ -148,7 +148,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
...
@@ -148,7 +148,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
jsonObject
.
put
(
"userId"
,
newValue
.
getUserId
());
jsonObject
.
put
(
"userId"
,
newValue
.
getUserId
());
jsonObject
.
put
(
"amount"
,
newValue
.
getAmount
());
jsonObject
.
put
(
"amount"
,
newValue
.
getAmount
());
jsonObject
.
put
(
"channelId"
,
newValue
.
get
Id
());
jsonObject
.
put
(
"channelId"
,
newValue
.
get
OrderNo
());
if
(
newValue
.
getChannel
()
==
1
)
{
//租车
if
(
newValue
.
getChannel
()
==
1
)
{
//租车
jsonObject
.
put
(
"integralRuleCode"
,
"RENTRV"
);
jsonObject
.
put
(
"integralRuleCode"
,
"RENTRV"
);
}
else
if
(
newValue
.
getChannel
()
==
2
)
{
//旅游
}
else
if
(
newValue
.
getChannel
()
==
2
)
{
//旅游
...
...
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