Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
consume
Project
Project
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
竹天卫
consume
Commits
25121169
Commit
25121169
authored
Nov 02, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠卷过滤
parent
89d3e1b1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
15 deletions
+35
-15
SysCouponController.java
...e/sc/consume/business/controller/SysCouponController.java
+8
-4
SysCouponMapper.java
...a/cn/wise/sc/consume/business/mapper/SysCouponMapper.java
+6
-3
SysCouponMapper.xml
...n/wise/sc/consume/business/mapper/xml/SysCouponMapper.xml
+5
-1
ISysCouponService.java
...n/wise/sc/consume/business/service/ISysCouponService.java
+4
-1
SysCouponServiceImpl.java
...c/consume/business/service/impl/SysCouponServiceImpl.java
+12
-6
No files found.
consume-business/src/main/java/cn/wise/sc/consume/business/controller/SysCouponController.java
View file @
25121169
...
@@ -6,6 +6,7 @@ import cn.wise.sc.consume.business.entity.SysCoupon;
...
@@ -6,6 +6,7 @@ import cn.wise.sc.consume.business.entity.SysCoupon;
import
cn.wise.sc.consume.business.entity.SysCouponDetail
;
import
cn.wise.sc.consume.business.entity.SysCouponDetail
;
import
cn.wise.sc.consume.business.entity.SysUser
;
import
cn.wise.sc.consume.business.entity.SysUser
;
import
cn.wise.sc.consume.business.mapper.SysCouponDetailMapper
;
import
cn.wise.sc.consume.business.mapper.SysCouponDetailMapper
;
import
cn.wise.sc.consume.business.mapper.SysCouponMapper
;
import
cn.wise.sc.consume.business.model.CouponDetailDTO
;
import
cn.wise.sc.consume.business.model.CouponDetailDTO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
...
@@ -68,6 +69,8 @@ public class SysCouponController {
...
@@ -68,6 +69,8 @@ public class SysCouponController {
private
SysCouponDetailMapper
couponDetailMapper
;
private
SysCouponDetailMapper
couponDetailMapper
;
@Autowired
@Autowired
private
CommonService
commonService
;
private
CommonService
commonService
;
@javax
.
annotation
.
Resource
private
SysCouponMapper
sysCouponMapper
;
@ApiOperation
(
value
=
"优惠券列表"
)
@ApiOperation
(
value
=
"优惠券列表"
)
@ApiImplicitParams
(
value
=
{
@ApiImplicitParams
(
value
=
{
...
@@ -81,14 +84,15 @@ public class SysCouponController {
...
@@ -81,14 +84,15 @@ public class SysCouponController {
public
Wrapper
getCouponPage
(
PageTableRequest
request
,
String
couponName
,
Long
enterpriseId
,
Integer
status
)
{
public
Wrapper
getCouponPage
(
PageTableRequest
request
,
String
couponName
,
Long
enterpriseId
,
Integer
status
)
{
try
{
try
{
couponDetailService
.
beVerdue
();
couponDetailService
.
beVerdue
();
I
Page
<
CouponListVO
>
page
=
new
Page
<>(
request
.
getCurrent
(),
request
.
getSize
());
Page
<
CouponListVO
>
page
=
new
Page
<>(
request
.
getCurrent
(),
request
.
getSize
());
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"couponName"
,
couponName
);
map
.
put
(
"couponName"
,
couponName
);
map
.
put
(
"enterpriseId"
,
enterpriseId
);
map
.
put
(
"enterpriseId"
,
enterpriseId
);
map
.
put
(
"status"
,
status
);
map
.
put
(
"status"
,
status
);
List
<
CouponListVO
>
couponListVOS
=
couponService
.
getPage
(
map
);
IPage
<
CouponListVO
>
pages
=
sysCouponMapper
.
getCouponPage
(
page
,
map
);
page
.
setRecords
(
couponListVOS
).
setTotal
(
couponListVOS
.
size
());
// List<CouponListVO> couponListVOS = couponService.getPage(request,map);
return
WrapMapper
.
wrap
(
200
,
"成功"
,
page
);
// page.setRecords(couponListVOS).setTotal(couponListVOS.size());
return
WrapMapper
.
wrap
(
200
,
"成功"
,
pages
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
debug
(
"优惠券列表{}"
,
e
);
log
.
debug
(
"优惠券列表{}"
,
e
);
}
}
...
...
consume-business/src/main/java/cn/wise/sc/consume/business/mapper/SysCouponMapper.java
View file @
25121169
package
cn
.
wise
.
sc
.
consume
.
business
.
mapper
;
package
cn
.
wise
.
sc
.
consume
.
business
.
mapper
;
import
cn.hutool.db.Page
;
import
cn.wise.sc.consume.business.entity.SysCoupon
;
import
cn.wise.sc.consume.business.entity.SysCoupon
;
import
cn.wise.sc.consume.business.entity.SysCouponDetail
;
import
cn.wise.sc.consume.business.model.CouponAppListVO
;
import
cn.wise.sc.consume.business.model.CouponAppListVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.PageTableRequest
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
...
@@ -22,13 +25,13 @@ import java.util.Map;
...
@@ -22,13 +25,13 @@ import java.util.Map;
*/
*/
public
interface
SysCouponMapper
extends
BaseMapper
<
SysCoupon
>
{
public
interface
SysCouponMapper
extends
BaseMapper
<
SysCoupon
>
{
List
<
CouponListVO
>
getCouponPage
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
IPage
<
CouponListVO
>
getCouponPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
CouponDetailVO
getCouponDetail
(
Long
id
);
CouponDetailVO
getCouponDetail
(
Long
id
);
List
<
CouponAppListVO
>
getCouponAppList
(
@Param
(
"coridc"
)
String
coridc
,
@Param
(
"usridc"
)
String
usridc
,
QueryWrapper
<
CouponAppListVO
>
qw
);
List
<
CouponAppListVO
>
getCouponAppList
(
@Param
(
"coridc"
)
String
coridc
,
@Param
(
"usridc"
)
String
usridc
,
QueryWrapper
<
CouponAppListVO
>
qw
);
List
<
SysCoupon
>
getById
(
@Param
(
"param"
)
Long
id
);
...
...
consume-business/src/main/java/cn/wise/sc/consume/business/mapper/xml/SysCouponMapper.xml
View file @
25121169
...
@@ -46,7 +46,11 @@
...
@@ -46,7 +46,11 @@
<select
id=
"getById"
resultType=
"cn.wise.sc.consume.business.entity.SysCoupon"
>
select sc.*
from sys_coupon sc
where id = #{param};
</select>
...
...
consume-business/src/main/java/cn/wise/sc/consume/business/service/ISysCouponService.java
View file @
25121169
...
@@ -4,6 +4,9 @@ import cn.wise.sc.consume.business.entity.SysCoupon;
...
@@ -4,6 +4,9 @@ import cn.wise.sc.consume.business.entity.SysCoupon;
import
cn.wise.sc.consume.business.model.CouponAppListVO
;
import
cn.wise.sc.consume.business.model.CouponAppListVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.PageTableRequest
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -18,7 +21,7 @@ import java.util.Map;
...
@@ -18,7 +21,7 @@ import java.util.Map;
*/
*/
public
interface
ISysCouponService
extends
IService
<
SysCoupon
>
{
public
interface
ISysCouponService
extends
IService
<
SysCoupon
>
{
List
<
CouponListVO
>
getPage
(
Map
<
String
,
Object
>
map
);
IPage
<
CouponListVO
>
getPage
(
Page
request
,
Map
<
String
,
Object
>
map
);
CouponDetailVO
getCouponDetail
(
Long
id
);
CouponDetailVO
getCouponDetail
(
Long
id
);
...
...
consume-business/src/main/java/cn/wise/sc/consume/business/service/impl/SysCouponServiceImpl.java
View file @
25121169
...
@@ -8,9 +8,12 @@ import cn.wise.sc.consume.business.mapper.SysCouponMapper;
...
@@ -8,9 +8,12 @@ import cn.wise.sc.consume.business.mapper.SysCouponMapper;
import
cn.wise.sc.consume.business.model.CouponAppListVO
;
import
cn.wise.sc.consume.business.model.CouponAppListVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponDetailVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.CouponListVO
;
import
cn.wise.sc.consume.business.model.PageTableRequest
;
import
cn.wise.sc.consume.business.service.ISysCouponService
;
import
cn.wise.sc.consume.business.service.ISysCouponService
;
import
cn.wise.sc.consume.business.wrapper.page.Query
;
import
cn.wise.sc.consume.business.wrapper.page.Query
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -42,9 +45,12 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
...
@@ -42,9 +45,12 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
@Resource
@Resource
private
SysCouponDetailMapper
sysCouponDetailMapper
;
private
SysCouponDetailMapper
sysCouponDetailMapper
;
@Resource
private
SysCouponMapper
sysCouponMapper
;
@Override
@Override
public
List
<
CouponListVO
>
getPage
(
Map
<
String
,
Object
>
map
)
{
public
IPage
<
CouponListVO
>
getPage
(
Page
request
,
Map
<
String
,
Object
>
map
)
{
List
<
CouponListVO
>
couponListVOS
=
couponMapper
.
getCouponPage
(
map
);
IPage
<
CouponListVO
>
couponListVOS
=
couponMapper
.
getCouponPage
(
request
,
map
);
log
.
debug
(
"优惠券列表{}"
);
log
.
debug
(
"优惠券列表{}"
);
return
couponListVOS
;
return
couponListVOS
;
}
}
...
@@ -64,11 +70,11 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
...
@@ -64,11 +70,11 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
if
(
list
!=
null
){
if
(
list
!=
null
){
for
(
CouponAppListVO
couponAppListVO:
list
){
for
(
CouponAppListVO
couponAppListVO:
list
){
Long
coupId
=
couponAppListVO
.
getId
();
Long
coupId
=
couponAppListVO
.
getId
();
List
<
SysCoupon
Detail
>
byCouponId
=
sysCouponDetailMapper
.
getByCoupon
Id
(
coupId
);
List
<
SysCoupon
>
byCouponId
=
sysCouponMapper
.
getBy
Id
(
coupId
);
for
(
SysCoupon
Detail
sysCouponDetail
:
byCouponId
){
for
(
SysCoupon
sysCoupon
:
byCouponId
){
boolean
equals
=
sysCoupon
Detail
.
getIsReceive
()
==
0
;
boolean
equals
=
sysCoupon
.
getStatus
()
==
1
;
boolean
equals1
=
sysCoupon
Detail
.
getIsDelete
()
==
1
;
boolean
equals1
=
sysCoupon
.
getIsDelete
()
==
1
;
if
((
equals
&&
equals1
)){
if
((
equals
&&
equals1
)){
rts
.
add
(
couponAppListVO
);
rts
.
add
(
couponAppListVO
);
}
}
...
...
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