Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
Z
zion
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
zion
Commits
ebdf8ceb
提交
ebdf8ceb
authored
10月 27, 2019
作者:
zgy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加接口:根据用户ID查询优惠券
上级
6949d12f
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
124 行增加
和
75 行删除
+124
-75
TbCfCouponController.java
...oyun/zion/chinafrica/controller/TbCfCouponController.java
+2
-1
CouponItem.java
...n/java/com/diaoyun/zion/chinafrica/entity/CouponItem.java
+15
-0
TbCfIssueCouponEntityExtends.java
.../zion/chinafrica/entity/TbCfIssueCouponEntityExtends.java
+27
-0
TbCfIssueCouponService.java
...aoyun/zion/chinafrica/service/TbCfIssueCouponService.java
+2
-1
TbCfIssueCouponServiceImpl.java
...n/chinafrica/service/impl/TbCfIssueCouponServiceImpl.java
+6
-3
TbCfIssueCouponDao.xml
src/main/resources/mapper/TbCfIssueCouponDao.xml
+72
-70
没有找到文件。
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java
浏览文件 @
ebdf8ceb
package
com
.
diaoyun
.
zion
.
chinafrica
.
controller
;
package
com
.
diaoyun
.
zion
.
chinafrica
.
controller
;
import
com.diaoyun.zion.chinafrica.constant.KeyConstant
;
import
com.diaoyun.zion.chinafrica.constant.KeyConstant
;
import
com.diaoyun.zion.chinafrica.entity.CouponItem
;
import
com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends
;
import
com.diaoyun.zion.chinafrica.service.TbCfCouponService
;
import
com.diaoyun.zion.chinafrica.service.TbCfCouponService
;
...
@@ -53,7 +54,7 @@ public class TbCfCouponController {
...
@@ -53,7 +54,7 @@ public class TbCfCouponController {
}
}
@ApiOperation
(
"用户Id"
)
@ApiOperation
(
"用户Id"
)
@GetMapping
(
"/queryCouponByUserId/{userId}"
)
@GetMapping
(
"/queryCouponByUserId/{userId}"
)
public
Result
<
TbCfIssueCouponEntityExtends
>
queryCouponByUserId
(
@ApiParam
(
"用户Id"
)
@PathVariable
(
"userId"
)
String
userId
)
{
public
Result
<
CouponItem
>
queryCouponByUserId
(
@ApiParam
(
"用户Id"
)
@PathVariable
(
"userId"
)
String
userId
)
{
return
tbCfIssueCouponService
.
queryCouponByUserId
(
userId
);
return
tbCfIssueCouponService
.
queryCouponByUserId
(
userId
);
}
}
...
...
src/main/java/com/diaoyun/zion/chinafrica/entity/CouponItem.java
0 → 100644
浏览文件 @
ebdf8ceb
package
com
.
diaoyun
.
zion
.
chinafrica
.
entity
;
import
java.util.List
;
public
class
CouponItem
{
private
List
<
TbCfIssueCouponEntityExtends
>
couponList
;
public
List
<
TbCfIssueCouponEntityExtends
>
getCouponList
()
{
return
couponList
;
}
public
void
setCouponList
(
List
<
TbCfIssueCouponEntityExtends
>
couponList
)
{
this
.
couponList
=
couponList
;
}
}
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfIssueCouponEntityExtends.java
浏览文件 @
ebdf8ceb
package
com
.
diaoyun
.
zion
.
chinafrica
.
entity
;
package
com
.
diaoyun
.
zion
.
chinafrica
.
entity
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
public
class
TbCfIssueCouponEntityExtends
extends
TbCfIssueCouponEntity
{
public
class
TbCfIssueCouponEntityExtends
extends
TbCfIssueCouponEntity
{
private
BigDecimal
amount
;
private
BigDecimal
amount
;
private
BigDecimal
money
;
private
BigDecimal
money
;
private
String
start
;
private
String
end
;
public
void
setStart
(
Date
start
)
{
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy/MM/dd"
);
String
startTime
=
format
.
format
(
start
);
this
.
start
=
startTime
;
}
public
String
getStart
()
{
return
start
;
}
public
String
getEnd
()
{
return
end
;
}
public
void
setEnd
(
Date
end
)
{
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy/MM/dd"
);
String
endTime
=
format
.
format
(
end
);
this
.
end
=
endTime
;
}
public
BigDecimal
getAmount
()
{
public
BigDecimal
getAmount
()
{
return
amount
;
return
amount
;
}
}
...
...
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfIssueCouponService.java
浏览文件 @
ebdf8ceb
package
com
.
diaoyun
.
zion
.
chinafrica
.
service
;
package
com
.
diaoyun
.
zion
.
chinafrica
.
service
;
import
com.diaoyun.zion.chinafrica.entity.CouponItem
;
import
com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends
;
...
@@ -74,7 +75,7 @@ public interface TbCfIssueCouponService {
...
@@ -74,7 +75,7 @@ public interface TbCfIssueCouponService {
*/
*/
int
deleteBatch
(
String
[]
couponIssuetableIds
);
int
deleteBatch
(
String
[]
couponIssuetableIds
);
Result
<
TbCfIssueCouponEntityExtends
>
queryCouponByUserId
(
String
userId
);
Result
<
CouponItem
>
queryCouponByUserId
(
String
userId
);
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfIssueCouponServiceImpl.java
浏览文件 @
ebdf8ceb
package
com
.
diaoyun
.
zion
.
chinafrica
.
service
.
impl
;
package
com
.
diaoyun
.
zion
.
chinafrica
.
service
.
impl
;
import
com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao
;
import
com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao
;
import
com.diaoyun.zion.chinafrica.entity.CouponItem
;
import
com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends
;
...
@@ -70,8 +71,10 @@ public class TbCfIssueCouponServiceImpl implements TbCfIssueCouponService {
...
@@ -70,8 +71,10 @@ public class TbCfIssueCouponServiceImpl implements TbCfIssueCouponService {
return
tbCfIssueCouponDao
.
save
(
tbCfIssueCoupon
);
return
tbCfIssueCouponDao
.
save
(
tbCfIssueCoupon
);
}
}
public
Result
<
TbCfIssueCouponEntityExtends
>
queryCouponByUserId
(
String
userId
){
public
Result
<
CouponItem
>
queryCouponByUserId
(
String
userId
){
List
<
TbCfIssueCouponEntityExtends
>
anExtends
=
tbCfIssueCouponDao
.
queryCouponByUserId
(
userId
);
List
<
TbCfIssueCouponEntityExtends
>
list
=
tbCfIssueCouponDao
.
queryCouponByUserId
(
userId
);
return
new
Result
<>(
anExtends
.
get
(
0
));
CouponItem
couponItem
=
new
CouponItem
();
couponItem
.
setCouponList
(
list
);
return
new
Result
<>(
couponItem
);
}
}
}
}
src/main/resources/mapper/TbCfIssueCouponDao.xml
浏览文件 @
ebdf8ceb
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
limit #{offset}, #{limit}
limit #{offset}, #{limit}
</if>
</if>
</select>
</select>
<select
id=
"queryCouponByUserId"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends"
>
<select
id=
"queryCouponByUserId"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends"
>
select
select
a.coupon_issuetable_id,
a.coupon_issuetable_id,
a.coupon_id,
a.coupon_id,
...
@@ -67,6 +67,8 @@
...
@@ -67,6 +67,8 @@
b.coupon_title,
b.coupon_title,
b.with_amount amount,
b.with_amount amount,
b.deduct_amount money,
b.deduct_amount money,
b.valid_start_time start,
b.valid_end_time end,
a.user_id,
a.user_id,
a.nick,
a.nick,
a.create_time,
a.create_time,
...
@@ -106,11 +108,11 @@
...
@@ -106,11 +108,11 @@
<update
id=
"update"
parameterType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity"
>
<update
id=
"update"
parameterType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity"
>
update tb_cf_issue_coupon
update tb_cf_issue_coupon
<set>
<set>
<if
test=
"couponId != null"
>
`coupon_id` = #{couponId},
</if>
<if
test=
"couponId != null"
>
`coupon_id` = #{couponId},
</if>
<if
test=
"userId != null"
>
`user_id` = #{userId},
</if>
<if
test=
"userId != null"
>
`user_id` = #{userId},
</if>
<if
test=
"nick != null"
>
`nick` = #{nick},
</if>
<if
test=
"nick != null"
>
`nick` = #{nick},
</if>
<if
test=
"createTime != null"
>
`create_time` = #{createTime},
</if>
<if
test=
"createTime != null"
>
`create_time` = #{createTime},
</if>
<if
test=
"enableFlag != null"
>
`enable_flag` = #{enableFlag},
</if>
<if
test=
"enableFlag != null"
>
`enable_flag` = #{enableFlag},
</if>
<if
test=
"issueId != null"
>
`issue_id` = #{issueId}
</if>
<if
test=
"issueId != null"
>
`issue_id` = #{issueId}
</if>
</set>
</set>
where coupon_issuetable_id = #{couponIssuetableId}
where coupon_issuetable_id = #{couponIssuetableId}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论