Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
7cfc09de
Commit
7cfc09de
authored
Nov 27, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
b14e0550
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
SpecialRentBiz.java
...main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java
+0
-5
VehicleVO.java
...ain/java/com/xxfc/platform/vehicle/pojo/vo/VehicleVO.java
+4
-0
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+3
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java
View file @
7cfc09de
...
@@ -137,11 +137,6 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
...
@@ -137,11 +137,6 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
CompanyDetail
companyDetail
=
vehicleFeign
.
getCompanyDetail
(
specialRent
.
getStartCompanyId
()).
getData
();
CompanyDetail
companyDetail
=
vehicleFeign
.
getCompanyDetail
(
specialRent
.
getStartCompanyId
()).
getData
();
specialRent
.
setStartCompanyName
(
companyDetail
.
getName
());
specialRent
.
setStartCompanyName
(
companyDetail
.
getName
());
specialRent
.
setStartCityCode
(
companyDetail
.
getAddrCity
());
specialRent
.
setStartCityCode
(
companyDetail
.
getAddrCity
());
}
if
(
null
!=
specialRent
.
getEndCompanyId
())
{
CompanyDetail
companyDetail
=
vehicleFeign
.
getCompanyDetail
(
specialRent
.
getEndCompanyId
()).
getData
();
specialRent
.
setEndCompanyName
(
companyDetail
.
getName
());
specialRent
.
setEndCityCode
(
companyDetail
.
getAddrCity
());
specialRent
.
setStartCityName
(
companyDetail
.
getCityName
());
specialRent
.
setStartCityName
(
companyDetail
.
getCityName
());
}
}
if
(
null
!=
specialRent
.
getEndCompanyId
())
{
if
(
null
!=
specialRent
.
getEndCompanyId
())
{
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleVO.java
View file @
7cfc09de
...
@@ -71,4 +71,8 @@ public class VehicleVO extends Vehicle {
...
@@ -71,4 +71,8 @@ public class VehicleVO extends Vehicle {
private
List
<
VehicleExtensionVO
>
vehicleExtensions
;
private
List
<
VehicleExtensionVO
>
vehicleExtensions
;
private
String
manageProvinceName
;
private
String
manageCityName
;
}
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
7cfc09de
...
@@ -1462,7 +1462,9 @@
...
@@ -1462,7 +1462,9 @@
c.`name` categoryName,
c.`name` categoryName,
bc.`name` as companyName,
bc.`name` as companyName,
bc1.`leader` as manageCompanyLeader,
bc1.`leader` as manageCompanyLeader,
bc1.`leader_contact_info` as manageCompanyLeaderContact
bc1.`leader_contact_info` as manageCompanyLeaderContact,
bc1.province_name as manageProvinceName,
bc1.city_name as manageCityName
<if
test=
"lon != null and lat != null"
>
<if
test=
"lon != null and lat != null"
>
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
</if>
</if>
...
...
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