Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
Z
zion
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
zion
Commits
52f23090
提交
52f23090
authored
10月 28, 2019
作者:
zgy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
注册就送优惠券
上级
7d2b108b
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
28 行增加
和
7 行删除
+28
-7
TbCfCouponController.java
...oyun/zion/chinafrica/controller/TbCfCouponController.java
+2
-2
TbCfCouponDao.xml
src/main/resources/mapper/TbCfCouponDao.xml
+1
-0
TbCfIssueCouponDao.xml
src/main/resources/mapper/TbCfIssueCouponDao.xml
+4
-3
ZionApplicationTests.java
src/test/java/com/diaoyun/zion/ZionApplicationTests.java
+21
-2
没有找到文件。
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java
浏览文件 @
52f23090
...
@@ -58,10 +58,10 @@ public class TbCfCouponController {
...
@@ -58,10 +58,10 @@ public class TbCfCouponController {
public
Result
<
CouponItem
>
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
);
}
}
@ApiOperation
(
"更改优惠券状态"
)
/*
@ApiOperation("更改优惠券状态")
@GetMapping("/changCouponStatus/{userId}/{couponId}")
@GetMapping("/changCouponStatus/{userId}/{couponId}")
public Result changCouponStatus(@ApiParam("用户Id")@PathVariable("userId") String userId,@ApiParam("优惠券Id")@PathVariable("couponId") String couponId){
public Result changCouponStatus(@ApiParam("用户Id")@PathVariable("userId") String userId,@ApiParam("优惠券Id")@PathVariable("couponId") String couponId){
return tbCfIssueCouponService.changeCouponStatus(userId,couponId);
return tbCfIssueCouponService.changeCouponStatus(userId,couponId);
}
}
*/
}
}
src/main/resources/mapper/TbCfCouponDao.xml
浏览文件 @
52f23090
...
@@ -302,6 +302,7 @@
...
@@ -302,6 +302,7 @@
`update_time`,
`update_time`,
`coupon_vaild`
`coupon_vaild`
from tb_cf_coupon
from tb_cf_coupon
where coupon_vaild = 1
</select>
</select>
<!--根据优惠券种类获取发放中的优惠券-->
<!--根据优惠券种类获取发放中的优惠券-->
<select
id=
"getCouponByCategory"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity"
>
<select
id=
"getCouponByCategory"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity"
>
...
...
src/main/resources/mapper/TbCfIssueCouponDao.xml
浏览文件 @
52f23090
...
@@ -82,7 +82,8 @@
...
@@ -82,7 +82,8 @@
</select>
</select>
<!--查询用户已使用的优惠券-->
<!--查询用户已使用的优惠券-->
<select
id=
"queryCouponByUserIdAndUsed"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends"
>
<select
id=
"queryCouponByUserIdAndUsed"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends"
>
select
select
a.coupon_issuetable_id,
a.coupon_issuetable_id,
a.coupon_id,
a.coupon_id,
...
@@ -111,7 +112,7 @@
...
@@ -111,7 +112,7 @@
</if>
</if>
</select>
</select>
<!--
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity">
<insert
id=
"save"
parameterType=
"com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity"
>
insert into tb_cf_issue_coupon(
insert into tb_cf_issue_coupon(
`coupon_issuetable_id`,
`coupon_issuetable_id`,
`coupon_id`,
`coupon_id`,
...
@@ -128,7 +129,7 @@
...
@@ -128,7 +129,7 @@
#{createTime},
#{createTime},
#{enableFlag},
#{enableFlag},
#{issueId})
#{issueId})
</insert>
-->
</insert>
<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
...
...
src/test/java/com/diaoyun/zion/ZionApplicationTests.java
浏览文件 @
52f23090
package
com
.
diaoyun
.
zion
;
package
com
.
diaoyun
.
zion
;
import
com.diaoyun.zion.chinafrica.constant.KeyConstant
;
import
com.diaoyun.zion.chinafrica.constant.KeyConstant
;
import
com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity
;
import
com.diaoyun.zion.chinafrica.service.SpiderService
;
import
com.diaoyun.zion.chinafrica.service.SpiderService
;
import
com.diaoyun.zion.chinafrica.service.TbCfCouponService
;
import
com.diaoyun.zion.chinafrica.service.TbCfCouponService
;
import
com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService
;
import
com.diaoyun.zion.chinafrica.service.TbCfUserInfoService
;
import
com.diaoyun.zion.master.thread.TaskLimitSemaphore
;
import
com.diaoyun.zion.master.thread.TaskLimitSemaphore
;
import
com.diaoyun.zion.master.util.AESUtils
;
import
com.diaoyun.zion.master.util.AESUtils
;
import
com.diaoyun.zion.master.util.IdUtil
;
import
com.diaoyun.zion.master.util.IdUtil
;
...
@@ -42,7 +45,8 @@ public class ZionApplicationTests {
...
@@ -42,7 +45,8 @@ public class ZionApplicationTests {
@Autowired
@Autowired
private
RedisTemplate
redisTemplate
;
private
RedisTemplate
redisTemplate
;
private
TaskLimitSemaphore
taskLimitSemaphore
=
new
TaskLimitSemaphore
(
12
);
private
TaskLimitSemaphore
taskLimitSemaphore
=
new
TaskLimitSemaphore
(
12
);
@Autowired
private
TbCfUserInfoService
tbCfUserInfoService
;
//private List<Map<String, Object>> futureList = new ArrayList<Map<String, Object>>();
//private List<Map<String, Object>> futureList = new ArrayList<Map<String, Object>>();
@Test
@Test
...
@@ -445,5 +449,20 @@ public class ZionApplicationTests {
...
@@ -445,5 +449,20 @@ public class ZionApplicationTests {
System
.
out
.
println
(
"==============="
+
redisTemplate
.
opsForValue
().
get
(
"hello"
));
System
.
out
.
println
(
"==============="
+
redisTemplate
.
opsForValue
().
get
(
"hello"
));
}
}
@Autowired
private
TbCfIssueCouponService
tbCfIssueCouponService
;
@Test
public
void
testLogin
(){
TbCfIssueCouponEntity
issue
=
new
TbCfIssueCouponEntity
();
String
coupon_id
=
""
;
String
issuseCoupon_id
=
IdUtil
.
createIdbyUUID
();
//把上面获取到的值,赋值到实体类中
issue
.
setCouponId
(
"1087f4a682354843b145d36c27d2d902"
);
issue
.
setCouponIssuetableId
(
"5308312b76cd4819b7d94f01dea12ab8"
);
issue
.
setCreateTime
(
new
Date
().
toString
());
issue
.
setUserId
(
"5308312b76cd4819b7d94f01dea12ab8"
);
issue
.
setNick
(
"avatar"
);
issue
.
setEnableFlag
(
0
);
tbCfIssueCouponService
.
save
(
issue
);
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论