Skip to content

Z
zsh
Commit 09a763b4 authored by wuwz's avatar wuwz
Browse files
Options

bug修改

parent 49a115d1
Show whitespace changes
Inline Side-by-side
Showing with 792 additions and 39 deletions
WebRoot/WEB-INF/templates/zh_cn/shop/index.html
View file @ 09a763b4
......@@ -547,7 +547,7 @@ $!httpInclude.include("/nav.htm")
<div class=contant_article_lis>
<ul>
<li>
<div>
<div style = "letter-spacing:5px;line-height:30px;">
<img src="$!webPath/resources/style/system/front/default/images/new/qw20190412001.png"></img>
<!-- <h5>家居风水布局文章</h5> -->
<p>在现有的毛坯建筑 </p>
......@@ -560,7 +560,7 @@ $!httpInclude.include("/nav.htm")
</div>
</li>
<li>
<div>
<div style = "letter-spacing:5px;line-height:30px;">
<img src="$!webPath/resources/style/system/front/default/images/new/qw20190412002.png"></img>
<!-- <h5>家居风水布局文章</h5> -->
<p>了解你的习惯、你的性格和你的喜好</p>
......@@ -573,7 +573,7 @@ $!httpInclude.include("/nav.htm")
</div>
</li>
<li>
<div>
<div style = "letter-spacing:5px;line-height:30px;">
<img src="$!webPath/resources/style/system/front/default/images/new/qw20190412003.png"></img>
<!-- <h5>家居风水布局文章</h5> -->
<p>使用国际顶级装修搭配思维 </p>
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_decorate_detaile.html
View file @ 09a763b4
......@@ -84,13 +84,54 @@ jQuery(document).ready(function(){
//jQuery("#toolbar").load("toolbar.htm");
}
$(".dialog-closed img,.dialog-bg,body").click(function(){
$(".dialog").hide();
//$(".zhezhao").hide();
})
});
function checkDetail(s){debugger
$(this).next().show();
//$(".zhezhao").show();
// $(".dialog").show();
}
</script>
<style >
.dialog-closed img {
width: 30px;
height: 30px;
}
.nember_box {
background: #535353;
width: 820px;
left: 40%;
top: 50%;
position: absolute;
margin-left: -210px;
margin-top:149px;
text-align: center;
color: #fff;
padding-bottom:30px;
}
.dialog {
position: fixed;
right: 0;
top: 0;
width: 100%;
z-index: 9999;
}
.zhezhao{
width: 100%;
height: 100%;
background:#F0F0F0;
}
</style>
</head>
<body>
<!--低版本提示-->
......@@ -152,12 +193,26 @@ $!httpInclude.include("/nav1.htm")
#if($obj.main_img)
#set($img ="$webPath/$obj.main_img.path/$obj.main_img.name")
#end
<div class="designer_detail_box">
<div class="one-list">
<div class="designer_detail_box" onclick="javascript:jQuery('#dialog_$!{obj.id}').show();event.stopPropagation();">
<img src="$img" />
<div class="detail">
<p>$obj.worksName</p>
</div>
</div>
<div class="dialog" id="dialog_$!{obj.id}" style="display:none;">
<div class="dialog-bg"></div>
<div class="nember_box">
<div class="dialog_conten">
<img style="width:400px;height:400px;margin-top:30px;" src="$img" />
<div style="padding:20px;">
<h3 style="text-align:left;">$obj.worksName</h3>
<div style="text-align:left;">$obj.introduction</div>
</div>
</div>
</div>
</div>
</div>
#end
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_designer_detaile.html
View file @ 09a763b4
......@@ -85,12 +85,54 @@ jQuery(document).ready(function(){
}
});
$(".dialog-closed img,.dialog-bg,body").click(function(){
$(".dialog").hide();
//$(".zhezhao").hide();
})
});
function checkDetail(s){debugger
$(this).next().show();
//$(".zhezhao").show();
// $(".dialog").show();
}
</script>
<style >
.dialog-closed img {
width: 30px;
height: 30px;
}
.nember_box {
background: #535353;
width: 820px;
left: 40%;
top: 50%;
position: absolute;
margin-left: -210px;
margin-top:149px;
text-align: center;
color: #fff;
padding-bottom:30px;
}
.dialog {
position: fixed;
right: 0;
top: 0;
width: 100%;
z-index: 9999;
}
.zhezhao{
width: 100%;
height: 100%;
background:#F0F0F0;
}
</style>
</head>
<body>
<!--低版本提示-->
......@@ -105,7 +147,7 @@ jQuery(document).ready(function(){
$!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm")
$!httpInclude.include("/nav1.htm")
<!-- <div class="zhezhao"></div> -->
<div class="main">
<div class="index">
<div class="position">当前位置：<a href="$!webPath/index.htm" >首页 ></a> <a href="$!webPath/goods_class.htm" class="pos">找设计师</a> > <span>设计师详情页</span></div>
......@@ -134,7 +176,7 @@ $!httpInclude.include("/nav1.htm")
</div>
<div class="detail_right">
<p class="price">$!{design.fees.feesName}</p>
<p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=1">预约咨询</a></p>
<p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=1" onclick="alert('预约成功!!!')">预约咨询</a></p>
</div>
</div>
......@@ -147,25 +189,36 @@ $!httpInclude.include("/nav1.htm")
#if($obj.main_img)
#set($img ="$webPath/$obj.main_img.path/$obj.main_img.name")
#end
<div class="designer_detail_box">
<div class="one-list">
<div class="designer_detail_box" onclick="javascript:jQuery('#dialog_$!{obj.id}').show();event.stopPropagation();">
<img src="$img" />
<div class="detail">
<p>$obj.worksName</p>
</div>
</div>
<div class="dialog" id="dialog_$!{obj.id}" style="display:none;">
<div class="dialog-bg"></div>
<div class="nember_box">
<div class="dialog_conten">
<img style="width:400px;height:400px;margin-top:30px;" src="$img" />
<div style="padding:20px;">
<h3 style="text-align:left;">$obj.worksName</h3>
<div style="text-align:left;">$obj.introduction</div>
</div>
</div>
</div>
</div>
</div>
#end
</div>
<div class="fenye">
<div class="fenyes">
<input name="pageSize" type="hidden" id="brand_ids" value="$!pageSize" />
<input name="currentPage" type="hidden" id="currentPage" value="$!currentPage" />
<input name="orderBy" type="hidden" id="orderBy" value="$!orderBy" />
<input name="orderType" type="hidden" id="orderType" value="$!orderType" />
$!gotoPageFormHTML
<input name="designId" type="hidden" id="designId" value="$design.id" />
$!gotoPageHTML
</div>
</div>
......@@ -173,6 +226,8 @@ $!httpInclude.include("/nav1.htm")
</div>
</div>
$!httpInclude.include("/footer.htm")
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/cityPartner_list.html 0 → 100644
View file @ 09a763b4
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<link href="$!webPath/resources/style/system/manage/$!{config.websiteCss}/template.css" rel="stylesheet" type="text/css"/>
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
<script src="$!webPath/resources/js/jquery.shop.common.js"></script>
<script src="$!webPath/resources/js/jquery.poshytip.min.js"></script>
<script>
jQuery(document).ready(function(){
jQuery(".memimg").mouseover(function(){
jQuery(this).css("cursor","pointer");
jQuery(".mem_detail[id^=user_detail_]").hide();
var id=jQuery(this).attr("id");
jQuery("#user_detail_"+id).show();
});
jQuery(".mem_detail[id^=user_detail_]").mouseleave(function(){
jQuery(this).hide();
});
//获取下级地区信息
jQuery("select[id^=areas_]").change(function(){
var areaMark = jQuery(this).attr("areaMark");
var parent_id = jQuery("#areas_"+areaMark).val();
jQuery.post("$!webPath/area_chlids.htm",{
"parent_id":parent_id,
"areaMark":areaMark
},function(data){
if(areaMark=="province"){
jQuery("#area_id").html("<option>请选择...</option>");
jQuery("#areas_city").html(data);
}
if(areaMark=="city"){
jQuery("#area_id").html(data);
}
},"text");
});
});
</script>
<body>
<div class="cont">
<h1 class="seth1">会员管理</h1>
<!-- <div class="settab"><span class="tab-one"></span> <span class="tabs"> <a href="$!webPath/admin/user_list.htm" class="this">管理</a>
| <a href="$!webPath/admin/user_add.htm">新增</a> </span> <span class="tab-two"></span>
</div> -->
<form>
<div class="allmem_search">
<ul>
<li> <span>
<select name="condition" id="condition">
<option value="userName">会员名</option>
<option value="email">注册邮箱</option>
<option value="trueName">真实姓名</option>
</select>
</span> <span class="allmen size4">
<input name="value" type="text" id="value" />
</span>
<!-- <span>
开始时间:<input name="beginTime" id="beginTime" type="date" value=""/>
</span>
<span>
结束时间:<input name="endTime" id="denTime" type="date" value=""/>
</span>
<span>
<select name="type" id="type">
<option value="-1">全部会员</option>
<option value="0">普通会员</option>
<option value="1">黄金会员</option>
<option value="2">铂金会员</option>
<option value="3">企业会员</option>
</select>
</span> -->
<span>
<span align="right" valign="top">所在地区：</span>
<span class="px10"><span class="setinput">
<select id="areas_province" name="areas_province" areaMark="province">
<option>请选择...</option>
#foreach($are in $areas)
<option value="$!are.id">$!are.areaName</option>
#end
</select>
<select id="areas_city" name="areas_city" areaMark="city">
<option value="">请选择...</option>
</select>
<select id="area_id" name="area_id">
<option value="$!objs.area.id">请选择...</option>
</select>
</span></span>
</span>
<span class="btn_search">
<input name="" type="submit" value="搜索" style="cursor:pointer;" title="搜索会员"/>
</span> </li>
</ul>
</div>
</form>
<!-- <div class="operation">
<h3>友情提示</h3>
<ul>
<li>可用金额，买家会员可以用来支付订单、提现，卖家可以用来支付商城收费服务</li>
<li>冻结金额，当会员进行提现操作后，提现金额变为冻结金额等待管理员审核操作。当会员使用预存款支付购买时，在订单支付后且未收货之前，
可用金额减少，支付的金额变为冻结金额，直到确认收货后，冻结金额减少，卖家可用金额增加。冻结金额不能用来支付或提现</li>
</ul>
</div> -->
<FORM name="ListForm" id="ListForm" action="$!webPath/admin/user_list.htm" method="post">
<div class="allmem_table">
<table width="98%" border="0" cellspacing="0" cellpadding="0">
<tr style="background: #if($!config.websiteCss=='blue') #2A7AD2 #end
#if($!config.websiteCss=='black')#333 #end; height:30px; color:#FFF">
<td width="18%" align="left">会员名</td>
<!-- <td width="6%" align="center">会员积分</td> -->
<!-- <td width="6%" align="center">会员金币</td> -->
<td width="6%" align="center">登录次数</td>
<td width="15%" align="center">最后登录</td>
<!-- <td width="6%" align="center">预存款</td>
<td width="8%" align="center">店铺</td> -->
<td width="15%" align="center">上级账号</td>
<!-- <td width="15%" align="center">区域数据</td> -->
<td width="15%" align="center">推广会员数量</td>
<td align="center" >操作</td>
</tr>
#foreach($!obj in $objs)
<tr>
<td align="left">
<!-- <span class="memimg"><img src="#if($!obj.photo)$!webPath/$!obj.photo.path/$!obj.photo.name #else $!webPath/resources/style/system/manage/blue/images/default_user_photo.gif #end" width="45" height="49" />
</span> <span class="mem_detail"> -->
<ul>
<li class="mem_font">$!obj.userName<i>(真实姓名：$!obj.trueName)</i></li>
<!-- <li>注册时间：$!CommUtil.formatLongDate($!obj.addTime)</li>
<li class="open">
<span class="email"><a href="mailto:$!obj.email" title="用户邮箱:$!obj.email"><img src="$!webPath/resources/style/system/manage/blue/images/mail.jpg" width="15" height="11" /></a></span>
<span><a href="#if($!obj.QQ)http://wpa.qq.com/msgrd?v=3&uin=$!obj.QQ&Site=$!obj.QQ&Menu=yes #else javascript:void(0);#end" #if($!obj.QQ)target="_blank"#end title="#if($!obj.QQ)用户QQ:$!{obj.QQ}#else 用户没填写QQ#end"><img src="$!webPath/resources/style/system/manage/blue/images/qq.jpg" width="19" height="20" /></a></span>
<span><a href="#if($!obj.WW)http://amos1.taobao.com/msg.ww?v=2&uid=$!{obj.WW}&s=2 #else javascript:void(0);#end" #if($!obj.WW)target="_blank"#end title="#if($!obj.WW)用户旺旺:$!obj.WW #else 用户没填写旺旺#end"><img src="$!webPath/resources/style/system/manage/blue/images/ww.jpg" width="17" height="17" border="0" /></a></span>
<span><a href="#if($!obj.MSN)msnim:chat?contact=$!{obj.MSN}#else javascript:void(0);#end" title="#if($!obj.MSN)用户MSN:$!{obj.MSN}#else 用户没填写MSN #end" #if($!obj.MSN)target="_blank"#end><img src="$!webPath/resources/style/system/manage/blue/images/hotm.jpg" width="20" height="17" border="0" /></a></span>
</li> -->
</ul>
</span></td>
<!-- <td align="center">$!obj.integral</td> -->
<!-- <td class="lightred">$!obj.gold</td> -->
<td class="lightred">$!obj.loginCount</td>
<td class="lightred"><ul>
<li>$!CommUtil.formatLongDate($!obj.lastLoginDate)</li>
<li>$!obj.lastLoginIp</li>
</ul></td>
<!-- <td class="lightred"><ul>
<li>可用：<strong>#if($!{obj.availableBalance})$!{obj.availableBalance}#else 0 #end元</strong></li>
<li>冻结：<strong>#if($!{obj.freezeBlance})$!{obj.freezeBlance}#else 0 #end元</strong></li>
</ul></td>
<td class="blue" align="center">#if($!storeTools.query_store_with_user("$!obj.id")==1)<a href="javascript:void(0);" onclick="window.parent.openURL('url','$!webPath/admin/store_edit.htm?id=$!obj.store.id','main_workspace','store_manage_op','about_store')">店铺</a>#else <span style="color:#F00">未开店</span>#end</td>
-->
<td align="center">$!obj.parent.userName</td>
<td align="center">$!obj.area.parent.areaName,$!obj.area.areaName</td>
<!-- <td align="center"> </td> -->
<td align="center">总数:$!obj.childAccount,当天：$!obj.dayAccount,本月: $!obj.monthAccount</td>
<td align="center" class="blue xiahua">
<a href="$!webPath/admin/user_edit.htm?id=$!obj.id">编辑</a>&nbsp;|
&nbsp;
<a href="javascript:void(0);" onclick="if(confirm('删除会员会同步删除删除该会员所有信息，且不可恢复，是否继续？'))window.location.href='$!webPath/admin/user_del.htm?mulitId=$!obj.id&currentPage=$!currentPage'">删除</a>
</td>
</tr>
#end
<tr style="background:#F2F2F2; height:30px;">
<td colspan="9"><div class="shopbtn shopfx">
<input name="all" type="checkbox" id="all" class="allselect" value="" />
&nbsp;&nbsp;全部</div>
<div class="shop_btn_del shopbtn">
<input name="" type="button" value="删除" style="cursor:pointer;" onclick="cmd('$!webPath/admin/user_del.htm')"/>
</div></td>
</tr>
</table>
</div>
<div class="fenye">
<input name="userRole" type="hidden" id="userRole" value="BUYER" />
<input type="hidden" name="currentPage" id="currentPage" value="$!currentPage" />
<input name="mulitId" type="hidden" id="mulitId" />
$!gotoPageHTML
</div>
</FORM>
</div>
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/design_message_list.html 0 → 100644
View file @ 09a763b4
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<link href="$!webPath/resources/style/system/manage/$!{config.websiteCss}/template.css" rel="stylesheet" type="text/css"/>
<link href="$!webPath/resources/style/common/css/jquery-ui-1.8.22.custom.css" type=text/css rel=stylesheet>
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
<script src="$!webPath/resources/js/jquery.validate.min.js"></script>
<script src="$!webPath/resources/js/jquery.shop.common.js"></script>
<script src="$!webPath/resources/js/jquery.poshytip.min.js"></script>
<script src="$!webPath/resources/js/jquery-ui-1.8.21.js"></script>
<script src="$!webPath/resources/js/jquery.zh.cn.js"></script>
<script>
jQuery(document).ready(function(){
jQuery('#addTime').attr("readonly","readonly").datepicker({
dateFormat:"yy-mm-dd",
changeMonth: true,
changeYear: true
});
});
</script>
</head>
<body>
<div class="cont">
<h1 class="seth1">设计师预约</h1>
<form method="post" id="queryForm">
<div class="orders">
<ul>
<li><span>预约姓名/设计师姓名</span> <span class="allmen size6">
<input name="name" type="text" id="name" />
</span>
<span class="btn_search">
<input name="" type="submit" value="搜索" style="cursor:pointer;"/>
</span> </li>
</ul>
</div>
</form>
<form method="post" id="ListForm" action="$!webPath/admin/design_message_list.htm">
<div class="allshop_table">
<table width="98%" border="0" cellspacing="0" cellpadding="0">
<tr style="background: #if($!config.websiteCss=='blue') #2A7AD2 #end
#if($!config.websiteCss=='black')#333 #end; height:30px; color:#FFF">
<td width="60">用户名</td>
<td width="160">用户手机</td>
<td width="150" >预约时间</td>
<td width="150" >预约设计师</td>
<td width="150" >设计师手机号</td>
</tr>
#foreach($obj in $objs)
<tr id="column_$!{obj.id}">
<td ><span class="allmen size5">
$!obj.startUser.userName (真实姓名: $!obj.startUser.trueName)
</span></td>
<td>
<span class="allmen size7">
$!obj.startUser.mobile
</span>
</td>
<td >
<span class="allmen size7">
$!obj.addTime
</span>
</td>
<td>
<span class="allmen size7">
$!obj.managerUser.userName (真实姓名: $!obj.managerUser.trueName)
</span>
</td>
<td>
<span class="allmen size7">
$!obj.managerUser.mobile
</span>
</td>
</tr>
#end
<tr style="background:#F2F2F2; height:30px;">
<td colspan="8"><div class="fenye3">
<input name="state" type="hidden" id="state" value="$!state" />
<input name="name" type="hidden" id="name" value="" />
<input name="currentPage" type="hidden" id="currentPage" value="$!currentPage" />
$!gotoPageHTML</div>
</td>
</tr>
</table>
</div>
</form>
</div>
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/manage.html
View file @ 09a763b4
......@@ -363,6 +363,8 @@
<ol>
<li><a href="javascript:void(0);" url="$!webPath/admin/user_list.htm" name="2351" id="2351" onclick="openItem('112','2351');" class="">会员管理</a></li>
<li><a href="javascript:void(0);" url="$!webPath/admin/cityPartner_list.htm" name="2367" id="2367" onclick="openItem('112','2367');" class="">城市合伙人管理</a></li>
<li><a href="javascript:void(0);" url="$!webPath/admin/swj_list.htm" name="23566" id="23566" onclick="openItem('112','23566');" class="">三维家账号绑定</a></li>
<li><a href="javascript:void(0);" url="$!webPath/admin/user_creditrule.htm" name="2352" id="2352" onclick="openItem('112','2352');" class="">会员信用</a></li>
......@@ -400,6 +402,8 @@
<li><a href="javascript:void(0);" url="$!webPath/admin/ztc_set.htm" name="2453" id="2453" onclick="openItem('87','2453');" class="">竞价直通车</a></li> -->
<li><a href="javascript:void(0);" url="$!webPath/admin/design_message_list.htm" name="24560" id="24560" onclick="openItem('87','24560');" class="">设计师预约管理</a></li>
<li><a href="javascript:void(0);" url="$!webPath/admin/bespoke_list.htm" name="24525" id="24525" onclick="openItem('87','24525');" class="">预约管理</a></li>
<li><a href="javascript:void(0);" url="$!webPath/admin/fs_bespoke_list.htm" name="24526" id="24526" onclick="openItem('87','24526');" class="">风水预约</a></li>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/user_list.html
View file @ 09a763b4
......@@ -106,14 +106,16 @@ jQuery(document).ready(function(){
<table width="98%" border="0" cellspacing="0" cellpadding="0">
<tr style="background: #if($!config.websiteCss=='blue') #2A7AD2 #end
#if($!config.websiteCss=='black')#333 #end; height:30px; color:#FFF">
<td width="8%" align="left">&nbsp;</td>
<td width="25%" align="left">会员名</td>
<td width="4%" align="left">&nbsp;</td>
<td width="18%" align="left">会员名</td>
<td width="6%" align="center">会员积分</td>
<!-- <td width="6%" align="center">会员金币</td> -->
<td width="6%" align="center">登录次数</td>
<td width="15%" align="center">最后登录</td>
<td width="6%" align="center">预存款</td>
<td width="15%" align="center">店铺</td>
<td width="8%" align="center">店铺</td>
<td width="15%" align="center">上级账号</td>
<td width="15%" align="center">会员数量</td>
<td align="center" >操作</td>
</tr>
#foreach($!obj in $objs)
......@@ -138,6 +140,9 @@ jQuery(document).ready(function(){
<li>冻结：<strong>#if($!{obj.freezeBlance})$!{obj.freezeBlance}#else 0 #end元</strong></li>
</ul></td>
<td class="blue" align="center">#if($!storeTools.query_store_with_user("$!obj.id")==1)<a href="javascript:void(0);" onclick="window.parent.openURL('url','$!webPath/admin/store_edit.htm?id=$!obj.store.id','main_workspace','store_manage_op','about_store')">店铺</a>#else <span style="color:#F00">未开店</span>#end</td>
<td align="center">$!obj.referee.userName</td>
<td align="center">总数:$!obj.childAccount,当天：$!obj.dayAccount,本月: $!obj.monthAccount</td>
<td align="center" class="blue xiahua">
<a href="$!webPath/admin/user_edit.htm?id=$!obj.id">编辑</a>&nbsp;|
&nbsp;
......@@ -181,6 +186,12 @@ jQuery(document).ready(function(){
#end
#if($level3)
<a href="$!webPath/admin/user_updateLevl.htm?id=$obj.id&level=$obj.level&type=3" >企业合伙人</a>
&nbsp;|&nbsp;
#end
#if($!obj.cityPartner == 1)
<a href="$!webPath/admin/user_cityPartner.htm?id=$obj.id&type=0" >取消城市合伙人</a>
#else
<a href="$!webPath/admin/user_cityPartner.htm?id=$obj.id&type=1" >设置城市合伙人</a>
#end
</td>
</tr>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/welcome.html
View file @ 09a763b4
......@@ -41,7 +41,7 @@
<li>JAVA版本：$!java_version</li>
<li>数据库版本信息：$!database_version</li>
<li>Web服务器：$!web_server_version</li>
<li>shopping版本号：$!shop_version</li>
<li>版本号：$!shop_version</li>
<li>安装日期：$!CommUtil.formatLongDate($!config.addTime)</li>
</ul>
</div>
......
src/com/shopping/core/query/QueryObject.java
View file @ 09a763b4
......@@ -151,7 +151,7 @@ public class QueryObject implements IQueryObject {
public IQueryObject addQueryIn(String field, SysMap para, String expression) {
if ((field != null) && (para != null)) {
this.queryString = (this.queryString + " and " + field + " " + handleExpression(expression) + "(:" + para.getKey().toString()+")");
this.queryString = (this.queryString + " and " + field + " " + handleExpression(expression) + " ( :" + para.getKey().toString()+" ) ");
this.params.put(para.getKey(), para.getValue());
}
return this;
......
src/com/shopping/foundation/domain/User.java
View file @ 09a763b4
......@@ -261,6 +261,29 @@ public class User extends IdEntity implements UserDetails {
private String wechatCode;
//城市合伙人
private Integer cityPartner;
//非数据库字段 下级会员总数
@Transient
private Integer childAccount;
//非数据库字段 今日会员总数
@Transient
private Integer dayAccount;
//非数据库字段 本月会员总数
@Transient
private Integer monthAccount;
//非数据库字段 区域总数
@Transient
private Integer areaStoreAccount;
//非数据库字段 区域会员总数
@Transient
private Integer areaUserAccount;
public String getWechatCode() {
return wechatCode;
}
......@@ -920,4 +943,37 @@ public class User extends IdEntity implements UserDetails {
public void setStore_quick_menu(String store_quick_menu) {
this.store_quick_menu = store_quick_menu;
}
public Integer getCityPartner() {
return cityPartner;
}
public void setCityPartner(Integer cityPartner) {
this.cityPartner = cityPartner;
}
public Integer getChildAccount() {
return childAccount;
}
public void setChildAccount(Integer childAccount) {
this.childAccount = childAccount;
}
public Integer getDayAccount() {
return dayAccount;
}
public void setDayAccount(Integer dayAccount) {
this.dayAccount = dayAccount;
}
public Integer getMonthAccount() {
return monthAccount;
}
public void setMonthAccount(Integer monthAccount) {
this.monthAccount = monthAccount;
}
}
src/com/shopping/foundation/domain/WechatArticle.java
View file @ 09a763b4
......@@ -59,6 +59,11 @@ public class WechatArticle extends IdEntity {
@OneToOne(fetch = FetchType.LAZY)
private Accessory accessory;
//是否报名0，无需报名.1，普通报名。2,城市合伙人报名
private String flagEnroll;
//是否支付 0，否。1
private String flagPay;
public String getDescribeArt() {
return describeArt;
......@@ -155,4 +160,21 @@ public class WechatArticle extends IdEntity {
public void setMark(String mark) {
this.mark = mark;
}
public String getFlagEnroll() {
return flagEnroll;
}
public void setFlagEnroll(String flagEnroll) {
this.flagEnroll = flagEnroll;
}
public String getFlagPay() {
return flagPay;
}
public void setFlagPay(String flagPay) {
this.flagPay = flagPay;
}
}
src/com/shopping/manage/admin/action/AccountMessageManagetion.java 0 → 100644
View file @ 09a763b4
package com.shopping.manage.admin.action;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.annotation.SecurityMapping;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.security.support.SecurityUserHolder;
import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.AccountMessage;
import com.shopping.foundation.domain.User;
import com.shopping.foundation.domain.query.AccountMessageQueryObject;
import com.shopping.foundation.domain.query.ActivityQueryObject;
import com.shopping.foundation.service.IAccountMessageService;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
import com.shopping.foundation.service.IUserService;
@Controller
public class AccountMessageManagetion {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
@Autowired
private IUserService userService;
@Autowired
private IAccountMessageService accountMessageService;
@SecurityMapping(display = false, rsequence = 0, title = "设计师预约列表", value = "/admin/design_message_list.htm*", rtype = "admin", rname = "设计师预约列表", rcode = "activity_admin", rgroup = "运营")
@RequestMapping({ "/admin/design_message_list.htm" })
public ModelAndView design_message_list(HttpServletRequest request, HttpServletResponse response,
String currentPage,String orderBy, String orderType) {
ModelAndView mv = new JModelAndView("admin/blue/design_message_list.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 0, request, response);
AccountMessageQueryObject qo = new AccountMessageQueryObject(currentPage, mv, orderBy, orderType);
IPageList pList = this.accountMessageService.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
return mv;
}
}
src/com/shopping/manage/admin/action/SwjManageAction.java
View file @ 09a763b4
......@@ -214,6 +214,18 @@ public class SwjManageAction {
return "redirect:user_list.htm?currentPage=" + currentPage;
}
@SecurityMapping(display = false, rsequence = 0, title = "修改会员级别", value = "/admin/user_updateLevl.htm*", rtype = "admin", rname = "会员信用", rcode = "user_creditrule", rgroup = "会员")
@RequestMapping({ "/admin/user_cityPartner.htm" })
public String user_cityPartner(HttpServletRequest request, HttpServletResponse response, String id,
String currentPage, String type) throws Exception {
//修改用户信息
User user = this.userService.getObjById(Long.parseLong(id));
user.setCityPartner(Integer.parseInt(type));
this.userService.update(user);
return "redirect:user_list.htm?currentPage=" + currentPage;
}
/**
* 三维家账号解绑
* @param swjUser
......
src/com/shopping/manage/admin/action/UserManageAction.java
View file @ 09a763b4
......@@ -39,13 +39,16 @@ import com.shopping.manage.admin.tools.StoreTools;
import com.sun.org.apache.bcel.internal.generic.NEW;
import javafx.scene.chart.PieChart.Data;
import net.sf.json.JSONObject;
import static org.hamcrest.CoreMatchers.nullValue;
import java.io.IOException;
import java.io.PrintWriter;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
......@@ -185,13 +188,13 @@ public class UserManageAction {
}
if(map.size() > 0) {
Set <Long> areaSet = this.getAreaList(map);
if(areaSet.size() >0) {
uqo.addQueryIn("obj.area.id", new SysMap("areaId", areaSet), "in");
Set <Long> areaIds = this.getAreaList(map);
if(areaIds.size() >0) {
uqo.addQueryIn("obj.area.id", new SysMap("areaIds", areaIds), "in");
}
}
uqo.addQuery("obj.parent.id is null", null);
IPageList pList = this.userService.list(uqo);
//uqo.addQuery("obj.parent.id is null", null);
IPageList pList = userAcount(this.userService.list(uqo));
String url = this.configService.getSysConfig().getAddress();
if ((url == null) || (url.equals(""))) {
url = CommUtil.getURL(request);
......@@ -206,6 +209,150 @@ public class UserManageAction {
return mv;
}
/**
* 获取用户下级会员数量 当天注册数量 当月注册数量
* @param plist
* @return
*/
private IPageList userAcount(IPageList plist){
List <User>list = plist.getResult();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
//当天0点
long time1 = calendar.getTime().getTime();
//当月1号0点
calendar.set(Calendar.DAY_OF_MONTH, 1);
long time2 = calendar.getTime().getTime();
if(list != null) {
for (User user : list) {
Map<String, Object> map=new HashMap<String, Object>();
map.put("userid", user.getId());
Set<User>listUser=this.getAllUser(map);
int childAccount = 0;
int dayAccount = 0;
int monthAccount = 0;
for (User user2 : listUser) {
if(user2.getAddTime().getTime() > time1 ) {
dayAccount++;
}
if(user2.getAddTime().getTime() > time2 ) {
monthAccount++;
}
childAccount++;
}
user.setChildAccount(childAccount);
user.setDayAccount(dayAccount);
user.setMonthAccount(monthAccount);
}
}
return plist;
}
private Set<User> getAllUser(Map<String, Object>map){
Set <User>returnList=new HashSet<User>();
List<User> list = this.userService.query(
"select obj from User obj where obj.referee.id = :userid ",
map, -1, -1);
for (User user : list) {
returnList.add(user);
}
return returnList;
}
/**
* 获取区域数据
* @param plist
* @return
*/
private IPageList areaCount(IPageList plist) {
List <User>list = plist.getResult();
if(list != null) {
for (User user : list) {
if(user.getArea() != null) {
Long areaId = user.getArea().getId();
//查询区域下的会员
//查询区域下的店铺
}
}
}
return plist;
}
@SecurityMapping(display = false, rsequence = 0, title = "城市合伙人", value = "/admin/cityPartner_list.htm*", rtype = "admin", rname = "会员管理", rcode = "user_manage", rgroup = "会员")
@RequestMapping({ "/admin/cityPartner_list.htm" })
public ModelAndView cityPartner_list(HttpServletRequest request, HttpServletResponse response, String currentPage,
String orderBy, String orderType, String condition, String value, String beginTime, String endTime,
String type, String areas_province, String areas_city, String area_id) throws Exception {
ModelAndView mv = new JModelAndView("admin/blue/cityPartner_list.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 0, request, response);
UserQueryObject uqo = new UserQueryObject(currentPage, mv, orderBy, orderType);
WebForm wf = new WebForm();
wf.toQueryPo(request, uqo, User.class, mv);
uqo.addQuery("obj.userRole", new SysMap("userRole", "ADMIN"), "!=");
if (condition != null) {
String val = "%" + value + "%";
if (condition.equals("userName")) {
uqo.addQuery("obj.userName", new SysMap("userName", val), "like");
}
if (condition.equals("email")) {
uqo.addQuery("obj.email", new SysMap("email", val), "like");
}
if (condition.equals("trueName")) {
uqo.addQuery("obj.trueName", new SysMap("trueName", val), "like");
}
}
Map<String, Object> map = new HashMap<String, Object>();
if (area_id != null && !("").equals(area_id) && !("请选择...").equals(area_id)) {
map.put("type", "3");
map.put("id", area_id);
}else {
if(areas_city != null && !("").equals(areas_city) && !("请选择...").equals(areas_city)) {
map.put("type", "2");
map.put("id", areas_city);
}else if(areas_province != null && !("").equals(areas_province) && !("请选择...").equals(areas_province)) {
map.put("type", "1");
map.put("id", areas_province);
}
}
if(map.size() > 0) {
Set <Long> areaIds = this.getAreaList(map);
if(areaIds.size() >0) {
uqo.addQueryIn("obj.area.id", new SysMap("areaIds", areaIds), "in");
}
}
uqo.addQuery("obj.cityPartner = 1", null);
IPageList pList = userAcount(this.userService.list(uqo));
String url = this.configService.getSysConfig().getAddress();
if ((url == null) || (url.equals(""))) {
url = CommUtil.getURL(request);
}
List <Area>areas = this.areaService.query("select obj from Area obj where obj.parent.id is null", null, -1, -1);
mv.addObject("areas", areas);
CommUtil.saveIPageList2ModelAndView(url + "/admin/cityPartner_list.htm", "", "", pList, mv);
mv.addObject("userRole", "USER");
mv.addObject("storeTools", this.storeTools);
return mv;
}
private Set<Long> getAreaList(Map<String,Object>map) {
Set<Long>returnList=new HashSet<Long>();
if(map.get("type").toString().equals("3")) {
......
src/com/shopping/manage/admin/action/WechatArticleManageAction.java
View file @ 09a763b4
......@@ -98,7 +98,7 @@ public class WechatArticleManageAction {
@SecurityMapping(display = false, rsequence = 0, title = "文章保存", value = "/admin/wechat_article_save.htm*", rtype = "admin", rname = "文章管理", rcode = "article", rgroup = "网站")
@RequestMapping({ "/admin/wechat_article_save.htm" })
public ModelAndView wechatSave(HttpServletRequest request, HttpServletResponse response, String id, String currentPage,
String cmd, String list_url, String add_url, String articleType, String content,String type) {
String cmd, String list_url, String add_url, String articleType, String content,String type,String flagEnroll,String flagPay) {
WebForm wf = new WebForm();
WechatArticle article = null;
if (id.equals("")) {
......@@ -119,6 +119,8 @@ public class WechatArticleManageAction {
content.replaceAll("src=\"", "src=\"http://www.53zsh.com/");
}
article.setArticleType(articleType);
article.setFlagEnroll(flagEnroll);
article.setFlagPay(flagPay);
Map<String, Object> map = new HashMap<String, Object>();
try {
String uploadFilePath = this.configService.getSysConfig().getUploadFilePath();
......
src/com/shopping/view/web/action/DecorateViewAction.java
View file @ 09a763b4
......@@ -117,7 +117,8 @@ public class DecorateViewAction {
DecorateWorkQueryObject qo = new DecorateWorkQueryObject(currentPage, mv, orderBy, orderType);
qo.addQuery("obj.decorateWorks.id", new SysMap("id", Long.parseLong(decorateId)), "=");
IPageList pList = this.decorateWork.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
String params = "&decorateId=" + decorateId;
CommUtil.saveIPageList2ModelAndView("", "", params, pList, mv);
return mv;
}
}
src/com/shopping/view/web/action/DesignerViewAction.java
View file @ 09a763b4
......@@ -130,7 +130,8 @@ public class DesignerViewAction {
qo.addQuery("obj.designWorks.id", new SysMap("id", Long.parseLong(designId)), "=");
//List<Works>works=this.worksService.query(paramString, paramMap, paramInt1, paramInt2);
IPageList pList = this.worksService.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
String params = "&designId=" + designId;
CommUtil.saveIPageList2ModelAndView("", "", params, pList, mv);
return mv;
}
......
webRoot/WEB-INF/templates/zh_cn/system/admin/blue/wechat_article_add.html
View file @ 09a763b4
......@@ -231,6 +231,44 @@ $("#fileSubmit").click(function(){debugger
<li><span class="webname">
<input name="sequence" type="text" id="sequence" value="$!obj.sequence" size="40" />
</span></li>
</ul>
<ul class="set1">
<li>报名类别</li>
<li>
<span class="webname">
<select name="flagEnroll">
<option value ="0">无需报名</option>
#if($!obj.flagEnroll == 1)
<option value ="1" selected>普通报名</option>
#else
<option value ="1">普通报名</option>
#end
#if($!obj.flagEnroll == 2)
<option value="2" selected>城市合伙人报名</option>
#else
<option value="2">城市合伙人报名</option>
#end
</select>
</span>
</li>
</ul>
<ul class="set1">
<li>支付类别</li>
<li>
<span class="webname">
<select name="flagPay">
<option value ="0">无需支付</option>
#if($!obj.flagPay == 1)
<option value="1" selected>城市合伙人报名</option>
#else
<option value ="1">城市合伙人报名</option>
#end
</select>
</span>
</li>
</ul>
<ul class="set1">
<li><strong class="orange fontsize20">*</strong>内容</li>
......
webRoot/WEB-INF/templates/zh_cn/system/admin/blue/wechat_article_list.html
View file @ 09a763b4
......@@ -28,6 +28,8 @@
<td width="322">文章标题</td>
<td width="183">文章图片</td>
<td width="91">是否显示</td>
<td width="91">报名类别</td>
<td width="91">支付类别</td>
<td width="205">操作</td>
</tr>
#foreach($obj in $objs)
......@@ -36,6 +38,27 @@
<td>$!obj.title</td>
<td><img src="$!webPath/$!obj.accessory.path/$!obj.accessory.name" width="88px" height="44px" /></td>
<td>#if($!obj.display==true)是#else 否#end</td>
<td>
#if(!$!obj.flagEnroll || $!obj.flagEnroll == 0)
无需报名
#end
#if($!obj.flagEnroll == 1)
普通报名
#end
#if($!obj.flagEnroll == 2)
城市合伙人报名
#end
</td>
<td>
#if(!$!obj.flagPayl || $!obj.flagPay == 0)
无需支付
#end
#if($!obj.flagPayl == 1)
支付
#end
</td>
<td class="ac9"><a href="$!webPath/admin/wechat_article_edit.htm?id=$!obj.id&amp;currentPage=$!currentPage&type=$!articleType">编辑</a>
#if($!obj.id == 1 || $!obj.id == 2)
#else
......
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 to comment