Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
T
tcm-system
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
TCM
tcm-system
Commits
45eff95a
Commit
45eff95a
authored
Jan 16, 2024
by
tangfang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改余额为0的处理,
添加银行卡空指针问题
parent
c243307f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
CompanyServiceImpl.java
...ngding/web/authority/service/impl/CompanyServiceImpl.java
+6
-5
RegisterServiceImpl.java
...gding/web/authority/service/impl/RegisterServiceImpl.java
+3
-0
No files found.
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @
45eff95a
...
...
@@ -1470,8 +1470,13 @@ public class CompanyServiceImpl implements CompanyService {
@Override
public
CompanyResVo
findCompanyById
(
CompanyReqVo
req
)
{
CompanyResVo
companyResVo
=
companyDao
.
load
(
req
.
getId
(),
CompanyResVo
.
class
);
if
(
CompanyConstant
.
EXAMINE_STATUS_STOP
==
companyResVo
.
getExamineStatus
())
{
// 判断公司审核状态
throw
new
CodeException
(
"102"
,
"该公司已停用,如有疑问,请联系管理员。"
);
}
// 来源于扫码牌
// if(1 == req.getQuerySource()){
if
(
StringHelper
.
isEmpty
(
req
.
getTollPoint
())
&&
companyResVo
.
getScanCodePayStatus
()
==
1
)
{
// 无消费点 关闭主二维码支付
throw
new
CodeException
(
"100"
,
"该功能已经关闭,如需开通请联系管理员。"
);
...
...
@@ -1485,11 +1490,7 @@ public class CompanyServiceImpl implements CompanyService {
throw
new
CodeException
(
"99"
,
"未获取到收费点,请联系客服人员查询二维码是否正确。"
);
}
companyResVo
.
setCompanyTollPointVoList
(
companyTollPointVos
);
// if(!StringHelper.isEmpty(companyTollPointVos.get(0).getTollPointByname())){
// companyResVo.setCompanyName(companyTollPointVos.get(0).getTollPointByname());
// }
}
// }
CompanyVo
companyVo
=
new
CompanyVo
();
ObjectHelper
.
writeWithFromClass
(
companyVo
,
companyResVo
);
...
...
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @
45eff95a
...
...
@@ -437,6 +437,9 @@ public class RegisterServiceImpl implements RegisterService {
if
(
StringHelper
.
isEmpty
(
companyVo
))
{
throw
new
CodeException
(
"注册信息有误"
);
}
if
(
CompanyConstant
.
EXAMINE_STATUS_STOP
==
companyVo
.
getExamineStatus
()){
throw
new
CodeException
(
"公司已停用,如有疑问,请联系管理员。"
);
}
LoginCompanyResVo
loginCompanyResVo
=
new
LoginCompanyResVo
();
loginCompanyResVo
.
setCompanyVo
(
companyVo
);
reqVo
.
setToken
(
token
);
...
...
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