Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Y
yudao-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
hblj
yudao-cloud
Commits
92ed97fa
提交
92ed97fa
authored
4月 07, 2019
作者:
YunaiV
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
后端:用户优惠劵分页列表接口
上级
315dec74
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
137 行增加
和
8 行删除
+137
-8
env.js
mobile-web/src/config/env.js
+5
-6
AdminsCouponController.java
...application/controller/admins/AdminsCouponController.java
+3
-0
UsersCouponController.java
...n/application/controller/users/UsersCouponController.java
+20
-0
CouponCardConvert.java
...mall/promotion/application/convert/CouponCardConvert.java
+6
-0
UsersCouponCardPageVO.java
...promotion/application/vo/users/UsersCouponCardPageVO.java
+20
-0
CouponService.java
...ain/java/cn/iocoder/mall/promotion/api/CouponService.java
+3
-0
CouponCardPageBO.java
...va/cn/iocoder/mall/promotion/api/bo/CouponCardPageBO.java
+24
-0
CouponCardPageDTO.java
.../cn/iocoder/mall/promotion/api/dto/CouponCardPageDTO.java
+29
-0
CouponCardMapper.java
...a/cn/iocoder/mall/promotion/biz/dao/CouponCardMapper.java
+6
-2
CouponServiceImpl.java
...iocoder/mall/promotion/biz/service/CouponServiceImpl.java
+15
-0
CouponCardMapper.xml
...rvice-impl/src/main/resources/mapper/CouponCardMapper.xml
+6
-0
没有找到文件。
mobile-web/src/config/env.js
浏览文件 @
92ed97fa
/**
* 配置编译环境和线上环境之间的切换
*
*
* baseUrl: 域名地址
* routerMode: 路由模式
* dataSources:数据源
*/
let
baseUrl
=
''
;
let
baseUrl
=
''
;
let
routerMode
=
'hash'
;
let
dataSources
=
'local'
;
//local=本地,其他值代表非本地
...
...
@@ -20,11 +20,11 @@ if (!process.env.NODE_ENV || process.env.NODE_ENV == 'development') {
// baseUrl = 'http://127.0.0.1';
// baseUrl = 'http://180.167.213.26:18099';
dataSources
=
'remote'
;
//
dataSources = 'local';
//
dataSources = 'remote';
dataSources
=
'local'
;
export
{
baseUrl
,
routerMode
,
dataSources
,
}
\ No newline at end of file
}
promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/admins/AdminsCouponController.java
浏览文件 @
92ed97fa
...
...
@@ -35,7 +35,10 @@ public class AdminsCouponController {
@GetMapping
(
"/template/page"
)
@ApiOperation
(
value
=
"优惠劵(码)模板分页"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"type"
,
value
=
"类型"
,
example
=
"参考 CouponTemplateTypeEnum 枚举"
),
@ApiImplicitParam
(
name
=
"title"
,
value
=
"标题,模糊匹配"
,
example
=
"活动 A"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态"
,
example
=
"参考 CouponTemplateStatusEnum 枚举"
),
@ApiImplicitParam
(
name
=
"preferentialType"
,
value
=
"优惠类型"
,
example
=
"参考 CouponTemplatePreferentialTypeEnum 枚举"
),
@ApiImplicitParam
(
name
=
"pageNo"
,
value
=
"页码,从 1 开始"
,
example
=
"1"
),
@ApiImplicitParam
(
name
=
"pageSize"
,
value
=
"每页条数"
,
required
=
true
,
example
=
"10"
),
})
...
...
promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java
浏览文件 @
92ed97fa
...
...
@@ -3,9 +3,12 @@ package cn.iocoder.mall.promotion.application.controller.users;
import
cn.iocoder.common.framework.vo.CommonResult
;
import
cn.iocoder.mall.promotion.api.CouponService
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardPageBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponTemplateBO
;
import
cn.iocoder.mall.promotion.api.dto.CouponCardPageDTO
;
import
cn.iocoder.mall.promotion.application.convert.CouponCardConvert
;
import
cn.iocoder.mall.promotion.application.convert.CouponTemplateConvert
;
import
cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardPageVO
;
import
cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardVO
;
import
cn.iocoder.mall.promotion.application.vo.users.UsersCouponTemplateVO
;
import
cn.iocoder.mall.user.sdk.annotation.PermitAll
;
...
...
@@ -13,6 +16,7 @@ import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
import
com.alibaba.dubbo.config.annotation.Reference
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -37,6 +41,22 @@ public class UsersCouponController {
// ========== 优惠劵 ==========
@GetMapping
(
"/card/page"
)
@ApiOperation
(
value
=
"优惠劵分页"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态"
,
example
=
"参考 CouponCardStatusEnum 枚举"
),
@ApiImplicitParam
(
name
=
"pageNo"
,
value
=
"页码,从 1 开始"
,
example
=
"1"
),
@ApiImplicitParam
(
name
=
"pageSize"
,
value
=
"每页条数"
,
required
=
true
,
example
=
"10"
),
})
public
CommonResult
<
UsersCouponCardPageVO
>
cardPage
(
@RequestParam
(
value
=
"status"
,
required
=
false
)
Integer
status
,
@RequestParam
(
value
=
"pageNo"
,
defaultValue
=
"0"
)
Integer
pageNo
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"10"
)
Integer
pageSize
)
{
CommonResult
<
CouponCardPageBO
>
result
=
couponService
.
getCouponCardPage
(
new
CouponCardPageDTO
()
.
setStatus
(
status
).
setUserId
(
UserSecurityContextHolder
.
getContext
().
getUserId
())
.
setPageNo
(
pageNo
).
setPageSize
(
pageSize
));
return
CouponCardConvert
.
INSTANCE
.
convert2
(
result
);
}
@PostMapping
(
"/card/add"
)
@ApiOperation
(
value
=
"领取优惠劵"
)
@ApiImplicitParam
(
name
=
"templateId"
,
value
=
"优惠劵(码)模板编号"
,
required
=
true
,
example
=
"10"
)
...
...
promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/convert/CouponCardConvert.java
浏览文件 @
92ed97fa
...
...
@@ -2,6 +2,8 @@ package cn.iocoder.mall.promotion.application.convert;
import
cn.iocoder.common.framework.vo.CommonResult
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardPageBO
;
import
cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardPageVO
;
import
cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardVO
;
import
org.mapstruct.Mapper
;
import
org.mapstruct.Mappings
;
...
...
@@ -14,6 +16,10 @@ public interface CouponCardConvert {
@Mappings
({})
CommonResult
<
UsersCouponCardVO
>
convert
(
CommonResult
<
CouponCardBO
>
result
);
@Mappings
({})
CommonResult
<
UsersCouponCardPageVO
>
convert2
(
CommonResult
<
CouponCardPageBO
>
result
);
//
// @Mappings({})
// List<UsersCouponTemplateVO> convertList2(List<CouponTemplateBO> banners);
...
...
promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersCouponCardPageVO.java
0 → 100644
浏览文件 @
92ed97fa
package
cn
.
iocoder
.
mall
.
promotion
.
application
.
vo
.
users
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.util.List
;
@ApiModel
(
"优惠劵分页 VO"
)
@Data
@Accessors
(
chain
=
true
)
public
class
UsersCouponCardPageVO
{
@ApiModelProperty
(
value
=
"优惠劵数组"
)
private
List
<
UsersCouponCardVO
>
list
;
@ApiModelProperty
(
value
=
"优惠劵总数"
)
private
Integer
total
;
}
promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/CouponService.java
浏览文件 @
92ed97fa
...
...
@@ -3,6 +3,7 @@ package cn.iocoder.mall.promotion.api;
import
cn.iocoder.common.framework.validator.InEnum
;
import
cn.iocoder.common.framework.vo.CommonResult
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardPageBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponTemplateBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponTemplatePageBO
;
import
cn.iocoder.mall.promotion.api.constant.CouponTemplateStatusEnum
;
...
...
@@ -61,6 +62,8 @@ public interface CouponService {
// ========== 优惠劵 ==========
CommonResult
<
CouponCardPageBO
>
getCouponCardPage
(
CouponCardPageDTO
couponCardPageDTO
);
/**
* 基于优惠劵模板,领取优惠劵
*
...
...
promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponCardPageBO.java
0 → 100644
浏览文件 @
92ed97fa
package
cn
.
iocoder
.
mall
.
promotion
.
api
.
bo
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.util.List
;
/**
* 优惠劵分页 BO
*/
@Data
@Accessors
(
chain
=
true
)
public
class
CouponCardPageBO
{
/**
* 优惠劵数组
*/
private
List
<
CouponCardBO
>
list
;
/**
* 总量
*/
private
Integer
total
;
}
promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardPageDTO.java
0 → 100644
浏览文件 @
92ed97fa
package
cn
.
iocoder
.
mall
.
promotion
.
api
.
dto
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
javax.validation.constraints.NotNull
;
/**
* 优惠劵分页 DTO
*/
@Data
@Accessors
(
chain
=
true
)
public
class
CouponCardPageDTO
{
/**
* 用户编号
*/
private
Integer
userId
;
/**
* 状态
*/
private
Integer
status
;
@NotNull
(
message
=
"页码不能为空"
)
private
Integer
pageNo
;
@NotNull
(
message
=
"每页条数不能为空"
)
private
Integer
pageSize
;
}
promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dao/CouponCardMapper.java
浏览文件 @
92ed97fa
...
...
@@ -11,9 +11,13 @@ public interface CouponCardMapper {
CouponCardDO
selectById
(
@Param
(
"id"
)
Integer
id
);
List
<
CouponCardDO
>
selectListByPage
(
@Param
(
"status"
)
Integer
status
);
List
<
CouponCardDO
>
selectListByPage
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"status"
)
Integer
status
,
@Param
(
"offset"
)
Integer
offset
,
@Param
(
"limit"
)
Integer
limit
);
Integer
selectCountByPage
(
@Param
(
"status"
)
Integer
status
);
Integer
selectCountByPage
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"status"
)
Integer
status
);
int
selectCountByUserIdAndTemplateId
(
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"templateId"
)
Integer
templateId
);
...
...
promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java
浏览文件 @
92ed97fa
...
...
@@ -6,6 +6,7 @@ import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import
cn.iocoder.common.framework.vo.CommonResult
;
import
cn.iocoder.mall.promotion.api.CouponService
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponCardPageBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponTemplateBO
;
import
cn.iocoder.mall.promotion.api.bo.CouponTemplatePageBO
;
import
cn.iocoder.mall.promotion.api.constant.*
;
...
...
@@ -176,6 +177,20 @@ public class CouponServiceImpl implements CouponService {
// ========== 优惠劵 ==========
@Override
public
CommonResult
<
CouponCardPageBO
>
getCouponCardPage
(
CouponCardPageDTO
couponCardPageDTO
)
{
CouponCardPageBO
pageBO
=
new
CouponCardPageBO
();
// 查询分页数据
int
offset
=
(
couponCardPageDTO
.
getPageNo
()
-
1
)
*
couponCardPageDTO
.
getPageSize
();
pageBO
.
setList
(
CouponCardConvert
.
INSTANCE
.
convertToBO
(
couponCardMapper
.
selectListByPage
(
couponCardPageDTO
.
getUserId
(),
couponCardPageDTO
.
getStatus
(),
offset
,
couponCardPageDTO
.
getPageSize
())));
// 查询分页总数
pageBO
.
setTotal
(
couponCardMapper
.
selectCountByPage
(
couponCardPageDTO
.
getUserId
(),
couponCardPageDTO
.
getStatus
()));
return
CommonResult
.
success
(
pageBO
);
}
@Override
@Transactional
public
CommonResult
<
CouponCardBO
>
addCouponCard
(
Integer
userId
,
Integer
couponTemplateId
)
{
...
...
promotion/promotion-service-impl/src/main/resources/mapper/CouponCardMapper.xml
浏览文件 @
92ed97fa
...
...
@@ -38,6 +38,9 @@
<include
refid=
"FIELDS"
/>
FROM coupon_card
<where>
<if
test=
"userId != null"
>
AND user_id = #{userId}
</if>
<if
test=
"status != null"
>
AND status = #{status}
</if>
...
...
@@ -50,6 +53,9 @@
COUNT(1)
FROM coupon_card
<where>
<if
test=
"userId != null"
>
AND user_id = #{userId}
</if>
<if
test=
"status != null"
>
AND status = #{status}
</if>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论