Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
926835b3
authored
Oct 30, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
公社订单 - 增加推荐人查询及显示
权限管理模块移动到系统管理下面 优化抵用券详情页面显示效果
parent
591503ee
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
118 additions
and
74 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpCommuneOrderController.java
src/main/java/com/ctrip/fun/admin/form/order/CommuneOrderQueryForm.java
src/main/java/com/ctrip/fun/admin/service/order/CommuneExcelExportService.java
src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl
src/main/webapp/WEB-INF/templates/common/layout.ftl
src/main/webapp/WEB-INF/templates/common/navbar.ftl
src/main/webapp/WEB-INF/templates/communeOrder/common/communeOrderSearchForm.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListAll.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListCanceled.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListNopay.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPayfail.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaying.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaysuccess.ftl
src/main/webapp/WEB-INF/templates/userRole/adminUserForm.ftl
src/main/webapp/WEB-INF/templates/userRole/userListAll.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpCommuneOrderController.java
View file @
926835b3
...
...
@@ -132,8 +132,10 @@ public class OpCommuneOrderController extends AbstractOpOrderController<CommuneO
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
String
orderStartDate
=
(
form
.
getOrderStartDate
()
==
null
)
?
(
""
)
:
(
format
.
format
(
form
.
getOrderStartDate
()));
String
orderEndDate
=
(
form
.
getOrderEndDate
()
==
null
)
?
(
""
)
:
(
format
.
format
(
form
.
getOrderEndDate
()));
String
recommendPhone
=
(
form
.
getRecommendPhone
()
==
null
)
?
(
""
)
:
(
form
.
getRecommendPhone
());
String
recommendUserName
=
(
form
.
getRecommendUserName
()
==
null
)
?
(
""
)
:
(
form
.
getRecommendUserName
());
excel
.
append
(
"orderNo="
).
append
(
form
.
getOrderNo
()).
append
(
"&userId="
).
append
(
userId
).
append
(
"&userName="
).
append
(
userName
).
append
(
"&orderStartDate="
).
append
(
orderStartDate
)
.
append
(
"&orderEndDate="
).
append
(
orderEndDate
).
append
(
"&total="
).
append
(
total
);
.
append
(
"&orderEndDate="
).
append
(
orderEndDate
).
append
(
"&total="
).
append
(
total
)
.
append
(
"&recommendUserName="
).
append
(
recommendUserName
).
append
(
"&recommendPhone="
).
append
(
recommendPhone
)
;
model
.
put
(
"excelpath"
,
excel
.
toString
());
return
"communeOrder/list/"
+
communeorderMenuEnum
.
getResult
();
...
...
src/main/java/com/ctrip/fun/admin/form/order/CommuneOrderQueryForm.java
View file @
926835b3
...
...
@@ -17,6 +17,12 @@ public class CommuneOrderQueryForm extends AbstractOrderQueryForm {
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
orderEndDate
;
/**
* 推荐人
*/
private
String
recommendPhone
;
private
String
recommendUserName
;
public
Date
getOrderStartDate
()
{
return
orderStartDate
;
}
...
...
@@ -33,4 +39,21 @@ public class CommuneOrderQueryForm extends AbstractOrderQueryForm {
this
.
orderEndDate
=
orderEndDate
;
}
public
String
getRecommendUserName
()
{
return
recommendUserName
;
}
public
void
setRecommendUserName
(
String
recommendUserName
)
{
this
.
recommendUserName
=
recommendUserName
;
}
public
String
getRecommendPhone
()
{
return
recommendPhone
;
}
public
void
setRecommendPhone
(
String
recommendPhone
)
{
this
.
recommendPhone
=
recommendPhone
;
}
}
src/main/java/com/ctrip/fun/admin/service/order/CommuneExcelExportService.java
View file @
926835b3
...
...
@@ -31,7 +31,7 @@ public class CommuneExcelExportService extends AbstractExcelExportService<Commun
@Override
public
String
[]
getRowsName
(
String
listType
)
{
return
new
String
[]
{
"订单号"
,
"用户ID"
,
"用户名"
,
"手机号"
,
"充值时间"
,
"实付金额"
,
"状态"
,
"推荐码"
,
"支付订单编号"
,
"下单渠道"
,
"推荐人"
,
"推荐人
UID
"
};
return
new
String
[]
{
"订单号"
,
"用户ID"
,
"用户名"
,
"手机号"
,
"充值时间"
,
"实付金额"
,
"状态"
,
"推荐码"
,
"支付订单编号"
,
"下单渠道"
,
"推荐人"
,
"推荐人
号码
"
};
}
@Override
...
...
@@ -56,7 +56,7 @@ public class CommuneExcelExportService extends AbstractExcelExportService<Commun
valueList
.
add
(
bean
.
getPlatform
());
}
valueList
.
add
(
bean
.
getRecommendName
());
valueList
.
add
(
bean
.
getRecommend
Uid
());
valueList
.
add
(
bean
.
getRecommend
Phone
());
for
(
int
i
=
0
;
i
<
cellNum
;
i
++)
{
XSSFCell
cell
=
row
.
createCell
(
i
);
...
...
src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl
View file @
926835b3
...
...
@@ -296,7 +296,7 @@ function getResourceList(page){
<#if dto.voucherType == 1 && dto.multiple==0 && dto.courseRuleConditionBean.type == 1>
<tr>
<td style="text-align:left">适用范围</td>
<td style="text-align:left">全部类型适用</td>
<td style="text-align:left
;word-break: break-all;
">全部类型适用</td>
</tr>
</#if>
<#if dto.voucherType == 4 && dto.multiple==0 && dto.eventActivityRuleConditionBean.type == 1 >
...
...
@@ -308,7 +308,7 @@ function getResourceList(page){
<#if dto.multiple==1 >
<tr>
<td style="text-align:left">适用范围</td>
<td style="text-align:left">
<td style="text-align:left
;word-break: break-all;
">
<table>
<#list dto.multipleCourseConditionBean.conditionList as item>
<ul><li>资源:[${item.resourceIdList!}], 产品:[${item.productIdList!}] ,面值:${item.multiAmount!} 元 </li></ul>
...
...
@@ -399,7 +399,7 @@ function getResourceList(page){
<#if dto.courseRuleConditionBean.type == 1>
<td style="text-align:left">全部类型适用</td>
<#else>
<td style="text-align:left">
<td style="text-align:left
;word-break: break-all;
">
产品ID:[${dto.courseRuleConditionBean.value!}]
资源ID:[${dto.courseRuleConditionBean.resourceIds!}]
产品/资源使用日期:
...
...
@@ -415,7 +415,7 @@ function getResourceList(page){
<#if dto.eventActivityRuleConditionBean.type == 1>
<td style="text-align:left">全部类型适用</td>
<#else>
<td style="text-align:left">
<td style="text-align:left
;word-break: break-all;
">
产品ID:[${dto.eventActivityRuleConditionBean.value!}]
资源ID:[${dto.eventActivityRuleConditionBean.resourceIds!}]
产品/资源使用日期:
...
...
src/main/webapp/WEB-INF/templates/common/layout.ftl
View file @
926835b3
...
...
@@ -116,12 +116,21 @@ ${pageCss}
<li
<#
if
current =
=
"
template_create
"
>
class="active"
</
#
if>
>
<a
href=
"/system/template/create"
>
新建
</a>
</li>
<li
class=
"nav-header"
>
用户
</li>
<li
class=
"nav-header"
>
注册
用户
</li>
<li
<#
if
current =
=
"
user_list
"
>
class="active"
</
#
if>
>
<a
href=
"/system/user/list"
>
用户列表
</a>
</li>
<li
class=
"nav-header"
>
系统用户
</li>
<li
<#
if
current =
=
"
admin_user_list
"
>
class="active"
</
#
if>
>
<a
href=
"/userRole/adminUser/list"
>
列表
</a>
</li>
<li
<#
if
current =
=
"
admin_user_create
"
>
class="active"
</
#
if>
>
<a
href=
"/userRole/adminUser/create"
>
新建
</a>
</li>
<!--
<li class="nav-header">Redis</li>
<
!--<
li <#if current == "redis_clearbykey">class="active"</#if>>
<li <#if current == "redis_clearbykey">class="active"</#if>>
<a href="/system/redis/clearbykey">清除缓存</a>
</li>
-->
...
...
@@ -412,18 +421,7 @@ ${pageCss}
</li>
</ul>
<
#
elseif
module=
="userRole"
>
<ul
class=
"nav nav-list"
>
<li
class=
"nav-header"
>
用户管理
</li>
<li
<#
if
current =
=
"
admin_user_list
"
>
class="active"
</
#
if>
>
<a
href=
"/userRole/adminUser/list"
>
列表
</a>
</li>
<li
<#
if
current =
=
"
admin_user_create
"
>
class="active"
</
#
if>
>
<a
href=
"/userRole/adminUser/create"
>
新建
</a>
</li>
</ul>
<
#
elseif
module=
="eventActivityOrder"
>
<ul
class=
"nav nav-list"
>
<li
class=
"nav-header"
>
订单
</li>
...
...
src/main/webapp/WEB-INF/templates/common/navbar.ftl
View file @
926835b3
...
...
@@ -5,7 +5,7 @@
<div class="navbar-inner">
<a class="logo" href="/golf/course/list">主题游管理</a>
<ul class="nav">
<li <#if module?? && module == "userRole">class="active"</#if>><a href="/userRole/adminUser/list">权限管理</a></li
>
<!-- <li <#if module?? && module == "userRole">class="active"</#if>><a href="/userRole/adminUser/list">权限管理</a></li> --
>
<li <#if module?? && module == "basic">class="active"</#if>><a href="/basic/district/list">基础信息</a></li>
<li <#if module?? && module == "product">class="active"</#if>><a href="/golf/course/list">高尔夫</a></li>
<li <#if module?? && module == "system">class="active"</#if>><a href="/system/template/list">系统管理</a></li>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/common/communeOrderSearchForm.ftl
View file @
926835b3
...
...
@@ -2,6 +2,9 @@
<@com.textInput "form.orderNo" "style=\"margin-left: 5px;\"" "订单号" "text"/>
<@com.textInput "form.userId" "style=\"margin-left: 5px;\"" "用户ID" "text"/>
<@com.textInput "form.userName" "style=\"margin-left: 5px;\"" "用户名" "text"/>
</br>
<@com.textInput "form.recommendPhone" "style=\"margin-left: 5px;\"" "推荐人手机号" "text"/>
<@com.textInput "form.recommendUserName" "style=\"margin-left: 5px;\"" "推荐人姓名" "text"/>
<@com.textInputTwoDate "form.orderStartDate" "form.orderEndDate" "style=\"margin-left: 5px;\"" "下单时间"/>
<div>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListAll.ftl
View file @
926835b3
...
...
@@ -4,26 +4,32 @@
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>用户名</th>
<th>手机号</th>
<th>充值时间</th>
<th>实付金额</th>
<th>实付
</br>
金额</th>
<th>状态</th>
<th>推荐码</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人手机号</th>
<th>接管人</th>
</tr>
<#list list as item>
<tr>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_all">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.userName!}</td>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.userName}</a></td>
<td>${item.mobilePhone!}</td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommendPhone!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListCanceled.ftl
View file @
926835b3
...
...
@@ -4,26 +4,30 @@
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>用户名</th>
<th>手机号</th>
<th>充值时间</th>
<th>实付金额</th>
<th>状态</th>
<th>推荐码</th>
<th>实付</br>金额</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人手机号</th>
<th>接管人</th>
</tr>
<#list list as item>
<tr>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_canceled">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.userName!}</td>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.userName}</a></td>
<td>${item.mobilePhone!}</td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommendPhone!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListNopay.ftl
View file @
926835b3
...
...
@@ -4,26 +4,30 @@
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>用户名</th>
<th>手机号</th>
<th>充值时间</th>
<th>实付金额</th>
<th>状态</th>
<th>推荐码</th>
<th>实付</br>金额</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人手机号</th>
<th>接管人</th>
</tr>
<#list list as item>
<tr>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_nopay">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.userName!}</td>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.userName}</a></td>
<td>${item.mobilePhone!}</td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommendPhone!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPayfail.ftl
View file @
926835b3
...
...
@@ -4,26 +4,30 @@
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>用户名</th>
<th>手机号</th>
<th>充值时间</th>
<th>实付金额</th>
<th>状态</th>
<th>推荐码</th>
<th>实付</br>金额</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人手机号</th>
<th>接管人</th>
</tr>
<#list list as item>
<tr>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_payfail">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.userName!}</td>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.userName}</a></td>
<td>${item.mobilePhone!}</td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommendPhone!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaying.ftl
View file @
926835b3
...
...
@@ -4,26 +4,30 @@
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>用户名</th>
<th>手机号</th>
<th>充值时间</th>
<th>实付金额</th>
<th>状态</th>
<th>推荐码</th>
<th>实付</br>金额</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人手机号</th>
<th>接管人</th>
</tr>
<#list list as item>
<tr>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paying">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.userName!}</td>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.userName}</a></td>
<td>${item.mobilePhone!}</td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommendPhone!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaysuccess.ftl
View file @
926835b3
...
...
@@ -4,36 +4,32 @@
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>用户名</th>
<th>手机号</th>
<th>充值时间</th>
<th>实付金额</th>
<th>实付
</br>
金额</th>
<th>状态</th>
<th>推荐码</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人
UID
</th>
<th>推荐人
手机号
</th>
<th>接管人</th>
</tr>
<#list list as item>
<tr>
<td><a href="/communeOrder/detail?orderId=${item.orderId}¤t=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.userName!}</td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.userName}</a></td>
<td>${item.mobilePhone!}</td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommend
Uid
!}</td>
<td>${item.recommend
Phone
!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
src/main/webapp/WEB-INF/templates/userRole/adminUserForm.ftl
View file @
926835b3
...
...
@@ -15,7 +15,7 @@
</script>
</#assign>
<@com.layout title="用户创建" module="
userRole
" current="admin_user_create" pageJs=pageJsContent>
<@com.layout title="用户创建" module="
system
" current="admin_user_create" pageJs=pageJsContent>
<form class="form-inline" action="${action}" method="post">
<div id="course_container">
<div class="row-fluid show-grid">
...
...
src/main/webapp/WEB-INF/templates/userRole/userListAll.ftl
View file @
926835b3
<@com.layout title="管理员列表" module="
userRole
" current="admin_user_list" pageJs="">
<@com.layout title="管理员列表" module="
system
" current="admin_user_list" pageJs="">
<form class="form-inline" action="/userRole/adminUser/list" method="get">
<@com.textInput "form.nickName" "style=\"margin-left: 5px;\"" "用户名称" "text"/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment