Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SiEn
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
SiEn
Commits
77134168
Commit
77134168
authored
Nov 03, 2020
by
giaogiao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://119.28.51.83/hewei/Jumeirah
into future/sys/userLogin
parents
c9552416
12a337b4
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
126 additions
and
38 deletions
+126
-38
api-merchant/src/main/java/com/jumeirah/api/merchant/controller/plain/McPlainController.java
+21
-0
common/src/main/java/com/jumeirah/common/enums/PlainTypeStatusEnum.java
+28
-0
common/src/main/java/com/jumeirah/common/mapper/BusinessPlainMapper.java
+3
-1
common/src/main/java/com/jumeirah/common/mapper/ContactStaffMapper.java
+3
-1
common/src/main/java/com/jumeirah/common/mapper/McPlainMapper.java
+3
-1
common/src/main/java/com/jumeirah/common/mapper/StrokeDiscountMapper.java
+3
-1
common/src/main/java/com/jumeirah/common/mapper/StrokeMapper.java
+8
-2
common/src/main/java/com/jumeirah/common/service/impl/BusinessPlainServiceImpl.java
+4
-1
common/src/main/java/com/jumeirah/common/service/impl/ContactStaffServiceImpl.java
+11
-8
common/src/main/java/com/jumeirah/common/service/impl/McPlainServiceImpl.java
+11
-8
common/src/main/java/com/jumeirah/common/service/impl/StrokeDiscountServiceImpl.java
+11
-8
common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
+4
-2
common/src/main/resources/mapper/BusinessPlainMapper.xml
+1
-0
common/src/main/resources/mapper/ContactStaffMapper.xml
+1
-0
common/src/main/resources/mapper/McPlainMapper.xml
+1
-0
common/src/main/resources/mapper/StrokeDiscountMapper.xml
+1
-0
common/src/main/resources/mapper/StrokeMapper.xml
+2
-0
config/src/main/resources/static/i18n/messages_en_US.properties
+2
-2
config/src/main/resources/static/i18n/messages_zh_CN.properties
+2
-2
framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java
+6
-1
No files found.
api-merchant/src/main/java/com/jumeirah/api/merchant/controller/plain/McPlainController.java
View file @
77134168
...
@@ -2,9 +2,13 @@ package com.jumeirah.api.merchant.controller.plain;
...
@@ -2,9 +2,13 @@ package com.jumeirah.api.merchant.controller.plain;
import
com.jumeirah.api.merchant.entity.param.McPlainAddParam
;
import
com.jumeirah.api.merchant.entity.param.McPlainAddParam
;
import
com.jumeirah.common.entity.McPlain
;
import
com.jumeirah.common.entity.McPlain
;
import
com.jumeirah.common.entity.PlainType
;
import
com.jumeirah.common.enums.PlainTypeStatusEnum
;
import
com.jumeirah.common.param.McPlainPageParam
;
import
com.jumeirah.common.param.McPlainPageParam
;
import
com.jumeirah.common.service.McPlainService
;
import
com.jumeirah.common.service.McPlainService
;
import
com.jumeirah.common.service.PlainTypeService
;
import
com.jumeirah.common.vo.McPlainQueryVo
;
import
com.jumeirah.common.vo.McPlainQueryVo
;
import
io.geekidea.springbootplus.framework.common.api.ApiCode
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.controller.BaseController
;
import
io.geekidea.springbootplus.framework.common.controller.BaseController
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
...
@@ -42,6 +46,9 @@ public class McPlainController extends BaseController {
...
@@ -42,6 +46,9 @@ public class McPlainController extends BaseController {
@Autowired
@Autowired
private
McPlainService
mcPlainService
;
private
McPlainService
mcPlainService
;
@Autowired
private
PlainTypeService
plainTypeService
;
/**
/**
* 添加商家飞机表
* 添加商家飞机表
*/
*/
...
@@ -50,6 +57,9 @@ public class McPlainController extends BaseController {
...
@@ -50,6 +57,9 @@ public class McPlainController extends BaseController {
@ApiOperation
(
value
=
"添加商家飞机表"
)
@ApiOperation
(
value
=
"添加商家飞机表"
)
@RequiresPermissions
(
"merchant:aircraft:management:edit"
)
@RequiresPermissions
(
"merchant:aircraft:management:edit"
)
public
ApiResult
<
Boolean
>
addMcPlain
(
@Validated
(
Add
.
class
)
@RequestBody
McPlainAddParam
mcPlainAddParam
)
throws
Exception
{
public
ApiResult
<
Boolean
>
addMcPlain
(
@Validated
(
Add
.
class
)
@RequestBody
McPlainAddParam
mcPlainAddParam
)
throws
Exception
{
if
(
checkPtId
(
mcPlainAddParam
))
{
return
ApiResult
.
result
(
ApiCode
.
PLAIN_TYPE_NOT_FOUND
,
null
);
}
McPlain
mcPlain
=
new
McPlain
();
McPlain
mcPlain
=
new
McPlain
();
BeanUtils
.
copyProperties
(
mcPlainAddParam
,
mcPlain
);
BeanUtils
.
copyProperties
(
mcPlainAddParam
,
mcPlain
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
...
@@ -58,6 +68,14 @@ public class McPlainController extends BaseController {
...
@@ -58,6 +68,14 @@ public class McPlainController extends BaseController {
return
ApiResult
.
result
(
flag
);
return
ApiResult
.
result
(
flag
);
}
}
private
boolean
checkPtId
(
@RequestBody
@Validated
(
Add
.
class
)
McPlainAddParam
mcPlainAddParam
)
{
PlainType
plainType
=
plainTypeService
.
getById
(
mcPlainAddParam
.
getPtId
());
if
(
plainType
==
null
||
plainType
.
getStatus
().
intValue
()
==
PlainTypeStatusEnum
.
CANCEL
.
getCode
())
{
return
true
;
}
return
false
;
}
/**
/**
* 修改商家飞机表
* 修改商家飞机表
*/
*/
...
@@ -66,6 +84,9 @@ public class McPlainController extends BaseController {
...
@@ -66,6 +84,9 @@ public class McPlainController extends BaseController {
@ApiOperation
(
value
=
"修改商家飞机表"
)
@ApiOperation
(
value
=
"修改商家飞机表"
)
@RequiresPermissions
(
"merchant:aircraft:management:edit"
)
@RequiresPermissions
(
"merchant:aircraft:management:edit"
)
public
ApiResult
<
Boolean
>
updateMcPlain
(
@Validated
(
Update
.
class
)
@RequestBody
McPlainAddParam
mcPlainAddParam
)
throws
Exception
{
public
ApiResult
<
Boolean
>
updateMcPlain
(
@Validated
(
Update
.
class
)
@RequestBody
McPlainAddParam
mcPlainAddParam
)
throws
Exception
{
if
(
checkPtId
(
mcPlainAddParam
))
{
return
ApiResult
.
result
(
ApiCode
.
PLAIN_TYPE_NOT_FOUND
,
null
);
}
McPlain
mcPlain
=
new
McPlain
();
McPlain
mcPlain
=
new
McPlain
();
BeanUtils
.
copyProperties
(
mcPlainAddParam
,
mcPlain
);
BeanUtils
.
copyProperties
(
mcPlainAddParam
,
mcPlain
);
boolean
flag
=
mcPlainService
.
updateMcPlain
(
mcPlain
);
boolean
flag
=
mcPlainService
.
updateMcPlain
(
mcPlain
);
...
...
common/src/main/java/com/jumeirah/common/enums/PlainTypeStatusEnum.java
0 → 100644
View file @
77134168
package
com
.
jumeirah
.
common
.
enums
;
import
io.geekidea.springbootplus.framework.common.enums.BaseEnum
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
/**
* 状态,0-审核中,1-进行中,2-已完成,99-取消
*/
@Getter
@AllArgsConstructor
public
enum
PlainTypeStatusEnum
implements
BaseEnum
{
OK
(
0
,
"正常"
),
DISABLE
(
1
,
"禁用"
),
CANCEL
(
99
,
"删除"
);
/**
* 编号
*/
private
final
Integer
code
;
/**
* 名称
*/
private
final
String
desc
;
}
common/src/main/java/com/jumeirah/common/mapper/BusinessPlainMapper.java
View file @
77134168
...
@@ -34,9 +34,11 @@ public interface BusinessPlainMapper extends BaseMapper<BusinessPlain> {
...
@@ -34,9 +34,11 @@ public interface BusinessPlainMapper extends BaseMapper<BusinessPlain> {
*
*
* @param page
* @param page
* @param businessPlainPageParam
* @param businessPlainPageParam
* @param mcId
* @return
* @return
*/
*/
IPage
<
BusinessPlainQueryVo
>
getBusinessPlainPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
BusinessPlainPageParam
businessPlainPageParam
);
IPage
<
BusinessPlainQueryVo
>
getBusinessPlainPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
BusinessPlainPageParam
businessPlainPageParam
,
@Param
(
"mcId"
)
Long
mcId
);
IPage
<
BusinessPlainQueryForAppVo
>
getBusinessPlainPageListForApp
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
BusinessPlainPageParam
businessPlainPageParam
);
IPage
<
BusinessPlainQueryForAppVo
>
getBusinessPlainPageListForApp
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
BusinessPlainPageParam
businessPlainPageParam
);
...
...
common/src/main/java/com/jumeirah/common/mapper/ContactStaffMapper.java
View file @
77134168
...
@@ -35,8 +35,10 @@ public interface ContactStaffMapper extends BaseMapper<ContactStaff> {
...
@@ -35,8 +35,10 @@ public interface ContactStaffMapper extends BaseMapper<ContactStaff> {
*
*
* @param page
* @param page
* @param contactStaffPageParam
* @param contactStaffPageParam
* @param mcId
* @return
* @return
*/
*/
IPage
<
ContactStaffQueryVo
>
getContactStaffPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
ContactStaffPageParam
contactStaffPageParam
);
IPage
<
ContactStaffQueryVo
>
getContactStaffPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
ContactStaffPageParam
contactStaffPageParam
,
@Param
(
"mcId"
)
Long
mcId
);
}
}
common/src/main/java/com/jumeirah/common/mapper/McPlainMapper.java
View file @
77134168
...
@@ -35,8 +35,10 @@ public interface McPlainMapper extends BaseMapper<McPlain> {
...
@@ -35,8 +35,10 @@ public interface McPlainMapper extends BaseMapper<McPlain> {
*
*
* @param page
* @param page
* @param mcPlainPageParam
* @param mcPlainPageParam
* @param mcId
* @return
* @return
*/
*/
IPage
<
McPlainQueryVo
>
getMcPlainPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
McPlainPageParam
mcPlainPageParam
);
IPage
<
McPlainQueryVo
>
getMcPlainPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
McPlainPageParam
mcPlainPageParam
,
@Param
(
"mcId"
)
Long
mcId
);
}
}
common/src/main/java/com/jumeirah/common/mapper/StrokeDiscountMapper.java
View file @
77134168
...
@@ -35,8 +35,10 @@ public interface StrokeDiscountMapper extends BaseMapper<StrokeDiscount> {
...
@@ -35,8 +35,10 @@ public interface StrokeDiscountMapper extends BaseMapper<StrokeDiscount> {
*
*
* @param page
* @param page
* @param strokeDiscountPageParam
* @param strokeDiscountPageParam
* @param mcId
* @return
* @return
*/
*/
IPage
<
StrokeDiscountQueryVo
>
getStrokeDiscountPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
StrokeDiscountPageParam
strokeDiscountPageParam
);
IPage
<
StrokeDiscountQueryVo
>
getStrokeDiscountPageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"param"
)
StrokeDiscountPageParam
strokeDiscountPageParam
,
@Param
(
"mcId"
)
Long
mcId
);
}
}
common/src/main/java/com/jumeirah/common/mapper/StrokeMapper.java
View file @
77134168
...
@@ -56,16 +56,22 @@ public interface StrokeMapper extends BaseMapper<Stroke> {
...
@@ -56,16 +56,22 @@ public interface StrokeMapper extends BaseMapper<Stroke> {
*
*
* @param page
* @param page
* @param mcStrokePageParam
* @param mcStrokePageParam
* @param mcId
* @return
* @return
*/
*/
IPage
<
McStrokeQueryVo
>
getMcStrokePageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"mcStrokePageParam"
)
McStrokePageParam
mcStrokePageParam
);
IPage
<
McStrokeQueryVo
>
getMcStrokePageList
(
@Param
(
"page"
)
Page
page
,
@Param
(
"mcStrokePageParam"
)
McStrokePageParam
mcStrokePageParam
,
@Param
(
"mcId"
)
Long
mcId
);
/**
/**
* 收款记录
* 收款记录
* @param page
* @param page
* @param mcStrokePaymentPageParam
* @param mcStrokePaymentPageParam
* @param mcId
* @return
* @return
*/
*/
IPage
<
McStrokePaymentQueryVo
>
getPaymentPageList
(
Page
<
StrokeQueryVo
>
page
,
@Param
(
"param"
)
McStrokePaymentPageParam
mcStrokePaymentPageParam
);
IPage
<
McStrokePaymentQueryVo
>
getPaymentPageList
(
Page
<
StrokeQueryVo
>
page
,
@Param
(
"param"
)
McStrokePaymentPageParam
mcStrokePaymentPageParam
,
@Param
(
"mcId"
)
Long
mcId
);
}
}
common/src/main/java/com/jumeirah/common/service/impl/BusinessPlainServiceImpl.java
View file @
77134168
...
@@ -12,7 +12,9 @@ import com.jumeirah.common.vo.BusinessPlainQueryVo;
...
@@ -12,7 +12,9 @@ import com.jumeirah.common.vo.BusinessPlainQueryVo;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.shiro.jwt.JwtToken
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.shiro.SecurityUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -56,7 +58,8 @@ public class BusinessPlainServiceImpl extends BaseServiceImpl<BusinessPlainMappe
...
@@ -56,7 +58,8 @@ public class BusinessPlainServiceImpl extends BaseServiceImpl<BusinessPlainMappe
@Override
@Override
public
Paging
<
BusinessPlainQueryVo
>
getBusinessPlainPageList
(
BusinessPlainPageParam
businessPlainPageParam
)
throws
Exception
{
public
Paging
<
BusinessPlainQueryVo
>
getBusinessPlainPageList
(
BusinessPlainPageParam
businessPlainPageParam
)
throws
Exception
{
Page
<
BusinessPlainQueryVo
>
page
=
new
PageInfo
<>(
businessPlainPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
BusinessPlain:
:
getCreateTime
)));
Page
<
BusinessPlainQueryVo
>
page
=
new
PageInfo
<>(
businessPlainPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
BusinessPlain:
:
getCreateTime
)));
IPage
<
BusinessPlainQueryVo
>
iPage
=
businessPlainMapper
.
getBusinessPlainPageList
(
page
,
businessPlainPageParam
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
IPage
<
BusinessPlainQueryVo
>
iPage
=
businessPlainMapper
.
getBusinessPlainPageList
(
page
,
businessPlainPageParam
,
jwtToken
.
getMcId
());
return
new
Paging
<>(
iPage
);
return
new
Paging
<>(
iPage
);
}
}
...
...
common/src/main/java/com/jumeirah/common/service/impl/ContactStaffServiceImpl.java
View file @
77134168
package
com
.
jumeirah
.
common
.
service
.
impl
;
package
com
.
jumeirah
.
common
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.jumeirah.common.entity.ContactStaff
;
import
com.jumeirah.common.entity.ContactStaff
;
import
com.jumeirah.common.mapper.ContactStaffMapper
;
import
com.jumeirah.common.mapper.ContactStaffMapper
;
import
com.jumeirah.common.service.ContactStaffService
;
import
com.jumeirah.common.param.ContactStaffPageParam
;
import
com.jumeirah.common.param.ContactStaffPageParam
;
import
com.jumeirah.common.param.ContactStaffQueryVo
;
import
com.jumeirah.common.param.ContactStaffQueryVo
;
import
com.jumeirah.common.service.ContactStaffService
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
io.geekidea.springbootplus.framework.shiro.jwt.JwtToken
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.springframework.transaction.annotation.Transactional
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.
springframework.stereotype.Service
;
import
org.
apache.shiro.SecurityUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
/**
/**
* 服务实现类
* 服务实现类
...
@@ -55,7 +57,8 @@ public class ContactStaffServiceImpl extends BaseServiceImpl<ContactStaffMapper,
...
@@ -55,7 +57,8 @@ public class ContactStaffServiceImpl extends BaseServiceImpl<ContactStaffMapper,
@Override
@Override
public
Paging
<
ContactStaffQueryVo
>
getContactStaffPageList
(
ContactStaffPageParam
contactStaffPageParam
)
throws
Exception
{
public
Paging
<
ContactStaffQueryVo
>
getContactStaffPageList
(
ContactStaffPageParam
contactStaffPageParam
)
throws
Exception
{
Page
<
ContactStaffQueryVo
>
page
=
new
PageInfo
<>(
contactStaffPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
ContactStaff:
:
getCreateTime
)));
Page
<
ContactStaffQueryVo
>
page
=
new
PageInfo
<>(
contactStaffPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
ContactStaff:
:
getCreateTime
)));
IPage
<
ContactStaffQueryVo
>
iPage
=
contactStaffMapper
.
getContactStaffPageList
(
page
,
contactStaffPageParam
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
IPage
<
ContactStaffQueryVo
>
iPage
=
contactStaffMapper
.
getContactStaffPageList
(
page
,
contactStaffPageParam
,
jwtToken
.
getMcId
());
return
new
Paging
<
ContactStaffQueryVo
>(
iPage
);
return
new
Paging
<
ContactStaffQueryVo
>(
iPage
);
}
}
...
...
common/src/main/java/com/jumeirah/common/service/impl/McPlainServiceImpl.java
View file @
77134168
package
com
.
jumeirah
.
common
.
service
.
impl
;
package
com
.
jumeirah
.
common
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.jumeirah.common.entity.McPlain
;
import
com.jumeirah.common.entity.McPlain
;
import
com.jumeirah.common.mapper.McPlainMapper
;
import
com.jumeirah.common.mapper.McPlainMapper
;
import
com.jumeirah.common.service.McPlainService
;
import
com.jumeirah.common.param.McPlainPageParam
;
import
com.jumeirah.common.param.McPlainPageParam
;
import
com.jumeirah.common.service.McPlainService
;
import
com.jumeirah.common.vo.McPlainQueryVo
;
import
com.jumeirah.common.vo.McPlainQueryVo
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
io.geekidea.springbootplus.framework.shiro.jwt.JwtToken
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.springframework.transaction.annotation.Transactional
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.
springframework.stereotype.Service
;
import
org.
apache.shiro.SecurityUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
/**
/**
* 商家飞机表 服务实现类
* 商家飞机表 服务实现类
...
@@ -55,7 +57,8 @@ public class McPlainServiceImpl extends BaseServiceImpl<McPlainMapper, McPlain>
...
@@ -55,7 +57,8 @@ public class McPlainServiceImpl extends BaseServiceImpl<McPlainMapper, McPlain>
@Override
@Override
public
Paging
<
McPlainQueryVo
>
getMcPlainPageList
(
McPlainPageParam
mcPlainPageParam
)
throws
Exception
{
public
Paging
<
McPlainQueryVo
>
getMcPlainPageList
(
McPlainPageParam
mcPlainPageParam
)
throws
Exception
{
Page
<
McPlainQueryVo
>
page
=
new
PageInfo
<>(
mcPlainPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
McPlain:
:
getCreateTime
)));
Page
<
McPlainQueryVo
>
page
=
new
PageInfo
<>(
mcPlainPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
McPlain:
:
getCreateTime
)));
IPage
<
McPlainQueryVo
>
iPage
=
mcPlainMapper
.
getMcPlainPageList
(
page
,
mcPlainPageParam
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
IPage
<
McPlainQueryVo
>
iPage
=
mcPlainMapper
.
getMcPlainPageList
(
page
,
mcPlainPageParam
,
jwtToken
.
getMcId
());
return
new
Paging
<
McPlainQueryVo
>(
iPage
);
return
new
Paging
<
McPlainQueryVo
>(
iPage
);
}
}
...
...
common/src/main/java/com/jumeirah/common/service/impl/StrokeDiscountServiceImpl.java
View file @
77134168
package
com
.
jumeirah
.
common
.
service
.
impl
;
package
com
.
jumeirah
.
common
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.jumeirah.common.entity.StrokeDiscount
;
import
com.jumeirah.common.entity.StrokeDiscount
;
import
com.jumeirah.common.enums.StrokeDiscountStatusEnum
;
import
com.jumeirah.common.enums.StrokeDiscountStatusEnum
;
import
com.jumeirah.common.mapper.StrokeDiscountMapper
;
import
com.jumeirah.common.mapper.StrokeDiscountMapper
;
import
com.jumeirah.common.service.StrokeDiscountService
;
import
com.jumeirah.common.param.StrokeDiscountPageParam
;
import
com.jumeirah.common.param.StrokeDiscountPageParam
;
import
com.jumeirah.common.service.StrokeDiscountService
;
import
com.jumeirah.common.vo.StrokeDiscountQueryVo
;
import
com.jumeirah.common.vo.StrokeDiscountQueryVo
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
io.geekidea.springbootplus.framework.core.pagination.PageInfo
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
com.baomidou.mybatisplus.core.metadata.OrderItem
;
import
io.geekidea.springbootplus.framework.shiro.jwt.JwtToken
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.springframework.transaction.annotation.Transactional
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.
springframework.stereotype.Service
;
import
org.
apache.shiro.SecurityUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
/**
/**
* 优惠行程表 服务实现类
* 优惠行程表 服务实现类
...
@@ -59,7 +61,8 @@ public class StrokeDiscountServiceImpl extends BaseServiceImpl<StrokeDiscountMap
...
@@ -59,7 +61,8 @@ public class StrokeDiscountServiceImpl extends BaseServiceImpl<StrokeDiscountMap
@Override
@Override
public
Paging
<
StrokeDiscountQueryVo
>
getStrokeDiscountPageList
(
StrokeDiscountPageParam
strokeDiscountPageParam
)
throws
Exception
{
public
Paging
<
StrokeDiscountQueryVo
>
getStrokeDiscountPageList
(
StrokeDiscountPageParam
strokeDiscountPageParam
)
throws
Exception
{
Page
<
StrokeDiscountQueryVo
>
page
=
new
PageInfo
<>(
strokeDiscountPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
StrokeDiscount:
:
getCreateTime
)));
Page
<
StrokeDiscountQueryVo
>
page
=
new
PageInfo
<>(
strokeDiscountPageParam
,
OrderItem
.
desc
(
getLambdaColumn
(
StrokeDiscount:
:
getCreateTime
)));
IPage
<
StrokeDiscountQueryVo
>
iPage
=
strokeDiscountMapper
.
getStrokeDiscountPageList
(
page
,
strokeDiscountPageParam
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
IPage
<
StrokeDiscountQueryVo
>
iPage
=
strokeDiscountMapper
.
getStrokeDiscountPageList
(
page
,
strokeDiscountPageParam
,
jwtToken
.
getMcId
());
return
new
Paging
<
StrokeDiscountQueryVo
>(
iPage
);
return
new
Paging
<
StrokeDiscountQueryVo
>(
iPage
);
}
}
...
...
common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
View file @
77134168
...
@@ -112,14 +112,16 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
...
@@ -112,14 +112,16 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
@Override
@Override
public
Paging
<
McStrokeQueryVo
>
getMcStrokePageList
(
McStrokePageParam
mcStrokePageParam
)
{
public
Paging
<
McStrokeQueryVo
>
getMcStrokePageList
(
McStrokePageParam
mcStrokePageParam
)
{
Page
<
StrokeQueryVo
>
page
=
new
PageInfo
<>(
mcStrokePageParam
,
OrderItem
.
asc
(
getLambdaColumn
(
Stroke:
:
getCreateTime
)));
Page
<
StrokeQueryVo
>
page
=
new
PageInfo
<>(
mcStrokePageParam
,
OrderItem
.
asc
(
getLambdaColumn
(
Stroke:
:
getCreateTime
)));
IPage
<
McStrokeQueryVo
>
mcStrokePageList
=
strokeMapper
.
getMcStrokePageList
(
page
,
mcStrokePageParam
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
IPage
<
McStrokeQueryVo
>
mcStrokePageList
=
strokeMapper
.
getMcStrokePageList
(
page
,
mcStrokePageParam
,
jwtToken
.
getMcId
());
return
new
Paging
<
McStrokeQueryVo
>(
mcStrokePageList
);
return
new
Paging
<
McStrokeQueryVo
>(
mcStrokePageList
);
}
}
@Override
@Override
public
Paging
<
McStrokePaymentQueryVo
>
getPaymentPageList
(
McStrokePaymentPageParam
mcStrokePaymentPageParam
)
{
public
Paging
<
McStrokePaymentQueryVo
>
getPaymentPageList
(
McStrokePaymentPageParam
mcStrokePaymentPageParam
)
{
Page
<
StrokeQueryVo
>
page
=
new
PageInfo
<>(
mcStrokePaymentPageParam
);
Page
<
StrokeQueryVo
>
page
=
new
PageInfo
<>(
mcStrokePaymentPageParam
);
IPage
<
McStrokePaymentQueryVo
>
mcStrokePageList
=
strokeMapper
.
getPaymentPageList
(
page
,
mcStrokePaymentPageParam
);
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
IPage
<
McStrokePaymentQueryVo
>
mcStrokePageList
=
strokeMapper
.
getPaymentPageList
(
page
,
mcStrokePaymentPageParam
,
jwtToken
.
getMcId
());
return
new
Paging
<
McStrokePaymentQueryVo
>(
mcStrokePageList
);
return
new
Paging
<
McStrokePaymentQueryVo
>(
mcStrokePageList
);
}
}
...
...
common/src/main/resources/mapper/BusinessPlainMapper.xml
View file @
77134168
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
select
select
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
from business_plain
from business_plain
where mc_id = #{mcId}
</select>
</select>
<resultMap
id=
"pageListMap"
type=
"com.jumeirah.common.vo.BusinessPlainQueryVo"
>
<resultMap
id=
"pageListMap"
type=
"com.jumeirah.common.vo.BusinessPlainQueryVo"
>
...
...
common/src/main/resources/mapper/ContactStaffMapper.xml
View file @
77134168
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
select
select
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
from contact_staff
from contact_staff
where mc_id = #{mcId}
</select>
</select>
</mapper>
</mapper>
common/src/main/resources/mapper/McPlainMapper.xml
View file @
77134168
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
from mc_plain mp
from mc_plain mp
left join plain_type pt on pt.id = mp.pt_id
left join plain_type pt on pt.id = mp.pt_id
left join city_three_code ctc on ctc.id = mp.city_id
left join city_three_code ctc on ctc.id = mp.city_id
where mp.mc_id = #{mcId}
</select>
</select>
</mapper>
</mapper>
common/src/main/resources/mapper/StrokeDiscountMapper.xml
View file @
77134168
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
from stroke_discount sd
from stroke_discount sd
INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
where sd.mc_id = #{mcId}
</select>
</select>
</mapper>
</mapper>
common/src/main/resources/mapper/StrokeMapper.xml
View file @
77134168
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
<where>
<where>
s.mc_id = #{mcId}
<if
test=
"mcStrokePageParam.status != null and mcStrokePageParam.status != -1"
>
<if
test=
"mcStrokePageParam.status != null and mcStrokePageParam.status != -1"
>
AND s.status = #{mcStrokePageParam.status}
AND s.status = #{mcStrokePageParam.status}
</if>
</if>
...
@@ -173,6 +174,7 @@
...
@@ -173,6 +174,7 @@
stroke s
stroke s
LEFT JOIN app_user au ON au.id = s.user_id
LEFT JOIN app_user au ON au.id = s.user_id
<where>
<where>
s.mc_id = #{mcId}
<if
test=
"param.paymentStatus != null and param.paymentStatus != -1"
>
<if
test=
"param.paymentStatus != null and param.paymentStatus != -1"
>
AND s.status = #{param.paymentStatus}
AND s.status = #{param.paymentStatus}
</if>
</if>
...
...
config/src/main/resources/static/i18n/messages_en_US.properties
View file @
77134168
...
@@ -77,4 +77,5 @@ api.response.code.JWTDECODE_EXCEPTION=JWTDECODE_EXCEPTION
...
@@ -77,4 +77,5 @@ api.response.code.JWTDECODE_EXCEPTION=JWTDECODE_EXCEPTION
api.response.code.HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
=
HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
api.response.code.HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
=
HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
api.response.code.user.PWD_OR_USERNAME_ERROR
=
password or phone number error
api.response.code.user.PWD_OR_USERNAME_ERROR
=
password or phone number error
api.response.code.user.SMS_CODE_ERROR
=
sms code error
api.response.code.user.SMS_CODE_ERROR
=
sms code error
api.response.code.user.USER_NOT_FOUND
=
user not found
api.response.code.user.USER_NOT_FOUND
=
user not found
\ No newline at end of file
api.response.code.user.PLAIN_TYPE_NOT_FOUND
=
plain type not found
config/src/main/resources/static/i18n/messages_zh_CN.properties
View file @
77134168
...
@@ -77,4 +77,5 @@ api.response.code.JWTDECODE_EXCEPTION=Token解析异常
...
@@ -77,4 +77,5 @@ api.response.code.JWTDECODE_EXCEPTION=Token解析异常
api.response.code.HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
=
默认的异常处理
api.response.code.HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
=
默认的异常处理
api.response.code.user.PWD_OR_USERNAME_ERROR
=
账号或密码错误
api.response.code.user.PWD_OR_USERNAME_ERROR
=
账号或密码错误
api.response.code.user.SMS_CODE_ERROR
=
验证码错误
api.response.code.user.SMS_CODE_ERROR
=
验证码错误
api.response.code.user.USER_NOT_FOUND
=
用户不存在
api.response.code.user.USER_NOT_FOUND
=
用户不存在
\ No newline at end of file
api.response.code.user.PLAIN_TYPE_NOT_FOUND
=
飞机类型不存在
framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java
View file @
77134168
...
@@ -116,7 +116,12 @@ public enum ApiCode {
...
@@ -116,7 +116,12 @@ public enum ApiCode {
/**
/**
* 用户不存在
* 用户不存在
*/
*/
USER_NOT_FOUND
(
6003
,
"api.response.code.user.USER_NOT_FOUND"
);
USER_NOT_FOUND
(
6003
,
"api.response.code.user.USER_NOT_FOUND"
),
/**
* 飞机类型不存在
*/
PLAIN_TYPE_NOT_FOUND
(
6004
,
"api.response.code.user.PLAIN_TYPE_NOT_FOUND"
),
;
private
final
int
code
;
private
final
int
code
;
private
final
String
message
;
private
final
String
message
;
...
...
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