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
6393dcbe
Commit
6393dcbe
authored
Sep 12, 2023
by
tangfang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改余额为0的处理,
添加银行卡空指针问题
parent
46050cc9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
5 deletions
+17
-5
CompanyTollPointController.java
...hority/controller/company/CompanyTollPointController.java
+10
-1
CompanyTollPointServiceImpl.java
...ity/service/company/impl/CompanyTollPointServiceImpl.java
+2
-3
CompanyCodeServiceImpl.java
...ng/web/authority/service/impl/CompanyCodeServiceImpl.java
+1
-0
CompanyServiceImpl.java
...ngding/web/authority/service/impl/CompanyServiceImpl.java
+4
-1
No files found.
src/main/java/com/pangding/web/authority/controller/company/CompanyTollPointController.java
View file @
6393dcbe
...
...
@@ -5,6 +5,7 @@ import com.pangding.web.authority.service.company.CompanyTollPointService;
import
com.pangding.web.vo.system.pd.company.CompanyTollPointVo
;
import
com.pangding.web.vo.system.req.company.CompanyTollPointReqVo
;
import
com.pangding.web.vo.system.res.company.CompanyTollPointResVo
;
import
com.yanzuoguang.util.helper.CheckerHelper
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.ResponseResult
;
import
io.swagger.annotations.Api
;
...
...
@@ -44,6 +45,12 @@ public class CompanyTollPointController {
@RequestMapping
(
value
=
"/save"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@ApiOperation
(
value
=
"保存公司收费点"
,
notes
=
"返回公司收费点信息"
)
public
ResponseResult
<
CompanyTollPointVo
>
save
(
@RequestBody
CompanyTollPointReqVo
req
)
{
CheckerHelper
.
newInstance
()
.
notBlankCheck
(
"tollPoints"
,
req
.
getTollPoints
())
.
notBlankCheck
(
"companyId"
,
req
.
getCompanyId
())
.
notBlankCheck
(
"tollPointsName"
,
req
.
getTollPointsName
())
// .notBlankCheck("tollPointsModel", req.getTollPointsModel())
.
checkException
();
return
ResponseResult
.
result
(
companyTollPointService
.
save
(
req
));
}
...
...
@@ -57,10 +64,12 @@ public class CompanyTollPointController {
@RequestMapping
(
value
=
"/delCompanyTollPoint"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@ApiOperation
(
value
=
"删除公司收费点"
,
notes
=
"返回删除结果"
)
public
ResponseResult
<
String
>
delCompanyTollPoint
(
@RequestBody
CompanyTollPointReqVo
req
)
{
CheckerHelper
.
newInstance
()
.
notBlankCheck
(
"companyPointId"
,
req
.
getCompanyPointId
())
.
checkException
();
companyTollPointService
.
delCompanyTollPoint
(
req
);
return
ResponseResult
.
result
(
"处理完成"
);
}
}
src/main/java/com/pangding/web/authority/service/company/impl/CompanyTollPointServiceImpl.java
View file @
6393dcbe
...
...
@@ -40,9 +40,8 @@ public class CompanyTollPointServiceImpl implements CompanyTollPointService {
companyTollPointVo
.
setCompanyPointId
(
StringHelper
.
getNewID
());
companyTollPointDao
.
create
(
companyTollPointVo
);
}
else
{
ObjectHelper
.
writeWithFromClass
(
companyTollPointVo
,
req
);
companyTollPointVo
.
setCompanyPointId
(
companyTollPointVo
.
getCompanyPointId
());
companyTollPointDao
.
update
(
companyTollPointVo
);
req
.
setCompanyPointId
(
companyTollPointVo
.
getCompanyPointId
());
companyTollPointDao
.
update
(
req
);
}
return
companyTollPointVo
;
}
...
...
src/main/java/com/pangding/web/authority/service/impl/CompanyCodeServiceImpl.java
View file @
6393dcbe
...
...
@@ -41,6 +41,7 @@ public class CompanyCodeServiceImpl implements CompanyCodeService {
companyCodeReqVo
.
setCompanyId
(
req
.
getCompanyId
());
companyCodeReqVo
.
setCodeCode
(
req
.
getCodeCode
());
companyCodeReqVo
.
setCodeType
(
req
.
getCodeType
());
companyCodeReqVo
.
setCodeLink
(
req
.
getCodeLink
());
CompanyCodeVo
companyCodeVo
=
companyCodeDao
.
load
(
companyCodeReqVo
,
CompanyCodeVo
.
class
);
if
(
StringHelper
.
isEmpty
(
companyCodeVo
)){
companyCodeVo
=
new
CompanyCodeVo
();
...
...
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @
6393dcbe
...
...
@@ -1472,9 +1472,12 @@ public class CompanyServiceImpl implements CompanyService {
CompanyResVo
companyResVo
=
companyDao
.
load
(
req
.
getId
(),
CompanyResVo
.
class
);
if
(!
StringHelper
.
isEmpty
(
req
.
getTollPoint
())){
// 1 == req.getQuerySource()
CompanyTollPointReqVo
companyTollPointReqVo
=
new
CompanyTollPointReqVo
();
companyTollPointReqVo
.
setCompanyId
(
req
.
get
Company
Id
());
companyTollPointReqVo
.
setCompanyId
(
req
.
getId
());
companyTollPointReqVo
.
setTollPoints
(
req
.
getTollPoint
());
List
<
CompanyTollPointVo
>
companyTollPointVos
=
companyTollPointDao
.
loadList
(
companyTollPointReqVo
,
CompanyTollPointVo
.
class
);
if
(
StringHelper
.
isEmpty
(
companyTollPointVos
)
||
companyTollPointVos
.
size
()
==
0
){
throw
new
CodeException
(
"99"
,
"未获取到收费点,请联系客服人员查询二维码是否正确。"
);
}
companyResVo
.
setCompanyTollPointVoList
(
companyTollPointVos
);
}
CompanyVo
companyVo
=
new
CompanyVo
();
...
...
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