Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
T
tongmeng-app
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
林海冰
tongmeng-app
Commits
f8a3c8ff
提交
f8a3c8ff
authored
1月 17, 2019
作者:
Mangostiffy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增抽奖日志管理
上级
59b165e8
全部展开
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
435 行增加
和
11 行删除
+435
-11
LotteryApi.java
src/main/java/com/mall/controller/api/LotteryApi.java
+13
-6
LotteryController.java
...m/mall/controller/tongmeng/lottery/LotteryController.java
+20
-0
LotteryManager.java
...ava/com/mall/service/mengbeng/lottery/LotteryManager.java
+15
-1
LotteryService.java
...om/mall/service/mengbeng/lottery/impl/LotteryService.java
+10
-0
LotteryMapper.xml
src/main/resources/mybatis1/tongmeng/LotteryMapper.xml
+35
-0
ShareMapper.xml
src/main/resources/mybatis1/tongmeng/ShareMapper.xml
+9
-0
banner_list.jsp
src/main/webapp/WEB-INF/jsp/tongmeng/banner/banner_list.jsp
+1
-1
lotterylog_list.jsp
...ebapp/WEB-INF/jsp/tongmeng/lotterylog/lotterylog_list.jsp
+328
-0
oneclassfy_list.jsp
...ebapp/WEB-INF/jsp/tongmeng/oneclassfy/oneclassfy_list.jsp
+1
-1
share_list.jsp
src/main/webapp/WEB-INF/jsp/tongmeng/share/share_list.jsp
+3
-2
没有找到文件。
src/main/java/com/mall/controller/api/LotteryApi.java
浏览文件 @
f8a3c8ff
package
com
.
mall
.
controller
.
api
;
import
com.jfinal.i18n.Res
;
import
com.mall.controller.base.BaseController
;
import
com.mall.service.mengbeng.lottery.LotteryManager
;
import
com.mall.util.PageData
;
...
...
@@ -10,10 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
@Controller
@RequestMapping
(
value
=
"/api/lottery"
,
produces
=
"application/json;charset=UTF-8"
)
...
...
@@ -41,16 +39,24 @@ public class LotteryApi extends BaseController {
PageData
result
=
list
.
get
(
resultnumber
);
//单次结果
resultnumberlist
.
add
((
int
)
result
.
get
(
"c_lottery_number"
));
}
PageData
lotteryresult
=
new
PageData
();
lotteryresult
.
put
(
"store_id"
,
store_id
);
DateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
lotteryresult
.
put
(
"createtime"
,
df
.
format
(
new
Date
()));
if
(
resultnumberlist
.
get
(
0
)==
resultnumberlist
.
get
(
1
)&&
resultnumberlist
.
get
(
1
)==
resultnumberlist
.
get
(
2
)){
pd
.
put
(
"c_lottery_number"
,
resultnumberlist
.
get
(
0
));
pd
=
lotteryService
.
findByLotterynumber
(
pd
);
//TODO:处理奖品
if
(
null
!=
pd
){
//TODO:根据数字处理奖品
System
.
out
.
println
(
"中奖"
);
Map
resultmap
=
new
HashMap
();
resultmap
.
put
(
"result"
,
1
);
resultmap
.
put
(
"resultnumber"
,
resultnumberlist
);
resultmap
.
put
(
"reward"
,
pd
);
//保存中奖记录
lotteryresult
.
put
(
"reward"
,
pd
.
get
(
"c_lottery_reward"
));
lotteryService
.
saveLotterylog
(
lotteryresult
);
return
ResultOutDto
.
ok
(
resultmap
);
}
else
{
return
ResultOutDto
.
err
(
null
,
"奖品不存在"
);
...
...
@@ -61,6 +67,7 @@ public class LotteryApi extends BaseController {
resultmap
.
put
(
"resultnumber"
,
resultnumberlist
);
resultmap
.
put
(
"reward"
,
null
);
System
.
out
.
println
(
"未中奖"
);
lotteryService
.
saveLotterylog
(
lotteryresult
);
return
ResultOutDto
.
ok
(
resultmap
);
}
}
catch
(
Exception
e
){
...
...
src/main/java/com/mall/controller/tongmeng/lottery/LotteryController.java
浏览文件 @
f8a3c8ff
...
...
@@ -204,4 +204,24 @@ public class LotteryController extends BaseController {
DateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
binder
.
registerCustomEditor
(
Date
.
class
,
new
CustomDateEditor
(
format
,
true
));
}
@RequestMapping
(
"/listlotterylog"
)
public
ModelAndView
listlotterylog
(
Page
page
)
throws
Exception
{
logBefore
(
logger
,
Jurisdiction
.
getUsername
()+
"列表Lottery"
);
//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
ModelAndView
mv
=
this
.
getModelAndView
();
PageData
pd
=
new
PageData
();
pd
=
this
.
getPageData
();
String
keywords
=
pd
.
getString
(
"keywords"
);
//关键词检索条件
if
(
null
!=
keywords
&&
!
""
.
equals
(
keywords
)){
pd
.
put
(
"keywords"
,
keywords
.
trim
());
}
page
.
setPd
(
pd
);
List
<
PageData
>
varList
=
lotteryService
.
lotteryloglistPage
(
page
);
//列出Lottery日志列表
mv
.
setViewName
(
"tongmeng/lotterylog/lotterylog_list"
);
mv
.
addObject
(
"varList"
,
varList
);
mv
.
addObject
(
"pd"
,
pd
);
mv
.
addObject
(
"QX"
,
Jurisdiction
.
getHC
());
//按钮权限
return
mv
;
}
}
src/main/java/com/mall/service/mengbeng/lottery/LotteryManager.java
浏览文件 @
f8a3c8ff
...
...
@@ -61,5 +61,19 @@ public interface LotteryManager{
*/
public
PageData
findByLotterynumber
(
PageData
pd
)
throws
Exception
;
/**
* 保存抽奖记录
* @param pd
* @throws Exception
*/
public
void
saveLotterylog
(
PageData
pd
)
throws
Exception
;
/**
* 列表抽奖日志
* @param page
* @return
* @throws Exception
*/
public
List
<
PageData
>
lotteryloglistPage
(
Page
page
)
throws
Exception
;
}
src/main/java/com/mall/service/mengbeng/lottery/impl/LotteryService.java
浏览文件 @
f8a3c8ff
...
...
@@ -83,5 +83,15 @@ public class LotteryService implements LotteryManager {
return
(
PageData
)
dao
.
findForObject
(
"LotteryMapper.findByLotterynumber"
,
pd
);
}
@Override
public
void
saveLotterylog
(
PageData
pd
)
throws
Exception
{
dao
.
save
(
"LotteryMapper.saveLotterylog"
,
pd
);
}
@Override
public
List
<
PageData
>
lotteryloglistPage
(
Page
page
)
throws
Exception
{
return
(
List
<
PageData
>)
dao
.
findForList
(
"LotteryMapper.lotteryloglistPage"
,
page
);
}
}
src/main/resources/mybatis1/tongmeng/LotteryMapper.xml
浏览文件 @
f8a3c8ff
...
...
@@ -112,4 +112,39 @@
where c_lottery_number = #{c_lottery_number}
</select>
<!--保存抽奖激励-->
<insert
id=
"saveLotterylog"
parameterType=
"pd"
>
insert into
c_lottery_log
(
store_id,
reward,
createtime
)
values
(
#{store_id},
#{reward},
#{createtime}
)
</insert>
<!--列表抽奖记录-->
<select
id=
"lotteryloglistPage"
parameterType=
"page"
resultType=
"pd"
>
select
lottery_log_id,
c_lottery_log.store_id,
reward,
c_store.store_name,
c_store.store_logo,
createtime
from
c_lottery_log
inner join c_store on c_store.store_id=c_lottery_log.store_id
where 1=1
<if
test=
"pd.keywords!= null and pd.keywords != ''"
>
and c_store.store_name LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mybatis1/tongmeng/ShareMapper.xml
浏览文件 @
f8a3c8ff
...
...
@@ -35,6 +35,15 @@
<include
refid=
"tableName"
></include>
inner join c_store as share on share.store_id=
<include
refid=
"tableName"
></include>
.share_store
inner join c_store as shared on shared.store_id=
<include
refid=
"tableName"
></include>
.shareed_store
where 1=1
<if
test=
"pd.keywords!= null and pd.keywords != ''"
>
and
(
share.store_name LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
or
shared.store_name LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
)
</if>
order by share_time desc
</select>
...
...
src/main/webapp/WEB-INF/jsp/tongmeng/banner/banner_list.jsp
浏览文件 @
f8a3c8ff
...
...
@@ -96,7 +96,7 @@
<div
class=
"col-xs-12"
>
<!-- 检索 -->
<form
action=
"list.do"
method=
"post"
name=
"Form"
id=
"Form"
>
<form
action=
"
${pageContext.request.contextPath}/
list.do"
method=
"post"
name=
"Form"
id=
"Form"
>
<table
style=
"margin-top:5px;"
>
...
...
src/main/webapp/WEB-INF/jsp/tongmeng/lotterylog/lotterylog_list.jsp
0 → 100644
浏览文件 @
f8a3c8ff
差异被折叠。
点击展开。
src/main/webapp/WEB-INF/jsp/tongmeng/oneclassfy/oneclassfy_list.jsp
浏览文件 @
f8a3c8ff
...
...
@@ -31,7 +31,7 @@
<!-- 检索 -->
<form
action=
"list.do"
method=
"post"
name=
"Form"
id=
"Form"
>
<form
action=
"
${pageContext.request.contextPath}/
list.do"
method=
"post"
name=
"Form"
id=
"Form"
>
<!--
<table style="margin-top:5px;">
<tr>
...
...
src/main/webapp/WEB-INF/jsp/tongmeng/share/share_list.jsp
浏览文件 @
f8a3c8ff
...
...
@@ -29,7 +29,7 @@
<div
class=
"row"
>
<div
class=
"col-xs-12"
>
<!-- 检索 -->
<form
action=
"list.do"
method=
"post"
name=
"Form"
id=
"Form"
>
<form
action=
"
${pageContext.request.contextPath}/share/
list.do"
method=
"post"
name=
"Form"
id=
"Form"
>
<table
style=
"margin-top:5px;"
>
<tr>
...
...
@@ -51,10 +51,11 @@
<option value="">2</option>
</select>
</td>
--%>
<c:if
test=
"
${
QX
.
cha
==
1
}
"
>
<td
style=
"vertical-align:top;padding-left:2px"
><a
class=
"btn btn-light btn-xs"
onclick=
"tosearch();"
title=
"检索"
><i
id=
"nav-search-icon"
class=
"ace-icon fa fa-search bigger-110 nav-search-icon blue"
></i></a></td>
</c:if>
<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
<
%--<
c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
--%>
</tr>
</table>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论