Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
youka-api
Overview
Overview
Details
Activity
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
java-youka-wallet
youka-api
Commits
28513f11
Commit
28513f11
authored
Mar 19, 2018
by
Java-聂换换
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改分润明细
parent
f534d930
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
9 deletions
+22
-9
BenefitEntity.java
src/main/java/com/thinkgem/jeesite/modules/pay/entity/BenefitEntity.java
+12
-0
OrderEntity.java
src/main/java/com/thinkgem/jeesite/modules/pay/entity/OrderEntity.java
+7
-6
OrderApiDao.xml
src/main/resources/mappings/modules/pay/OrderApiDao.xml
+3
-3
No files found.
src/main/java/com/thinkgem/jeesite/modules/pay/entity/BenefitEntity.java
View file @
28513f11
...
...
@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.pay.entity;
import
com.thinkgem.jeesite.common.baseBean.BaseEntity
;
import
java.io.Serializable
;
import
java.util.Date
;
public
class
BenefitEntity
extends
BaseEntity
implements
Serializable
{
private
String
userCode
;
// 用户code
...
...
@@ -19,6 +20,7 @@ public class BenefitEntity extends BaseEntity implements Serializable {
private
OrderEntity
orderEntity
;
private
String
createDate
;
public
BenefitEntity
()
{
}
...
...
@@ -115,4 +117,14 @@ public class BenefitEntity extends BaseEntity implements Serializable {
public
void
setOrderEntity
(
OrderEntity
orderEntity
)
{
this
.
orderEntity
=
orderEntity
;
}
public
String
getCreateDate
()
{
return
createDate
;
}
public
void
setCreateDate
(
String
createDate
)
{
if
(
createDate
!=
null
&&
createDate
.
length
()
==
21
){
createDate
=
createDate
.
substring
(
0
,
19
);
}
this
.
createDate
=
createDate
;
}
}
src/main/java/com/thinkgem/jeesite/modules/pay/entity/OrderEntity.java
View file @
28513f11
...
...
@@ -122,6 +122,12 @@ public class OrderEntity extends BaseEntity implements Serializable {
public
String
getCreateDate
()
{
return
createDate
;
}
public
void
setCreateDate
(
String
createDate
)
{
if
(
createDate
!=
null
&&
createDate
.
length
()
==
21
){
createDate
=
createDate
.
substring
(
0
,
19
);
}
this
.
createDate
=
createDate
;
}
public
String
getPayChannelName
()
{
return
payChannelName
;
...
...
@@ -131,11 +137,6 @@ public class OrderEntity extends BaseEntity implements Serializable {
this
.
payChannelName
=
payChannelName
;
}
public
void
setCreateDate
(
String
createDate
)
{
if
(
createDate
!=
null
&&
createDate
.
length
()
==
21
){
createDate
=
createDate
.
substring
(
0
,
19
);
}
this
.
createDate
=
createDate
;
}
}
src/main/resources/mappings/modules/pay/OrderApiDao.xml
View file @
28513f11
...
...
@@ -39,11 +39,11 @@
o.pay_status AS "orderEntity.payStatus",
o.pay_type AS "orderEntity.payType",
o.pay_channel AS "orderEntity.payChannel",
o.amount AS "orderEntity.amount",
o.create_date AS "orderEntity.createDate",
o.`subject` AS "orderEntity.subject",
o.amount AS "orderEntity.amount",
sd.label AS "orderEntity.payChannelName",
yb.amount AS "amount"
yb.amount AS "amount",
yb.create_date AS "createDate"
FROM
youka_benefit yb
LEFT JOIN `youka_orders` o ON yb.order_code = o.`code`
...
...
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