Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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-enterprise
Commits
7952ed79
Commit
7952ed79
authored
Mar 13, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订购详情服务修改,如果是空,不再返回错误,而是null
parent
742a367d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
EnterpriseController.java
...om/gic/operation/web/controller/EnterpriseController.java
+3
-3
TransferApprovalServiceVO.java
...peration/web/vo/enterprise/TransferApprovalServiceVO.java
+4
-0
No files found.
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java
View file @
7952ed79
...
...
@@ -555,7 +555,7 @@ public class EnterpriseController {
vo
.
setPayType
(
orderDTO
.
getPayType
());
//支付流水号
vo
.
setPayInfoSerialNumber
(
orderDTO
.
getPayNumber
());
vo
.
setTotalCountFee
(
transfer
.
getPlannedAmount
());
vo
.
setTotalCountFee
(
vo
.
getPlannedAmount
());
vo
.
setRelationOrderType
(
orderDTO
.
getOrderType
());
vo
.
setOperType
(
orderDTO
.
getOperType
());
vo
.
setOperName
(
orderDTO
.
getOperName
());
...
...
@@ -632,8 +632,8 @@ public class EnterpriseController {
}
else
if
(
licenseVOList
.
size
()
>
0
)
{
//没有服务,只有license数据,比如扩容
ServiceInfoVO
temp
=
new
ServiceInfoVO
();
boolean
isGicEnterprise
=
transfer
.
getPlatformType
()
!=
null
&&
transfer
.
getPlatformType
().
intValue
()
==
EnterprisePlatformTypeEnum
.
GIC
.
getCode
();
boolean
isGicEnterprise
=
vo
.
getPlatformType
()
!=
null
&&
vo
.
getPlatformType
().
intValue
()
==
EnterprisePlatformTypeEnum
.
GIC
.
getCode
();
if
(
isGicEnterprise
)
{
ServiceResponse
<
EnterpriseDTO
>
tempResult
=
enterpriseApiService
.
getEnterpriseById
(
transfer
.
getEnterpriseId
());
...
...
gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/enterprise/TransferApprovalServiceVO.java
View file @
7952ed79
...
...
@@ -203,6 +203,10 @@ public class TransferApprovalServiceVO implements Serializable{
this
.
platformType
=
platformType
;
}
public
Integer
getPlatformType
()
{
return
platformType
;
}
public
String
getPlatformTypeStr
()
{
return
EnterprisePlatformTypeEnum
.
getMessageByCode
(
platformType
);
}
...
...
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