Skip to content

caosy / fun-admin

Go to a project
Commit 2b30fcaf by chongli
Options

会服模块独立，方便授权

parent b40f658f
Inline Side-by-side
Showing with 43 additions and 46 deletions
src/main/java/com/ctrip/fun/admin/controller/market/CommuneAdmController.java → src/main/java/com/ctrip/fun/admin/controller/communeservice/CommuneAdmController.java
package com.ctrip.fun.admin.controller.market;
package com.ctrip.fun.admin.controller.communeservice;
import java.util.ArrayList;
......@@ -32,7 +32,7 @@ import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
import com.ctrip.fun.common.vo.user.CommuneLabelBean;
@Controller
@RequestMapping("/communeAdm")
@RequestMapping("/communeservice/communeAdm")
public class CommuneAdmController {
@Autowired
......
src/main/java/com/ctrip/fun/admin/controller/market/EventGameController.java → src/main/java/com/ctrip/fun/admin/controller/communeservice/EventGameController.java
package com.ctrip.fun.admin.controller.market;
package com.ctrip.fun.admin.controller.communeservice;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
......@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
@Controller
@RequestMapping("/market/eventGame")
@RequestMapping("/communeservice/eventGame")
public class EventGameController {
@Autowired
......@@ -85,7 +85,7 @@ public class EventGameController {
@RequestMapping(value = "/create", method = RequestMethod.GET)
public String formGet(@ModelAttribute("eventGameForm") EventGameForm eventGameForm, ModelMap model) {
model.put("action", "/market/eventGame/create");
model.put("action", "/communeservice/eventGame/create");
return "market/eventGameForm";
}
......@@ -103,7 +103,7 @@ public class EventGameController {
public String editGet(@ModelAttribute("eventGameForm") EventGameForm EventGameForm, @RequestParam(value = "id", required = true) int id, ModelMap model) {
EventGameBean bean = service.get("", id);
BeanConverter.copyProperties(EventGameForm, bean);
model.put("action", "/market/eventGame/edit");
model.put("action", "/communeservice/eventGame/edit");
return "market/eventGameForm";
}
......
src/main/java/com/ctrip/fun/admin/controller/market/UserOrderBehaviourStatisticsController.java → src/main/java/com/ctrip/fun/admin/controller/communeservice/UserOrderBehaviourStatisticsController.java
package com.ctrip.fun.admin.controller.market;
package com.ctrip.fun.admin.controller.communeservice;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
......@@ -29,7 +29,7 @@ import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.market.UserOrderBehaviourStatisticsBean;
import com.ctrip.fun.common.vo.statistics.query.UserStatisticsQuery;
@Controller
@RequestMapping(value = "/userOrderBehaviour")
@RequestMapping(value = "/communeservice/userOrderBehaviour")
public class UserOrderBehaviourStatisticsController extends AbstractStatisticsController {
@Autowired
......
src/main/webapp/WEB-INF/templates/common/layout.ftl
......@@ -500,36 +500,33 @@ ${pageCss}
<ul class="nav nav-list">
<li class="nav-header"社员管理</li>
<li <#if current == "communeAdm_list">class="active"</#if>>
<a href="/communeAdm/queryList">绑定管理员</a>
<a href="/communeservice/communeAdm/queryList">绑定管理员</a>
</li>
<li <#if current == "communeAdm_myBindList">class="active"</#if>>
<a href="/communeAdm/myBindList">我管理的社员</a>
<a href="/communeservice/communeAdm/myBindList">我管理的社员</a>
</li>
<li class="nav-header">用户下单行为分析</li>
<li <#if current == "userOrderBehaviour_listUserCourseOrderBehaviour">class="active"</#if>>
<a href="/userOrderBehaviour/listUserCourseOrderBehaviour?statisticsType=1">单订场下单</a>
<a href="/communeservice/userOrderBehaviour/listUserCourseOrderBehaviour?statisticsType=1">单订场下单</a>
</li>
<li <#if current == "userOrderBehaviour_listUserEventOrderBehaviour">class="active"</#if>>
<a href="/userOrderBehaviour/listUserEventOrderBehaviour?statisticsType=3">赛事下单</a>
<a href="/communeservice/userOrderBehaviour/listUserEventOrderBehaviour?statisticsType=3">赛事下单</a>
</li>
<li <#if current == "userOrderBehaviour_listCourseUserOrderInfo">class="active"</#if>>
<a href="/userOrderBehaviour/listCourseUserOrderInfo?dayOfWeek=1">球场下单用户分析</a>
<a href="/communeservice/userOrderBehaviour/listCourseUserOrderInfo?dayOfWeek=1">球场下单用户分析</a>
</li>
<li <#if current == "userOrderBehaviour_listValidUserOrder">class="active"</#if>>
<a href="/userOrderBehaviour/listValidUserOrder">用户有效订单查询</a>
<a href="/communeservice/userOrderBehaviour/listValidUserOrder">用户有效订单查询</a>
</li>
<li <#if current == "userOrderBehaviour_recommendPlayer">class="active"</#if>>
<a href="/market/eventGame/recommendPlayerGet">亲密度推荐</a>
<a href="/communeservice/eventGame/recommendPlayerGet">亲密度推荐</a>
</li>
<li <#if current == "userOrderBehaviour_createGame">class="active"</#if>>
<a href="/market/eventGame/create">创建赛事</a>
<a href="/communeservice/eventGame/create">创建赛事</a>
</li>
<li <#if current == "userOrderBehaviour_listEventGame">class="active"</#if>>
<a href="/market/eventGame/list">赛事列表</a>
<a href="/communeservice/eventGame/list">赛事列表</a>
</li>
</ul>
</#if>
</div>
......
src/main/webapp/WEB-INF/templates/common/navbar.ftl
......@@ -21,7 +21,7 @@
<li <#if module?? && module == "statistics">class="active"</#if>><a href="/statistics/totalOrder/listTotalStatistics">数据统计</a></li>
<li <#if module?? && module == "tools">class="active"</#if>><a href="/tools/map">工具</a></li>
<li <#if module?? && module == "finance_management">class="active"</#if>><a href="/courseFinance/queryCourseOrder">财务</a></li>
<li <#if module?? && module == "communeAdm">class="active"</#if>><a href="/communeAdm/myBindList">会服</a></li>
<li <#if module?? && module == "communeAdm">class="active"</#if>><a href="/communeservice/communeAdm/myBindList">会服</a></li>
</ul>
<ul class="nav pull-right">
......
src/main/webapp/WEB-INF/templates/market/communeAdm/list.ftl
......@@ -22,7 +22,7 @@
var admUserId = $('#adminName').val();
$(this).button('loading');
$.post("/communeAdm/batchBind",{"communeExtIds":chgids,"admUserId":admUserId},function(msg){
$.post("/communeservice/communeAdm/batchBind",{"communeExtIds":chgids,"admUserId":admUserId},function(msg){
if (msg['status'] == 0) {
location.reload();
}else{
......@@ -40,7 +40,7 @@
chgids = chgids + $(this).attr("id") + ",";
});
chgids = chgids.substr(0, chgids.length - 1);
$.post("/communeAdm/batchUnbind",{"communeExtIds":chgids},function(msg){
$.post("/communeservice/communeAdm/batchUnbind",{"communeExtIds":chgids},function(msg){
if (msg['status'] == 0) {
location.reload();
}else{
......@@ -54,7 +54,7 @@
$('#bindAdmModal').on('show.bs.modal', function (e) {
//模态框显示之后加载当前所有会服人员
$.get("/communeAdm/list/communeAdmUser",{},function(data){
$.get("/communeservice/communeAdm/list/communeAdmUser",{},function(data){
//返回找出所有的会服
var html='<option value="0">请选择</option>';
......@@ -89,7 +89,7 @@
</style>
</#assign>
<@com.layout title="查询公社会员" module="communeAdm" current="communeAdm_list" pageCss=pageCssContent pageJs=pageJsContent>
<form id="formId" class="form-inline search-box widthShow" action="/communeAdm/queryList" method="get" autocomplete="off" >
<form id="formId" class="form-inline search-box widthShow" action="/communeservice/communeAdm/queryList" method="get" autocomplete="off" >
<@com.textInput "dto.userName" "style=\"margin-left: 5px;\"" "姓名"/>
<@com.textInput "dto.mobilePhone" "style=\"margin-left: 5px;\"" "电话"/>
<@com.textInput "dto.uid" "style=\"margin-left: 5px;\"" "UID"/>
......
src/main/webapp/WEB-INF/templates/market/communeAdm/myBindList.ftl
......@@ -52,7 +52,7 @@
$('#tagSelectModal').on('show.bs.modal', function (e) {
//查询所有的标签
$.get("/communeAdm/labels/list",{},function(data){
$.get("/communeservice/communeAdm/labels/list",{},function(data){
//返回找出所有的会服
var html='';
var hidFlag = $('#hidFlag').val();
......@@ -222,7 +222,7 @@
</style>
</#assign>
<@com.layout title="查询公社会员" module="communeAdm" current="communeAdm_myBindList" pageCss=pageCssContent pageJs=pageJsContent>
<form id="formId" class="form-inline search-box widthShow" action="/communeAdm/myBindList" method="get" autocomplete="off" >
<form id="formId" class="form-inline search-box widthShow" action="/communeservice/communeAdm/myBindList" method="get" autocomplete="off" >
<@com.textInput "dto.userName" "style=\"margin-left: 5px;\"" "姓名"/>
<@com.textInput "dto.mobilePhone" "style=\"margin-left: 5px;\"" "电话"/>
<@com.textInput "dto.uid" "style=\"margin-left: 5px;\"" "UID"/>
......
src/main/webapp/WEB-INF/templates/market/communeExt/form.ftl
......@@ -76,7 +76,7 @@
$('#tagSelectModal').on('show.bs.modal', function (e) {
//查询所有的标签
$.get("/communeAdm/labels/list",{},function(data){
$.get("/communeservice/communeAdm/labels/list",{},function(data){
//返回找出所有的会服
var html='';
for(var i=0;i<data.length;i++){
......
src/main/webapp/WEB-INF/templates/market/createGame.ftl
......@@ -59,7 +59,7 @@
<ul class="nav nav-tabs">
<li class="active"> <a href="${action}?id=${id!}">资源</a> </li>
<#if id != 0>
<li><a href="/userOrderBehaviour/createGroup?gameId=${id!}">分组</a></li>
<li><a href="/communeservice/userOrderBehaviour/createGroup?gameId=${id!}">分组</a></li>
<#else>
<li class="disabled"><a href="javascript:;">分组</a></li>
</#if>
......
src/main/webapp/WEB-INF/templates/market/createGroup.ftl
......@@ -243,19 +243,19 @@ function isRealNum(val){
<@com.layout title="资源编辑" module="communeAdm" current="userOrderBehaviour_createGroup" pageJs=pageJsContent>
<ul class="nav nav-tabs">
<li><a href="/market/eventGame/edit?id=${eventGameGroupForm.gameId!}">赛事</a></li>
<li class="active"><a href="/market/eventGame/createGroupGet?gameId=${eventGameGroupForm.gameId!}">分组</a></li>
<li><a href="/communeservice/eventGame/edit?id=${eventGameGroupForm.gameId!}">赛事</a></li>
<li class="active"><a href="/communeservice/eventGame/createGroupGet?gameId=${eventGameGroupForm.gameId!}">分组</a></li>
</ul>
<form action='/market/eventGame/createGroupPost' method="post" id='batchCreateform'>
<form action='/communeservice/eventGame/createGroupPost' method="post" id='batchCreateform'>
<input type="hidden" name="gameId" value="${eventGameGroupForm.gameId!}"/>
组&nbsp;&nbsp;&nbsp;数&nbsp;&nbsp;&nbsp;：<input type="text" name="zuShu"/>
&nbsp;每组间隔时间：<input type="text" name="jianGe"/>
<input type='button' id="batchCreateformButton" value="批量创建分组" style='margin-bottom: 10px;'>
</form>
<form action='/market/eventGame/createSingleGroupPost' method="post" id='singleCreateform'>
<form action='/communeservice/eventGame/createSingleGroupPost' method="post" id='singleCreateform'>
<input type="hidden" name="gameId" value='${eventGameGroupForm.gameId!}'/>
开球时间：<input type="time" name="formatTeeTime"/>
<input type='button' id="singleCreateformButton" value="创建单个分组" style='margin-bottom: 10px;'>
......
src/main/webapp/WEB-INF/templates/market/eventGameForm.ftl
......@@ -65,7 +65,7 @@
<a href="#">赛事</a>
</li>
<#if eventGameForm.id ?? >
<li><a href="/market/eventGame/createGroupGet?gameId=${eventGameForm.id!}">分组</a></li>
<li><a href="/communeservice/eventGame/createGroupGet?gameId=${eventGameForm.id!}">分组</a></li>
<#else>
<li class="disabled"><a href="javascript:;">分组</a></li>
</#if>
......
src/main/webapp/WEB-INF/templates/market/eventGameList.ftl
......@@ -4,7 +4,7 @@
</script>
</#assign>
<@com.layout title="查询模板" module="communeAdm" current="userOrderBehaviour_listEventGame" pageJs=pageJsContent>
<form class="form-inline" action="/market/eventGame/list" method="get">
<form class="form-inline" action="/communeservice/eventGame/list" method="get">
<@com.textInputTwoDate "eventGameQueryForm.playDateStart" "eventGameQueryForm.playDateEnd" "style=\"margin-left: 5px;\"" "赛事时间"/>
<@com.textInput "eventGameQueryForm.courseId" "style=\"margin-left: 5px;\"" "球场id" "text"/>
<button type="submit" class="btn btn-primary">查询</button>
......@@ -26,7 +26,7 @@
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.createUser!}</td>
<td>${item.createTime?string("yyyy-MM-dd HH:mm:ss")}</td>
<td><a title='${item.id}' href="/market/eventGame/edit?id=${item.id}">编辑</a></td>
<td><a title='${item.id}' href="/communeservice/eventGame/edit?id=${item.id}">编辑</a></td>
</tr>
</#list>
</tbody>
......
src/main/webapp/WEB-INF/templates/market/listCourseUserOrderInfo.ftl
......@@ -14,7 +14,7 @@
</#assign>
<@com.layout title="用户下单行为分析" module="communeAdm" current="userOrderBehaviour_listCourseUserOrderInfo" pageCss=pageCssContent pageJs=pageJsContent>
<form id="J_Form" class="form-inline search-box" action="/userOrderBehaviour/listCourseUserOrderInfo" method="get">
<form id="J_Form" class="form-inline search-box" action="/communeservice/userOrderBehaviour/listCourseUserOrderInfo" method="get">
<table class="labTable">
<tr style="height:40px;">
<td style="width:350px;padding-left:10px;">
......@@ -106,7 +106,7 @@
</#switch>
</td>
</#if>
<td><a href='/userOrderBehaviour/listValidUserOrder?searchDateStart=${searchDateStart}&searchDateEnd=${searchDateEnd}&courseName=${item.courseName!}&mobileNo=${item.mobileNo!}&name=${item.userName!}&dayOfWeek=${item.dayOfWeek!}'>${item.palceOrderTimes!}</a> </td>
<td><a href='/communeservice/userOrderBehaviour/listValidUserOrder?searchDateStart=${searchDateStart}&searchDateEnd=${searchDateEnd}&courseName=${item.courseName!}&mobileNo=${item.mobileNo!}&name=${item.userName!}&dayOfWeek=${item.dayOfWeek!}'>${item.palceOrderTimes!}</a> </td>
</tr>
</#list>
</tbody>
......
src/main/webapp/WEB-INF/templates/market/listEventGame.ftl
......@@ -14,7 +14,7 @@
</#assign>
<@com.layout title="用户下单行为分析" module="communeAdm" current="userOrderBehaviour_listEventGame" pageCss=pageCssContent pageJs=pageJsContent>
<form id="J_Form" class="form-inline search-box" action="/userOrderBehaviour/listEventGame" method="get">
<form id="J_Form" class="form-inline search-box" action="/communeservice/userOrderBehaviour/listEventGame" method="get">
<table class="table table-bordered table-striped widthShow">
<thead>
<tr>
......@@ -36,7 +36,7 @@
<td>${item.playDate!}</td>
<td>${item.createUser!} </td>
<td>${item.createDate!} </td>
<td><a href="/userOrderBehaviour/editEventGame?id=${item.id}">编辑</a></td>
<td><a href="/communeservice/userOrderBehaviour/editEventGame?id=${item.id}">编辑</a></td>
</tr>
</#list>
</tbody>
......
src/main/webapp/WEB-INF/templates/market/listUserCourseOrderBehaviour.ftl
......@@ -14,7 +14,7 @@
</#assign>
<@com.layout title="用户下单行为分析" module="communeAdm" current="userOrderBehaviour_listUserCourseOrderBehaviour" pageCss=pageCssContent pageJs=pageJsContent>
<form id="J_Form" class="form-inline search-box" action="/userOrderBehaviour/listUserCourseOrderBehaviour" method="get">
<form id="J_Form" class="form-inline search-box" action="/communeservice/userOrderBehaviour/listUserCourseOrderBehaviour" method="get">
<table class="labTable">
<tr style="height:40px;">
<td style="width:500px;padding-left:10px;"><@com.textInputTwoDate type="date" path1="dto.searchDateStart" path2="dto.searchDateEnd" attributes="style=\"margin-left: 0px;\"" label="查询时间："/></td>
......@@ -49,7 +49,7 @@
<td>${item.mobileNo!}</td>
<td>${item.communeExpireTimeDesc!}</td>
<td>${item.userName!}</td>
<td><a href="/userOrderBehaviour/listValidUserOrder?mobileNo=${item.mobileNo!}&searchDateStart=${searchDateStart}&searchDateEnd=${searchDateEnd}&orderCategory=1">${item.palceOrderTimes!}</a></td>
<td><a href="/communeservice/userOrderBehaviour/listValidUserOrder?mobileNo=${item.mobileNo!}&searchDateStart=${searchDateStart}&searchDateEnd=${searchDateEnd}&orderCategory=1">${item.palceOrderTimes!}</a></td>
</tr>
</#list>
</table>
......
src/main/webapp/WEB-INF/templates/market/listUserEventOrderBehaviour.ftl
......@@ -14,7 +14,7 @@
</#assign>
<@com.layout title="用户下单行为分析" module="communeAdm" current="userOrderBehaviour_listUserEventOrderBehaviour" pageCss=pageCssContent pageJs=pageJsContent>
<form id="J_Form" class="form-inline search-box" action="/userOrderBehaviour/listUserEventOrderBehaviour" method="get">
<form id="J_Form" class="form-inline search-box" action="/communeservice/userOrderBehaviour/listUserEventOrderBehaviour" method="get">
<table class="labTable">
<tr style="height:40px;">
<td style="width:500px;padding-left:10px;"><@com.textInputTwoDate type="date" path1="dto.searchDateStart" path2="dto.searchDateEnd" attributes="style=\"margin-left: 0px;\"" label="查询时间："/></td>
......@@ -49,7 +49,7 @@
<td>${item.mobileNo!}</td>
<td>${item.communeExpireTimeDesc!}</td>
<td>${item.userName!}</td>
<td><a href="/userOrderBehaviour/listValidUserOrder?mobileNo=${item.mobileNo!}&searchDateStart=${searchDateStart}&searchDateEnd=${searchDateEnd}&orderCategory=14">${item.palceOrderTimes!}</a></td>
<td><a href="/communeservice/userOrderBehaviour/listValidUserOrder?mobileNo=${item.mobileNo!}&searchDateStart=${searchDateStart}&searchDateEnd=${searchDateEnd}&orderCategory=14">${item.palceOrderTimes!}</a></td>
</tr>
</#list>
</table>
......
src/main/webapp/WEB-INF/templates/market/listValidUserOrder.ftl
......@@ -14,7 +14,7 @@
</#assign>
<@com.layout title="用户下单行为分析" module="communeAdm" current="userOrderBehaviour_listValidUserOrder" pageCss=pageCssContent pageJs=pageJsContent>
<form id="J_Form" class="form-inline search-box" action="/userOrderBehaviour/listValidUserOrder" method="get">
<form id="J_Form" class="form-inline search-box" action="/communeservice/userOrderBehaviour/listValidUserOrder" method="get">
<table class="labTable">
<tr style="height:40px;">
<td style="width:250px;padding-left:10px;">
......
src/main/webapp/WEB-INF/templates/market/recommendPlayer.ftl
......@@ -22,7 +22,7 @@ $("#recommendSubmitButton").click(function(){
</#assign>
<@com.layout title="资源编辑" module="communeAdm" current="userOrderBehaviour_recommendPlayer" pageJs=pageJsContent>
<form action='/market/eventGame/recommendPlayerPost' method="post" id="recommendform">
<form action='/communeservice/eventGame/recommendPlayerPost' method="post" id="recommendform">
推荐类型
<select id='recommendType' name='recommendType'>
<option value ="0" <#if recommendType == '0'>selected</#if>>请选择</option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment