Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-finance
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
base_platform_enterprise
gic-platform-finance
Commits
15075285
Commit
15075285
authored
Sep 12, 2019
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
转账审批详情添加字段:描述信息
parent
662a5413
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
0 deletions
+41
-0
TransferAccountsApprovalController.java
...ce/web/controller/TransferAccountsApprovalController.java
+3
-0
ExpandPackageVO.java
...src/main/java/com/gic/finance/web/vo/ExpandPackageVO.java
+13
-0
LicenseVO.java
...e-web/src/main/java/com/gic/finance/web/vo/LicenseVO.java
+13
-0
ServiceInfoVO.java
...b/src/main/java/com/gic/finance/web/vo/ServiceInfoVO.java
+12
-0
No files found.
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/TransferAccountsApprovalController.java
View file @
15075285
...
@@ -126,6 +126,7 @@ public class TransferAccountsApprovalController {
...
@@ -126,6 +126,7 @@ public class TransferAccountsApprovalController {
serviceInfoVO
.
setServeName
(
itemDTO
.
getServeName
());
serviceInfoVO
.
setServeName
(
itemDTO
.
getServeName
());
serviceInfoVO
.
setSkuInfo
(
itemDTO
.
getSkuInfo
());
serviceInfoVO
.
setSkuInfo
(
itemDTO
.
getSkuInfo
());
serviceInfoVO
.
setTotalAmount
(
itemDTO
.
getTotalAmount
());
serviceInfoVO
.
setTotalAmount
(
itemDTO
.
getTotalAmount
());
serviceInfoVO
.
setServeInfo
(
itemDTO
.
getServeInfo
());
serviceInfoVOList
.
add
(
serviceInfoVO
);
serviceInfoVOList
.
add
(
serviceInfoVO
);
}
else
if
(
itemDTO
.
getServeType
()
==
2
)
{
}
else
if
(
itemDTO
.
getServeType
()
==
2
)
{
//license
//license
...
@@ -134,6 +135,7 @@ public class TransferAccountsApprovalController {
...
@@ -134,6 +135,7 @@ public class TransferAccountsApprovalController {
licenseVO
.
setServeName
(
itemDTO
.
getServeName
());
licenseVO
.
setServeName
(
itemDTO
.
getServeName
());
licenseVO
.
setTotalAmount
(
itemDTO
.
getTotalAmount
());
licenseVO
.
setTotalAmount
(
itemDTO
.
getTotalAmount
());
licenseVO
.
setServeQuantity
(
itemDTO
.
getServeQuantity
());
licenseVO
.
setServeQuantity
(
itemDTO
.
getServeQuantity
());
licenseVO
.
setServeInfo
(
itemDTO
.
getServeInfo
());
licenseVOList
.
add
(
licenseVO
);
licenseVOList
.
add
(
licenseVO
);
}
else
if
(
itemDTO
.
getServeType
()
==
3
)
{
}
else
if
(
itemDTO
.
getServeType
()
==
3
)
{
//拓展包
//拓展包
...
@@ -142,6 +144,7 @@ public class TransferAccountsApprovalController {
...
@@ -142,6 +144,7 @@ public class TransferAccountsApprovalController {
expandPackageVO
.
setServeName
(
itemDTO
.
getServeName
());
expandPackageVO
.
setServeName
(
itemDTO
.
getServeName
());
expandPackageVO
.
setServeQuantity
(
itemDTO
.
getServeQuantity
());
expandPackageVO
.
setServeQuantity
(
itemDTO
.
getServeQuantity
());
expandPackageVO
.
setTotalAmount
(
itemDTO
.
getTotalAmount
());
expandPackageVO
.
setTotalAmount
(
itemDTO
.
getTotalAmount
());
expandPackageVO
.
setServeInfo
(
itemDTO
.
getServeInfo
());
expandPackageVOList
.
add
(
expandPackageVO
);
expandPackageVOList
.
add
(
expandPackageVO
);
}
}
}
}
...
...
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/ExpandPackageVO.java
View file @
15075285
...
@@ -32,6 +32,11 @@ public class ExpandPackageVO implements Serializable{
...
@@ -32,6 +32,11 @@ public class ExpandPackageVO implements Serializable{
*/
*/
private
String
imageUrl
;
private
String
imageUrl
;
/**
*
*/
private
String
serveInfo
;
public
String
getServeName
()
{
public
String
getServeName
()
{
return
serveName
;
return
serveName
;
...
@@ -64,4 +69,12 @@ public class ExpandPackageVO implements Serializable{
...
@@ -64,4 +69,12 @@ public class ExpandPackageVO implements Serializable{
public
void
setImageUrl
(
String
imageUrl
)
{
public
void
setImageUrl
(
String
imageUrl
)
{
this
.
imageUrl
=
imageUrl
;
this
.
imageUrl
=
imageUrl
;
}
}
public
String
getServeInfo
()
{
return
serveInfo
;
}
public
void
setServeInfo
(
String
serveInfo
)
{
this
.
serveInfo
=
serveInfo
;
}
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/LicenseVO.java
View file @
15075285
...
@@ -19,6 +19,11 @@ public class LicenseVO implements Serializable{
...
@@ -19,6 +19,11 @@ public class LicenseVO implements Serializable{
private
String
serveName
;
private
String
serveName
;
/**
/**
*
*/
private
String
serveInfo
;
/**
* 订单原价
* 订单原价
*/
*/
private
BigDecimal
totalAmount
;
private
BigDecimal
totalAmount
;
...
@@ -29,6 +34,14 @@ public class LicenseVO implements Serializable{
...
@@ -29,6 +34,14 @@ public class LicenseVO implements Serializable{
private
String
licenseUnit
;
private
String
licenseUnit
;
public
String
getServeInfo
()
{
return
serveInfo
;
}
public
void
setServeInfo
(
String
serveInfo
)
{
this
.
serveInfo
=
serveInfo
;
}
public
String
getServeName
()
{
public
String
getServeName
()
{
return
serveName
;
return
serveName
;
}
}
...
...
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/ServiceInfoVO.java
View file @
15075285
...
@@ -22,6 +22,10 @@ public class ServiceInfoVO implements Serializable{
...
@@ -22,6 +22,10 @@ public class ServiceInfoVO implements Serializable{
private
String
serveName
;
private
String
serveName
;
private
String
skuInfo
;
private
String
skuInfo
;
/**
*
*/
private
String
serveInfo
;
/**
/**
* 服务描述
* 服务描述
...
@@ -70,4 +74,12 @@ public class ServiceInfoVO implements Serializable{
...
@@ -70,4 +74,12 @@ public class ServiceInfoVO implements Serializable{
JSONObject
period
=
jsonObject
.
getJSONObject
(
"period"
);
JSONObject
period
=
jsonObject
.
getJSONObject
(
"period"
);
return
period
.
get
(
"effect_time"
)
+
(
String
)
period
.
get
(
"name"
);
return
period
.
get
(
"effect_time"
)
+
(
String
)
period
.
get
(
"name"
);
}
}
public
String
getServeInfo
()
{
return
serveInfo
;
}
public
void
setServeInfo
(
String
serveInfo
)
{
this
.
serveInfo
=
serveInfo
;
}
}
}
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