Skip to content

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

bug，装修订单

parent 09a763b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3367 additions and 35 deletions
WebRoot/WEB-INF/templates/zh_cn/shop/area_list.html 0 → 100644
View file @ ddccebdd
<!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" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>切换区域 - $!config.title</title>
<meta name="keywords" content="$!config.keywords" />
<meta name="description" content="$!config.description" />
<meta name="generator" content="shopping 2.0" />
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/goods.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>
<style>
.footer{
position:fixed;
bottom:0;
}
</style>
<script>
jQuery(document).ready(function(){
jQuery("#theForm").validate({
errorPlacement:function(error,element) {
error.appendTo(element.parent().find(".login_error_sp"));
element.parent().find(".login_error_sp").show('normal');
},
success:function(label){
label.parent().hide();
},
rules: {
username: "required",
password: "required"#if($!config.securityCodeLogin),
code:"required"#end},
messages: {
username: "用户名不能为空",
password: "密码不能为空"#if($!config.securityCodeLogin),
code:"验证码不能为空"#end
}
});
});
</script>
</head>
<body>
<div class="main">
<div class="head_login">
<div class="login_logo" style="margin-top:30px; padding-left:80px;">
#if($!config.websiteLogo) <a href="$!webPath/index.htm"><img src="$!imageWebServer/$!config.websiteLogo.path/$!config.websiteLogo.name" border="0" /></a>#else<a href="$!webPath/index.htm"><img src="$!imageWebServer/resources/style/system/front/default/images/logo.png" border="0" /></a>#end
</div>
</div>
<table>
#foreach($obj in $area)
<tr>
<td>$obj.areaName</td>
<td> | </td>
#foreach($objc in $obj.childs)
<td><a href="$!webPath/index.htm?id=$objc.id">$objc.areaName</a></td>
#end
</tr>
#end
</table>
$!uc_logout_js
</div>
$!httpInclude.include("/footer.htm")
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/shop/head.html
View file @ ddccebdd
...@@ -59,6 +59,9 @@ function search_form(){ ...@@ -59,6 +59,9 @@ function search_form(){
</a> </a>
#end #end
</div> </div>
<div>
$!cityName <a href="$!webPath/area_list.htm">切换城市</a>
</div>
<div class="searchForm"> <div class="searchForm">
<form action="$!webPath/search.htm" method="post" target="_blank" id="searchForm"> <form action="$!webPath/search.htm" method="post" target="_blank" id="searchForm">
<input name="type" type="hidden" id="type" value="$!type" /> <input name="type" type="hidden" id="type" value="$!type" />
......
WebRoot/WEB-INF/templates/zh_cn/shop/index.html
View file @ ddccebdd
...@@ -307,7 +307,7 @@ $!httpInclude.include("/nav.htm") ...@@ -307,7 +307,7 @@ $!httpInclude.include("/nav.htm")
</div> </div>
<div class="index_flow"> <div class="index_flow">
<div class="flow_title"> <div class="flow_title">
<span>定制流程</span> <span>定制流程 </span>
<div class="triangle-right"></div> <div class="triangle-right"></div>
</div> </div>
<div class="flow_box"> <div class="flow_box">
...@@ -911,7 +911,7 @@ $!httpInclude.include("/nav.htm") ...@@ -911,7 +911,7 @@ $!httpInclude.include("/nav.htm")
</div> </div>
<div class="ercode-box" style="display:none"> <div class="ercode-box" style="display:none">
<div class="ercode-content"> <div class="ercode-content">
<div class="ercode-title">微信支付</div> <div class="ercode-title">支付</div>
<div class="ercode-clearfix"> <div class="ercode-clearfix">
<div class="ercode-left"> <div class="ercode-left">
#if(!$user.url) #if(!$user.url)
...@@ -964,7 +964,7 @@ $!httpInclude.include("/nav.htm") ...@@ -964,7 +964,7 @@ $!httpInclude.include("/nav.htm")
</div> </div>
<div class="ercode-box1" style="display:none"> <div class="ercode-box1" style="display:none">
<div class="ercode-content1"> <div class="ercode-content1">
<div class="ercode-title">微信支付</div> <div class="ercode-title">支付</div>
<div class="ercode-clearfix1"> <div class="ercode-clearfix1">
<div class="ercode-left1"> <div class="ercode-left1">
#if(!$user.url) #if(!$user.url)
...@@ -1007,7 +1007,7 @@ $!httpInclude.include("/nav.htm") ...@@ -1007,7 +1007,7 @@ $!httpInclude.include("/nav.htm")
</div> </div>
<div class="ercode-box2" style="display:none"> <div class="ercode-box2" style="display:none">
<div class="ercode-content2"> <div class="ercode-content2">
<div class="ercode-title">微信支付</div> <div class="ercode-title">支付</div>
<div class="ercode-clearfix2"> <div class="ercode-clearfix2">
<div class="ercode-left2"> <div class="ercode-left2">
#if(!$user.url) #if(!$user.url)
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_decorate_detaile.html
View file @ ddccebdd
...@@ -91,13 +91,14 @@ jQuery(document).ready(function(){ ...@@ -91,13 +91,14 @@ jQuery(document).ready(function(){
}); });
function checkDetail(s){debugger function testFn(id){
$(this).next().show(); if($flag == false){
//$(".zhezhao").show();
// $(".dialog").show(); }else{
alert("预约成功!!!")
}
} }
</script> </script>
<style > <style >
.dialog-closed img { .dialog-closed img {
...@@ -180,7 +181,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -180,7 +181,7 @@ $!httpInclude.include("/nav1.htm")
</div> </div>
<div class="detail_right"> <div class="detail_right">
<!-- <p class="price">$!{design.fees.feesName}</p> --> <!-- <p class="price">$!{design.fees.feesName}</p> -->
<p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=2">预约咨询</a></p> <p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=2" onclick="testFn($!{design.user.id})">预约咨询</a></p>
</div> </div>
</div> </div>
...@@ -194,12 +195,15 @@ $!httpInclude.include("/nav1.htm") ...@@ -194,12 +195,15 @@ $!httpInclude.include("/nav1.htm")
#set($img ="$webPath/$obj.main_img.path/$obj.main_img.name") #set($img ="$webPath/$obj.main_img.path/$obj.main_img.name")
#end #end
<div class="one-list"> <div class="one-list">
<div class="designer_detail_box" onclick="javascript:jQuery('#dialog_$!{obj.id}').show();event.stopPropagation();"> <!-- <div class="designer_detail_box" onclick="javascript:jQuery('#dialog_$!{obj.id}').show();event.stopPropagation();"> -->
<!-- <div class="designer_detail_box" onclick="checkDetail('$!{obj.id}')"> -->
<a class="designer_detail_box" href="$!webPath/zs_work_detaile.htm?workId=$!{obj.id}" >
<img src="$img" /> <img src="$img" />
<div class="detail"> <div class="detail">
<p>$obj.worksName</p> <p>$obj.worksName</p>
</div> </div>
</div> </a>
<!-- </div> -->
<div class="dialog" id="dialog_$!{obj.id}" style="display:none;"> <div class="dialog" id="dialog_$!{obj.id}" style="display:none;">
<div class="dialog-bg"></div> <div class="dialog-bg"></div>
<div class="nember_box"> <div class="nember_box">
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_designer_detaile.html
View file @ ddccebdd
...@@ -98,7 +98,13 @@ function checkDetail(s){debugger ...@@ -98,7 +98,13 @@ function checkDetail(s){debugger
// $(".dialog").show(); // $(".dialog").show();
} }
function testFn(id){
if($flag == false){
}else{
alert("预约成功!!!")
}
}
</script> </script>
<style > <style >
.dialog-closed img { .dialog-closed img {
...@@ -176,7 +182,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -176,7 +182,7 @@ $!httpInclude.include("/nav1.htm")
</div> </div>
<div class="detail_right"> <div class="detail_right">
<p class="price">$!{design.fees.feesName}</p> <p class="price">$!{design.fees.feesName}</p>
<p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=1" onclick="alert('预约成功!!!')">预约咨询</a></p> <p><a href="$!webPath/zs_account_count.htm?managerId=$!{design.user.id}&type=1" onclick="testFn($!{design.user.id})">预约咨询</a></p>
</div> </div>
</div> </div>
...@@ -190,12 +196,14 @@ $!httpInclude.include("/nav1.htm") ...@@ -190,12 +196,14 @@ $!httpInclude.include("/nav1.htm")
#set($img ="$webPath/$obj.main_img.path/$obj.main_img.name") #set($img ="$webPath/$obj.main_img.path/$obj.main_img.name")
#end #end
<div class="one-list"> <div class="one-list">
<div class="designer_detail_box" onclick="javascript:jQuery('#dialog_$!{obj.id}').show();event.stopPropagation();"> <!-- <div class="designer_detail_box" onclick="javascript:jQuery('#dialog_$!{obj.id}').show();event.stopPropagation();"> -->
<a class="designer_detail_box" href="$!webPath/zs_designwork_detaile.htm?workId=$!{obj.id}" >
<img src="$img" /> <img src="$img" />
<div class="detail"> <div class="detail">
<p>$obj.worksName</p> <p>$obj.worksName</p>
</div> </div>
</div> </a>
<!-- </div> -->
<div class="dialog" id="dialog_$!{obj.id}" style="display:none;"> <div class="dialog" id="dialog_$!{obj.id}" style="display:none;">
<div class="dialog-bg"></div> <div class="dialog-bg"></div>
<div class="nember_box"> <div class="nember_box">
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_fengshui_index.html
View file @ ddccebdd
...@@ -359,7 +359,7 @@ $!httpInclude.include("/nav1.htm") ...@@ -359,7 +359,7 @@ $!httpInclude.include("/nav1.htm")
</div> </div>
<div class="ercode-box" style="display:none"> <div class="ercode-box" style="display:none">
<div class="ercode-content"> <div class="ercode-content">
<div class="ercode-title">微信支付</div> <div class="ercode-title">支付</div>
<div class="ercode-clearfix"> <div class="ercode-clearfix">
<div class="ercode-left"> <div class="ercode-left">
#if(!$user.url) #if(!$user.url)
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_work_detail.html 0 → 100644
View file @ ddccebdd
<!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>$!config.title</title>
<meta name="keywords" content="$!config.keywords" >
<meta name="description" content="$!config.description" >
<meta name="generator" content="shopping 2.0">
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
#if($!config.sina_domain_code)
$!{config.sina_domain_code}
#end
#if($!config.qq_domain_code)
$!{config.qq_domain_code}
#end
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/public_auto.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/designer.css" type="text/css" rel="stylesheet" />
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
</head>
<style>
.article_head{
display: flex;
flex-direction: column;
align-items: center;
}
.img-d{
width:800px;
margin: 15px;
}
h1{
font-size: 22px;
}
</style>
<body>
<!--低版本提示-->
<!--[if IE 6]>
<div class="top_tipe">
<div class="top_tipe_center">
<em><img src="$!webPath/resources/style/system/front/default/images/ie6_warning.png" style="height:16px; width:16px;"/></em><b>温馨提示：您当前使用的浏览器版本过低，兼容性和安全性较差，建议您升级：</b><em><img src="$!webPath/resources/style/system/front/default/images/ie_b.png"/></em><b><a href="http://windows.microsoft.com/zh-cn/internet-explorer/download-ie?tp=1.0.0.0.0.KdMt0Yu">IE8浏览器</a>或</b><em><img src="$!webPath/resources/style/system/front/default/images/google_b.png" /></em><b><a href="http://www.google.cn/intl/zh-CN/chrome/">谷歌浏览器</a></b>
<span><a href="javascript:void(0);" onclick="javascript:jQuery('.top_tipe').hide();">x</a></span>
</div>
</div>
<![endif]-->
$!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm")
$!httpInclude.include("/nav1.htm")
<div class="main">
<div class="index">
<div class="position">当前位置：<a href="$!webPath/index.htm" >首页 ></a> <span>作品详情</span></div>
<div class="article_head">
<h1>$!{objs.worksName}</h1>
<!-- <p><span>来源：$!{objs.source}</span><span>$!{objs.addTime}</span></p> -->
<img class="img-d" src="$webPath/$objs.main_img.path/$objs.main_img.name">
</div>
<div class="article_content">
$!{objs.introduction}
</div>
</div>
</div>
$!httpInclude.include("/footer.htm")
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/contract_detailed.html 0 → 100644
View file @ ddccebdd
<!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/contract_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="60">合同编码</td>
<td width="60">用户名</td>
<td width="60">合伙人</td>
<td width="60">装修公司</td>
<td width="60">装修公司联系人</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.contractName
</span>
</td>
<td ><span class="allmen size5">
$!obj.contractNumber
</span>
</td>
<td ><span class="allmen size5">
$!obj.user.userName (手机号: $!obj.user.mobile)
</span></td>
<td>
<span class="allmen size7">
$!obj.partner.userName(手机号: $!obj.partner.mobile)
</span>
</td>
<td >
<span class="allmen size7">
$!obj.decorate.decorationName
</span>
</td>
<td >
<span class="allmen size7">
$!obj.decorate.user.userName(手机号: $!obj.decorate.user.mobile)
</span>
</td>
<td >
<span class="allmen size7">
$!obj.addTime
</span>
</td>
<td >
<span class="allmen size7">
<a href="$!webPath/admin/?id=$!obj.id" class="blue">查看详情</a>
</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/contract_list.html 0 → 100644
View file @ ddccebdd
<!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/contract_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="60">合同编码</td>
<td width="60">用户名</td>
<td width="60">合伙人</td>
<td width="60">装修公司</td>
<td width="60">装修公司联系人</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.contractName
</span>
</td>
<td ><span class="allmen size5">
$!obj.contractNumber
</span>
</td>
<td ><span class="allmen size5">
$!obj.user.userName (手机号: $!obj.user.mobile)
</span></td>
<td>
<span class="allmen size7">
$!obj.partner.userName(手机号: $!obj.partner.mobile)
</span>
</td>
<td >
<span class="allmen size7">
$!obj.decorate.decorationName
</span>
</td>
<td >
<span class="allmen size7">
$!obj.decorate.user.userName(手机号: $!obj.decorate.user.mobile)
</span>
</td>
<td >
<span class="allmen size7">
$!obj.addTime
</span>
</td>
<td >
<span class="allmen size7">
<a href="$!webPath/admin/contract_detailed.htm?id=$!obj.id" class="blue">查看详情</a>
</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/login.html
View file @ ddccebdd
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>shopping商城系统后台登录</title> <title>智尚荟商城系统后台登录</title>
</head> </head>
<link href="$!webPath/resources/style/system/manage/blue/login.css" rel="stylesheet" type="text/css" /> <link href="$!webPath/resources/style/system/manage/blue/login.css" rel="stylesheet" type="text/css" />
<script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script> <script src="$!webPath/resources/js/jquery-1.11.0.min.js"></script>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/manage.html
View file @ ddccebdd
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" > <html xmlns="http://www.w3.org/1999/xhtml" >
<head> <head>
<meta http-equiv="Content-Type" content="text/html;" charset="UTF-8"> <meta http-equiv="Content-Type" content="text/html;" charset="UTF-8">
<title>shopping B2B2C</title> <title>智尚荟商城管理后台</title>
<link href="$!webPath/resources/style/admin/resource/css/skin_$!{config.websiteCss}.css" rel="stylesheet" type="text/css" id="cssfile"/> <link href="$!webPath/resources/style/admin/resource/css/skin_$!{config.websiteCss}.css" rel="stylesheet" type="text/css" id="cssfile"/>
<script type="text/javascript" src="$!webPath/resources/style/new/js/jquery.js"></script> <script type="text/javascript" src="$!webPath/resources/style/new/js/jquery.js"></script>
...@@ -402,7 +402,9 @@ ...@@ -402,7 +402,9 @@
<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/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/contract_list.htm" name="24561" id="24561" onclick="openItem('87','24561');" 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/bespoke_list.htm" name="24525" id="24525" onclick="openItem('87','24525');" class="">预约管理</a></li>
......
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/welcome.html
View file @ ddccebdd
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
<li>订单总金额：¥$!CommUtil.null2Double($!{stat.order_amount})元</li> <li>订单总金额：¥$!CommUtil.null2Double($!{stat.order_amount})元</li>
</ul> </ul>
</div> </div>
<div class="wela"> <div class="wela">
<h2>系统信息</h2> <h2>系统信息</h2>
...@@ -45,7 +43,6 @@ ...@@ -45,7 +43,6 @@
<li>安装日期：$!CommUtil.formatLongDate($!config.addTime)</li> <li>安装日期：$!CommUtil.formatLongDate($!config.addTime)</li>
</ul> </ul>
</div> </div>
</div> </div>
</body> </body>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/account_nav.html
View file @ ddccebdd
...@@ -49,6 +49,8 @@ jQuery(document).ready(function(){ ...@@ -49,6 +49,8 @@ jQuery(document).ready(function(){
<li op="predeposit_log"><a href="$!webPath/buyer/predeposit_log.htm">收支明细</a></li> <li op="predeposit_log"><a href="$!webPath/buyer/predeposit_log.htm">收支明细</a></li>
<li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li> <li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li>
#end #end
<!-- <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li> -->
</ul> </ul>
</li> </li>
</ul> </ul>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/add_detailed.html 0 → 100644
View file @ ddccebdd
<!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>
<meta name="keywords" content="$!config.keywords" />
<meta name="description" content="$!config.description" />
<meta name="generator" content="shopping 2.0" />
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/user.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/common/css/jquery-ui-1.8.22.custom.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/common/css/overlay.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/goods.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/index.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/upload.css" type="text/css" rel="stylesheet" />
<script src="$!webPath/resources/js/jquery-1.11.0.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 src="$!webPath/resources/js/jquery.poshytip.min.js"></script>
<script src="$!webPath/resources/js/jquery.shop.common.js"></script>
<script src="$!webPath/resources/js/jquery.validate.min.js"></script>
<script src="$!webPath/resources/js/webUpload.min.js"></script>
<script src="$!webPath/resources/js/extend-webuploader-work.js"></script>
<script>
jQuery(document).ready(function(){
$(document).on("click",".workImg-boxs",function(){
$(this).addClass("mainImg").siblings().removeClass("mainImg")
if($(this).hasClass("mainImg")){
var imgid = $(this).find('img').attr("image_id")
$("#main_img").val(imgid)
}
})
});
function saveForm(){
jQuery("#theForm").submit();
}
</script>
</head>
<body>
$!httpInclude.include("/top.htm")
<div class="main"> $!httpInclude.include("/buyer/head.htm")
<div class="user_center">
<table width="1000" border="0" cellspacing="0" cellpadding="0" class="user_table">
<tr> $!httpInclude.include("/buyer/account_nav.htm?op=buyer_cash")
<td id="centerbg" valign="top">
<div class="buyer_position"><div class="buyer_p_box"><a href="$!webPath/buyer/account.htm">我的账户</a> > <span>添加</span></div></div>
<div class="productmain">
<form action="$!webPath/buyer/add_detailed_save.htm" method="post" name="theForm" id="theForm">
<div class="ordercon">
<div class="operation">
<table width="800" border="0" cellspacing="0" cellpadding="0" id="opertable" >
<tr>
<td></td>
<td></td>
<td>
装修计划表
</td>
<<td></td>
<td></td>
</tr>
<tr>
<td>分佣比例::</td>
<td><input name="commission" type="number" id="commission" />%</td>
</tr>
<tr>
<td>装修工期</td>
<td>水电验收工期：</td>
<td><input name="hydropower" type="text" id="hydropower" /></td>
<td>泥木工验收工期：</td>
<td><input name="mudwood" type="text" id="mudwood" /></td>
</tr>
<tr>
<td></td>
<td>油漆验收工期：</td>
<td><input name="paint" type="text" id="paint" /></td>
<td>竣工工验收工期：</td>
<td><input name="completed" type="text" id="completed" /></td>
</tr>
<tr>
<td class="px10"><span class="setsub">
<input type="hidden" name="id" id="id" value="$!id" />
<input type="button" onclick="saveForm();" value="保存" style="cursor:pointer;"/>
</span></td>
</tr>
</table>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
$!httpInclude.include("/footer.htm")
</div>
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/buyer_cash.html
View file @ ddccebdd
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<script src="$!webPath/resources/js/jquery.validate.min.js"></script> <script src="$!webPath/resources/js/jquery.validate.min.js"></script>
<script src="$!webPath/resources/js/jquery-ui-1.8.21.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 src="$!webPath/resources/js/jquery.zh.cn.js"></script>
<script> <script>
jQuery(document).ready(function(){ jQuery(document).ready(function(){
jQuery("#theForm").validate({ jQuery("#theForm").validate({
...@@ -46,6 +47,47 @@ jQuery(document).ready(function(){ ...@@ -46,6 +47,47 @@ jQuery(document).ready(function(){
}); });
}); });
</script> </script>
<style>
#imgPreview {
float: left;
border: none;
}
#imgPreview img {
margin-right: 10px;
width: 100px;
height: 50px;
}
.upload-img {
display: block;
float: left;
width: 150px;
height: 150px;
overflow: hidden;
position: relative;
background: url("../images/self/upload.png") no-repeat 0;
background-size: contain;
}
//这儿是为了改变上传按钮样式把input设为了透明色
.upload-img input {
height: 50px;
opacity: 0;
filter: alpha(opacity=0);
position: absolute;
top: 0;
right: 0;
}
#uploader .queueList.filled{
padding:10px;
border:3px dashed #e6e6e6;
}
#uploader .statusBar{
padding:0 0 0 20px;
}
#uploader .statusBar .btns{
right:0;
}
</style>
</head> </head>
<body> <body>
$!httpInclude.include("/top.htm") $!httpInclude.include("/top.htm")
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/consult.html
View file @ ddccebdd
...@@ -24,7 +24,7 @@ $!httpInclude.include("/top.htm") ...@@ -24,7 +24,7 @@ $!httpInclude.include("/top.htm")
<table width="1000" border="0" cellspacing="0" cellpadding="0" class="user_table"> <table width="1000" border="0" cellspacing="0" cellpadding="0" class="user_table">
<tr> $!httpInclude.include("/seller/nav.htm?op=consult") <tr> $!httpInclude.include("/seller/nav.htm?op=consult")
<td id="centerbg" valign="top"> <td id="centerbg" valign="top">
<div class="buyer_position"><div class="buyer_p_box"><a href="$!webPath/Seller/index.htm">卖家中心</a> > <span>咨询管理</span></div></div> <div class="buyer_position"><div class="buyer_p_box"><a href="$!webPath/seller/index.htm">卖家中心</a> > <span>咨询管理</span></div></div>
<div class="productmain"> <div class="productmain">
<div class="ordernav"> <div class="ordernav">
<ul class="orderul"> <ul class="orderul">
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_list.html 0 → 100644
View file @ ddccebdd
<!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>
<meta name="keywords" content="$!config.keywords" />
<meta name="description" content="$!config.description" />
<meta name="generator" content="shopping 2.0" />
<meta name="author" content="www.shopping.com">
<meta name="copyright" content="shopping Inc. All Rights Reserved">
<link href="$!webPath/resources/style/system/front/default/css/public.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/system/front/default/css/user.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/common/css/jquery-ui-1.8.22.custom.css" type="text/css" rel="stylesheet" />
<link href="$!webPath/resources/style/common/css/overlay.css" type="text/css" rel="stylesheet" />
<script src="$!webPath/resources/js/jquery-1.11.0.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 src="$!webPath/resources/js/jquery.poshytip.min.js"></script>
<script src="$!webPath/resources/js/jquery.shop.common.js"></script>
<script src="$!webPath/resources/js/jquery.validate.min.js"></script>
<script>
jQuery(document).ready(function(){
//
});
</script>
</head>
<body>
$!httpInclude.include("/top.htm")
<div class="main"> $!httpInclude.include("/buyer/head.htm")
<div class="user_center">
<table width="1000" border="0" cellspacing="0" cellpadding="0" class="user_table">
<tr> $!httpInclude.include("/buyer/account_nav.htm?op=buyer_cash")
<td id="centerbg" valign="top">
<div class="buyer_position">
<div class="buyer_p_box"><a href="$!webPath/buyer/account.htm">我的账户</a> > <span>装修订单列表</span></div>
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")>=0)
<span class="allmen size7">
<a href="$!webPath/buyer/contract_add_detailed.htm" class="blue">新增</a>
</span>
#end
</div>
<div class="productmain">
<div class="ordercon">
<div class="operation">
<table width="800" border="0" cellspacing="0" cellpadding="0" id="opertable" >
<tr id="opertitle">
<td width="60">合同名</td>
<td width="40">合同编码</td>
<td width="60">用户名</td>
<!-- <td width="60">合伙人</td>
<td width="60">装修公司</td>
<td width="60">装修公司联系人</td> -->
<td width="150" >创建时间</td>
<td width="150" >操作</td>
</tr>
#foreach($obj in $objs)
<tr class="opertr">
<td ><span class="allmen size5">
$!obj.contractName
</span>
</td>
<td ><span class="allmen size5">
$!obj.contractNumber
</span>
</td>
<td ><span class="allmen size5">
$!obj.user.userName (手机号: $!obj.user.mobile)
</span></td>
<!-- <td>
<span class="allmen size7">
$!obj.partner.userName(手机号: $!obj.partner.mobile)
</span>
</td>
<td >
<span class="allmen size7">
$!obj.decorate.decorationName
</span>
</td>
<td >
<span class="allmen size7">
$!obj.decorate.user.userName(手机号: $!obj.decorate.user.mobile)
</span>
</td> -->
<td >
<span class="allmen size7">
$!obj.addTime
</span>
</td>
<td >
<span class="allmen size7">
<a href="$!webPath/buyer/contract_detailed.htm?id=$!obj.id" class="blue">查看详情</a>
</span>
</td>
</tr>
#end
</table>
</div>
<div class="alldel">
<div class="userfenye">$!gotoPageFormHTML</div>
</div>
</div>
</div>
</td>
</tr>
</table>
</div>
$!httpInclude.include("/footer.htm")
</div>
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/decorate_work_list.html
View file @ ddccebdd
...@@ -62,7 +62,7 @@ $!httpInclude.include("/seller/nav_head.htm") ...@@ -62,7 +62,7 @@ $!httpInclude.include("/seller/nav_head.htm")
<div class="seller"> <div class="seller">
<!--店铺设置--> <!--店铺设置-->
<div class="product_manage2"> <div class="product_manage2">
<div class="protitle_seller">设计师中心</div> <div class="protitle_seller">装修公司中心</div>
<ul class="sellul"> <ul class="sellul">
<ul> <ul>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/decorate_works_edit.html
View file @ ddccebdd
...@@ -212,7 +212,7 @@ $!httpInclude.include("/seller/nav_head.htm") ...@@ -212,7 +212,7 @@ $!httpInclude.include("/seller/nav_head.htm")
<div class="seller"> <div class="seller">
<!--店铺设置--> <!--店铺设置-->
<div class="product_manage2"> <div class="product_manage2">
<div class="protitle_seller">设计师中心</div> <div class="protitle_seller">装修公司中心</div>
<ul class="sellul"> <ul class="sellul">
<ul> <ul>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/seller_index.html
View file @ ddccebdd
...@@ -214,7 +214,10 @@ $!httpInclude.include("/seller/nav_head.htm") ...@@ -214,7 +214,10 @@ $!httpInclude.include("/seller/nav_head.htm")
<ul> <ul>
<li class="this"> <li class="this">
<h5>您需要立即处理的交易订单：</h5> <h5>您需要立即处理的交易订单：</h5>
<span>近期销售：<i><a href="$!webPath/seller/order.htm">交易中的订单</a>(<b>$!{order_count}</b>)</i></span><span>维权提示：<i><a href="$!webPath/seller/complaint.htm">收到维权投诉</a>(<b>0</b>)</i></span> </li> <span>近期销售：<i><a href="$!webPath/seller/order.htm">交易中的订单</a>(<b>$!{order_count}</b>)</i></span>
<span>维权提示：<i><a href="$!webPath/seller/complaint.htm">收到维权投诉</a>(<b>0</b>)</i></span>
<span>咨询管理：<i><a href="$!webPath/seller/consult.htm">收到咨询</a></i></span>
</li>
<li class="other"><span><a href="$!webPath/seller/order.htm?order_status=order_submit">待买家付款：($!{order_wait_pay_count})</a></span><span><a href="$!webPath/seller/order.htm?order_status=order_pay">待发货：($!{order_wait_ship_count})</a></span><span><a href="$!webPath/seller/order.htm?order_status=order_shipping">待卖家收货：($!{order_wait_takeover_count})</a></span><span><a href="$!webPath/seller/order.htm?order_status=order_evaluate">待评价：($!order_wait_evaluate_count)</a></span></li> <li class="other"><span><a href="$!webPath/seller/order.htm?order_status=order_submit">待买家付款：($!{order_wait_pay_count})</a></span><span><a href="$!webPath/seller/order.htm?order_status=order_pay">待发货：($!{order_wait_ship_count})</a></span><span><a href="$!webPath/seller/order.htm?order_status=order_shipping">待卖家收货：($!{order_wait_takeover_count})</a></span><span><a href="$!webPath/seller/order.htm?order_status=order_evaluate">待评价：($!order_wait_evaluate_count)</a></span></li>
</ul> </ul>
</div> </div>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/workDesign_list.html
View file @ ddccebdd
...@@ -47,6 +47,7 @@ $!httpInclude.include("/seller/nav_head.htm") ...@@ -47,6 +47,7 @@ $!httpInclude.include("/seller/nav_head.htm")
<li><span><a href="$!webPath/buyer/index.htm">买家中心</a></span></li> <li><span><a href="$!webPath/buyer/index.htm">买家中心</a></span></li>
<li><span><a href="$!webPath/buyer/account.htm">我的账户</a></span></li> <li><span><a href="$!webPath/buyer/account.htm">我的账户</a></span></li>
<li class="this"><span><a href="$!webPath/design/design_message.htm">设计师</a></span></li> <li class="this"><span><a href="$!webPath/design/design_message.htm">设计师</a></span></li>
<li><span><a href="$!webPath/design/decorate_message.htm">装修公司</a></span></li>
</ul> </ul>
#if($!user.store) #if($!user.store)
<span class="seller_nav_a"><a href="javascript:void(0);" dialog_uri="$!webPath/seller/store_quick_menu.htm" dialog_title="设置快捷操作" dialog_width="730" dialog_height="100" dialog_id="store_quick_menu">设置快捷操作</a></span> <span class="seller_nav_a"><a href="javascript:void(0);" dialog_uri="$!webPath/seller/store_quick_menu.htm" dialog_title="设置快捷操作" dialog_width="730" dialog_height="100" dialog_id="store_quick_menu">设置快捷操作</a></span>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/works_edit.html
View file @ ddccebdd
...@@ -192,6 +192,7 @@ $!httpInclude.include("/seller/nav_head.htm") ...@@ -192,6 +192,7 @@ $!httpInclude.include("/seller/nav_head.htm")
<li><span><a href="$!webPath/buyer/index.htm">买家中心</a></span></li> <li><span><a href="$!webPath/buyer/index.htm">买家中心</a></span></li>
<li><span><a href="$!webPath/buyer/account.htm">我的账户</a></span></li> <li><span><a href="$!webPath/buyer/account.htm">我的账户</a></span></li>
<li class="this"><span><a href="$!webPath/design/design_message.htm">设计师</a></span></li> <li class="this"><span><a href="$!webPath/design/design_message.htm">设计师</a></span></li>
<li><span><a href="$!webPath/design/decorate_message.htm">装修公司</a></span></li>
</ul> </ul>
#if($!user.store) #if($!user.store)
<span class="seller_nav_a"><a href="javascript:void(0);" dialog_uri="$!webPath/seller/store_quick_menu.htm" dialog_title="设置快捷操作" dialog_width="730" dialog_height="100" dialog_id="store_quick_menu">设置快捷操作</a></span> <span class="seller_nav_a"><a href="javascript:void(0);" dialog_uri="$!webPath/seller/store_quick_menu.htm" dialog_title="设置快捷操作" dialog_width="730" dialog_height="100" dialog_id="store_quick_menu">设置快捷操作</a></span>
......
WebRoot/resources/style/system/front/default/css/goods.css
View file @ ddccebdd
...@@ -209,7 +209,39 @@ setect#typenum { ...@@ -209,7 +209,39 @@ setect#typenum {
display:none; display:none;
overflow:auto; overflow:auto;
} }
setect#typenum2 {
position: absolute;
z-index: 999;
background: #fff;
width: 240px;
margin-top: 1px;
box-shadow: 0 0 4px #ddddddc7;
height:130px;
display:none;
overflow:auto;
}
setect#typenum3 {
position: absolute;
z-index: 999;
background: #fff;
width: 240px;
margin-top: 1px;
box-shadow: 0 0 4px #ddddddc7;
height:130px;
display:none;
overflow:auto;
}
setect#typenum4 {
position: absolute;
z-index: 999;
background: #fff;
width: 240px;
margin-top: 1px;
box-shadow: 0 0 4px #ddddddc7;
height:130px;
display:none;
overflow:auto;
}
setect#typenum option { setect#typenum option {
line-height: 25px; line-height: 25px;
height: 25px; height: 25px;
...@@ -217,12 +249,42 @@ setect#typenum option { ...@@ -217,12 +249,42 @@ setect#typenum option {
cursor:pointer; cursor:pointer;
border-bottom: 1px dotted #f1f1f1; border-bottom: 1px dotted #f1f1f1;
} }
setect#typenum2 option {
line-height: 25px;
height: 25px;
padding:3px 10px;
cursor:pointer;
border-bottom: 1px dotted #f1f1f1;
}
setect#typenum3 option {
line-height: 25px;
height: 25px;
padding:3px 10px;
cursor:pointer;
border-bottom: 1px dotted #f1f1f1;
}
setect#typenum4 option {
line-height: 25px;
height: 25px;
padding:3px 10px;
cursor:pointer;
border-bottom: 1px dotted #f1f1f1;
}
setect#typenum option:hover{ setect#typenum option:hover{
background:#f5f5f5 background:#f5f5f5
} }
input#refereeId{ input#refereeId{
display:none; display:none;
} }
input#refereeId2{
display:none;
}
input#refereeId3{
display:none;
}
input#refereeId4{
display:none;
}
.input_size2 input{ width:89px;border:1px solid #ddd;border-radius:4px;} .input_size2 input{ width:89px;border:1px solid #ddd;border-radius:4px;}
.yzm{ margin-left:10px;} .yzm{ margin-left:10px;}
.login_user_btn input{ background:url(../images/loginli.jpg) no-repeat; width:98px; height:32px; font-size:14px;font-family: "微软雅黑"; border:0px; color:#FFF} .login_user_btn input{ background:url(../images/loginli.jpg) no-repeat; width:98px; height:32px; font-size:14px;font-family: "微软雅黑"; border:0px; color:#FFF}
......
src/com/shopping/core/query/QueryObject.java
View file @ ddccebdd
...@@ -157,6 +157,18 @@ public class QueryObject implements IQueryObject { ...@@ -157,6 +157,18 @@ public class QueryObject implements IQueryObject {
return this; return this;
} }
public IQueryObject addQueryOr(Map <String,Object>map) {
if ((map != null)) {
this.queryString = (this.queryString + " and " + " ( ");
for (String key : map.keySet()) {
this.queryString += key + " = " + map.get(key) + " or ";
}
this.queryString = this.queryString.substring(0, this.queryString.length()-4);
this.queryString += " ) ";
}
return this;
}
public IQueryObject addQuery(String field, SysMap para, String expression, String logic) { public IQueryObject addQuery(String field, SysMap para, String expression, String logic) {
if ((field != null) && (para != null)) { if ((field != null) && (para != null)) {
this.queryString = (this.queryString + " " + logic + " " + field + " " + handleExpression(expression) + ":" + para.getKey().toString()); this.queryString = (this.queryString + " " + logic + " " + field + " " + handleExpression(expression) + ":" + para.getKey().toString());
......
src/com/shopping/foundation/dao/ContractDAO.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.dao;
import org.springframework.stereotype.Repository;
import com.shopping.core.base.GenericDAO;
import com.shopping.foundation.domain.Contract;
import com.shopping.foundation.domain.Design;
@Repository("contractDAO")
public class ContractDAO extends GenericDAO<Contract> {
}
src/com/shopping/foundation/dao/ContractDetailedDAO.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.dao;
import org.springframework.stereotype.Repository;
import com.shopping.core.base.GenericDAO;
import com.shopping.foundation.domain.ContractDetailed;
import com.shopping.foundation.domain.Design;
@Repository("contractDetailedDAO")
public class ContractDetailedDAO extends GenericDAO<ContractDetailed> {
}
src/com/shopping/foundation/domain/Accessory.java
View file @ ddccebdd
...@@ -73,6 +73,10 @@ public class Accessory extends IdEntity { ...@@ -73,6 +73,10 @@ public class Accessory extends IdEntity {
@ManyToMany(mappedBy = "accessory") @ManyToMany(mappedBy = "accessory")
private List<DecorateWork> decorateWorks = new ArrayList<DecorateWork>(); private List<DecorateWork> decorateWorks = new ArrayList<DecorateWork>();
// 做品图片
@ManyToMany(mappedBy = "accessory")
private List<Contract> contract = new ArrayList<Contract>();
/*@OneToOne /*@OneToOne
private Works main_img;*/ private Works main_img;*/
...@@ -208,5 +212,20 @@ public class Accessory extends IdEntity { ...@@ -208,5 +212,20 @@ public class Accessory extends IdEntity {
this.works = works; this.works = works;
} }
public List<DecorateWork> getDecorateWorks() {
return decorateWorks;
}
public void setDecorateWorks(List<DecorateWork> decorateWorks) {
this.decorateWorks = decorateWorks;
}
public List<Contract> getContract() {
return contract;
}
public void setContract(List<Contract> contract) {
this.contract = contract;
}
} }
src/com/shopping/foundation/domain/Contract.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.domain;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.alibaba.fastjson.annotation.JSONField;
import com.shopping.core.domain.IdEntity;
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@Entity
@Table(name = "shopping_contract")
public class Contract extends IdEntity {
// 名
private String contractName;
// 合同编码
private String contractNumber;
// 合同金额
private Double contractAmount;
// 用户
@OneToOne(fetch = FetchType.EAGER)
private User user;
// 合伙人
@OneToOne(fetch = FetchType.EAGER)
private User partner;
// 监理人
@OneToOne(fetch = FetchType.EAGER)
private User supervisor;
//装修公司
@OneToOne(fetch = FetchType.EAGER)
private Decorate decorate;
// 合同状态
private String contractState;
// 方案状态
private String planState;
// 支付方式(0-分期,1-全款)
private String payWay;
// 支付步骤
private String payState;
// 总期数
private Integer termAmount;
//合同图片
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = "shopping_contract_photo", joinColumns = {
@javax.persistence.JoinColumn(name = "contract_id") }, inverseJoinColumns = {
@javax.persistence.JoinColumn(name = "photo_id") })
private List<Accessory> accessory = new ArrayList<Accessory>();
// 合同细节
@OneToMany(mappedBy = "contract", targetEntity = ContractDetailed.class,fetch = FetchType.LAZY)
private List<ContractDetailed> contractDetailed = new ArrayList<ContractDetailed>();
// 带单人
@OneToOne(fetch = FetchType.EAGER)
private User tape;
//甲方
private String partyA;
//乙方
private String partyB;
//甲方联系方式
private String partyAPhone;
//乙方联系方式
private String partyBPhone;
//分佣比例
private Double commission;
//水电工期
private String hydropower;
//泥木工期
private String mudwood;
//油漆工期
private String paint;
//竣工工期
private String completed;
//总工期
private String allTerm;
/*
* 状态1-新增的订单，需要上传方案,2-已上传方案，等待客户确认。3-已确认，等待支付。4-支付完成（一次性付即全部完成、分期则只付了第一次），开始装修
* 5-一期装修完成，等待客户验收.6-客户已验收，分期付款第二次支付。7-客户已支付，第二期装修开始，等装修公司完成装修.8-第二期装修已完成，等待客户验收。
* 9-第二期客户已验收，等待支付第三期装修款。10-第二期已支付，开始第三期装修。11-第三期装修完成，等待客户验收。12-第三期验收完成，等待竣工验收
*/
private String state;
public String getContractName() {
return contractName;
}
public void setContractName(String contractName) {
this.contractName = contractName;
}
public String getContractNumber() {
return contractNumber;
}
public void setContractNumber(String contractNumber) {
this.contractNumber = contractNumber;
}
public Double getContractAmount() {
return contractAmount;
}
public void setContractAmount(Double contractAmount) {
this.contractAmount = contractAmount;
}
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
public User getPartner() {
return partner;
}
public void setPartner(User partner) {
this.partner = partner;
}
public User getSupervisor() {
return supervisor;
}
public void setSupervisor(User supervisor) {
this.supervisor = supervisor;
}
public Decorate getDecorate() {
return decorate;
}
public void setDecorate(Decorate decorate) {
this.decorate = decorate;
}
public String getContractState() {
return contractState;
}
public void setContractState(String contractState) {
this.contractState = contractState;
}
public String getPlanState() {
return planState;
}
public void setPlanState(String planState) {
this.planState = planState;
}
public String getPayWay() {
return payWay;
}
public void setPayWay(String payWay) {
this.payWay = payWay;
}
public Integer getTermAmount() {
return termAmount;
}
public void setTermAmount(Integer termAmount) {
this.termAmount = termAmount;
}
public List<Accessory> getAccessory() {
return accessory;
}
public void setAccessory(List<Accessory> accessory) {
this.accessory = accessory;
}
public List<ContractDetailed> getContractDetailed() {
return contractDetailed;
}
public void setContractDetailed(List<ContractDetailed> contractDetailed) {
this.contractDetailed = contractDetailed;
}
public User getTape() {
return tape;
}
public void setTape(User tape) {
this.tape = tape;
}
public String getPartyA() {
return partyA;
}
public void setPartyA(String partyA) {
this.partyA = partyA;
}
public String getPartyB() {
return partyB;
}
public void setPartyB(String partyB) {
this.partyB = partyB;
}
public String getPartyAPhone() {
return partyAPhone;
}
public void setPartyAPhone(String partyAPhone) {
this.partyAPhone = partyAPhone;
}
public String getPartyBPhone() {
return partyBPhone;
}
public void setPartyBPhone(String partyBPhone) {
this.partyBPhone = partyBPhone;
}
public Double getCommission() {
return commission;
}
public void setCommission(Double commission) {
this.commission = commission;
}
public String getHydropower() {
return hydropower;
}
public void setHydropower(String hydropower) {
this.hydropower = hydropower;
}
public String getMudwood() {
return mudwood;
}
public void setMudwood(String mudwood) {
this.mudwood = mudwood;
}
public String getPaint() {
return paint;
}
public void setPaint(String paint) {
this.paint = paint;
}
public String getCompleted() {
return completed;
}
public void setCompleted(String completed) {
this.completed = completed;
}
public String getAllTerm() {
return allTerm;
}
public void setAllTerm(String allTerm) {
this.allTerm = allTerm;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public String getPayState() {
return payState;
}
public void setPayState(String payState) {
this.payState = payState;
}
}
src/com/shopping/foundation/domain/ContractDetailed.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.domain;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.alibaba.fastjson.annotation.JSONField;
import com.shopping.core.domain.IdEntity;
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@Entity
@Table(name = "shopping_contract_detailed")
public class ContractDetailed extends IdEntity {
//名称
private String detailedName;
//状态
private String state;
//对应合同
@ManyToOne(targetEntity = Contract.class, fetch = FetchType.LAZY)
@JoinTable(name = "shopping_contract_detailed_relation", joinColumns = {
@javax.persistence.JoinColumn(name = "detailed_id") }, inverseJoinColumns = {
@javax.persistence.JoinColumn(name = "contract_id") })
private Contract contract;
public Contract getContract() {
return contract;
}
public void setContract(Contract contract) {
this.contract = contract;
}
public String getDetailedName() {
return detailedName;
}
public void setDetailedName(String detailedName) {
this.detailedName = detailedName;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}
src/com/shopping/foundation/domain/query/ContractDetailedQueryObject.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.domain.query;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.query.QueryObject;
public class ContractDetailedQueryObject extends QueryObject {
public ContractDetailedQueryObject(String currentPage, ModelAndView mv, String orderBy, String orderType) {
super(currentPage, mv, orderBy, orderType);
}
public ContractDetailedQueryObject() {
}
}
src/com/shopping/foundation/domain/query/ContractQueryObject.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.domain.query;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.query.QueryObject;
public class ContractQueryObject extends QueryObject {
public ContractQueryObject(String currentPage, ModelAndView mv, String orderBy, String orderType) {
super(currentPage, mv, orderBy, orderType);
}
public ContractQueryObject() {
}
}
src/com/shopping/foundation/service/IContractDetailedService.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.service;
import java.util.List;
import java.util.Map;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.Contract;
import com.shopping.foundation.domain.ContractDetailed;
import com.shopping.foundation.domain.Decorate;
public interface IContractDetailedService {
public abstract boolean save(ContractDetailed contractDetailed);
public abstract ContractDetailed getObjById(Long paramLong);
public abstract boolean delete(Long paramLong);
public abstract boolean update(ContractDetailed contractDetailed);
public abstract List<ContractDetailed> query(String paramString, Map paramMap, int paramInt1, int paramInt2);
public abstract IPageList list(IQueryObject paramIQueryObject);
}
src/com/shopping/foundation/service/IContractService.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.service;
import java.util.List;
import java.util.Map;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.Contract;
import com.shopping.foundation.domain.Decorate;
public interface IContractService {
public abstract boolean save(Contract contract);
public abstract Contract getObjById(Long paramLong);
public abstract boolean delete(Long paramLong);
public abstract boolean update(Contract contract);
public abstract List<Contract> query(String paramString, Map paramMap, int paramInt1, int paramInt2);
public abstract IPageList list(IQueryObject paramIQueryObject);
}
src/com/shopping/foundation/service/impl/ContractDetailedServiceImpl.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.service.impl;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.shopping.core.dao.IGenericDAO;
import com.shopping.core.query.GenericPageList;
import com.shopping.core.query.PageObject;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.Contract;
import com.shopping.foundation.domain.ContractDetailed;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.service.IContractDetailedService;
import com.shopping.foundation.service.IContractService;
import com.shopping.foundation.service.IDecorateService;
@Service
@Transactional
public class ContractDetailedServiceImpl implements IContractDetailedService {
@Resource(name = "contractDetailedDAO")
private IGenericDAO<ContractDetailed> contractDetailedDAO;
@Override
public boolean save(ContractDetailed contractDetailed) {
try {
this.contractDetailedDAO.save(contractDetailed);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public ContractDetailed getObjById(Long id) {
ContractDetailed contractDetailed = (ContractDetailed)this.contractDetailedDAO.get(id);
if (contractDetailed != null) {
return contractDetailed;
}
return null;
}
@Override
public boolean delete(Long id) {
try {
this.contractDetailedDAO.remove(id);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public boolean update(ContractDetailed contractDetailed) {
try {
this.contractDetailedDAO.update(contractDetailed);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public List<ContractDetailed> query(String query, Map params, int begin, int max) {
return this.contractDetailedDAO.query(query, params, begin, max);
}
@Override
public IPageList list(IQueryObject properties) {
if (properties == null) {
return null;
}
String query = properties.getQuery();
Map params = properties.getParameters();
GenericPageList pList = new GenericPageList(ContractDetailed.class, query, params, this.contractDetailedDAO);
if (properties != null) {
PageObject pageObj = properties.getPageObj();
if (pageObj != null)
pList.doList(pageObj.getCurrentPage() == null ? 0 : pageObj.getCurrentPage().intValue(), pageObj.getPageSize() == null ? 0 : pageObj.getPageSize().intValue());
} else {
pList.doList(0, -1);
}
return pList;
}
}
src/com/shopping/foundation/service/impl/ContractServiceImpl.java 0 → 100644
View file @ ddccebdd
package com.shopping.foundation.service.impl;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.shopping.core.dao.IGenericDAO;
import com.shopping.core.query.GenericPageList;
import com.shopping.core.query.PageObject;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.Contract;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.service.IContractService;
import com.shopping.foundation.service.IDecorateService;
@Service
@Transactional
public class ContractServiceImpl implements IContractService {
@Resource(name = "contractDAO")
private IGenericDAO<Contract> contractDAO;
@Override
public boolean save(Contract contract) {
try {
this.contractDAO.save(contract);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public Contract getObjById(Long id) {
Contract contract = (Contract)this.contractDAO.get(id);
if (contract != null) {
return contract;
}
return null;
}
@Override
public boolean delete(Long id) {
try {
this.contractDAO.remove(id);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public boolean update(Contract contract) {
try {
this.contractDAO.update(contract);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
@Override
public List<Contract> query(String query, Map params, int begin, int max) {
return this.contractDAO.query(query, params, begin, max);
}
@Override
public IPageList list(IQueryObject properties) {
if (properties == null) {
return null;
}
String query = properties.getQuery();
Map params = properties.getParameters();
GenericPageList pList = new GenericPageList(Contract.class, query, params, this.contractDAO);
if (properties != null) {
PageObject pageObj = properties.getPageObj();
if (pageObj != null)
pList.doList(pageObj.getCurrentPage() == null ? 0 : pageObj.getCurrentPage().intValue(), pageObj.getPageSize() == null ? 0 : pageObj.getPageSize().intValue());
} else {
pList.doList(0, -1);
}
return pList;
}
}
src/com/shopping/manage/admin/action/BaseManageAction.java
View file @ ddccebdd
...@@ -226,7 +226,7 @@ public class BaseManageAction { ...@@ -226,7 +226,7 @@ public class BaseManageAction {
Properties props = System.getProperties(); Properties props = System.getProperties();
mv.addObject("os", props.getProperty("os.name")); mv.addObject("os", props.getProperty("os.name"));
mv.addObject("java_version", props.getProperty("java.version")); mv.addObject("java_version", props.getProperty("java.version"));
mv.addObject("shop_version", Integer.valueOf(20190608)); mv.addObject("shop_version", Integer.valueOf(20190620));
mv.addObject("database_version", this.databaseTools.queryDatabaseVersion()); mv.addObject("database_version", this.databaseTools.queryDatabaseVersion());
mv.addObject("web_server_version", request.getSession(false).getServletContext().getServerInfo()); mv.addObject("web_server_version", request.getSession(false).getServletContext().getServerInfo());
List stats = this.storeStatService.query("select obj from StoreStat obj", null, -1, -1); List stats = this.storeStatService.query("select obj from StoreStat obj", null, -1, -1);
......
src/com/shopping/manage/admin/action/ContractManageAction.java 0 → 100644
View file @ ddccebdd
package com.shopping.manage.admin.action;
import java.util.List;
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.domain.virtual.SysMap;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Bespoke;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.domain.DecorateStyle;
import com.shopping.foundation.domain.DecorateType;
import com.shopping.foundation.domain.DecorateWork;
import com.shopping.foundation.domain.Design;
import com.shopping.foundation.domain.DesignExpert;
import com.shopping.foundation.domain.DesignFees;
import com.shopping.foundation.domain.query.ActivityQueryObject;
import com.shopping.foundation.domain.query.ContractQueryObject;
import com.shopping.foundation.domain.query.DecorateQueryObject;
import com.shopping.foundation.domain.query.DecorateWorkQueryObject;
import com.shopping.foundation.domain.query.DesignQueryObject;
import com.shopping.foundation.domain.query.WorksQueryObject;
import com.shopping.foundation.service.IAreaService;
import com.shopping.foundation.service.IContractService;
import com.shopping.foundation.service.IDecorateService;
import com.shopping.foundation.service.IDecorateStyleService;
import com.shopping.foundation.service.IDecorateTypeService;
import com.shopping.foundation.service.IDecorateWork;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
@Controller
public class ContractManageAction {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
@Autowired
private IContractService contractService;
@SecurityMapping(display = false, rsequence = 0, title = "装修订单", value = "/admin/contract_list.htm*", rtype = "admin", rname = "装修订单", rcode = "activity_admin", rgroup = "运营")
@RequestMapping({ "/admin/contract_list.htm" })
public ModelAndView design_index(HttpServletRequest request, HttpServletResponse response, String name, String currentPage,String orderBy, String orderType) {
ModelAndView mv = new JModelAndView("admin/blue/contract_list.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 0, request, response);
ContractQueryObject qo = new ContractQueryObject(currentPage, mv, orderBy, orderType);
if (!CommUtil.null2String(name).equals("")) {
qo.addQuery("obj.contractName", new SysMap("contractName", "%" + name.trim() + "%"), "like");
}
IPageList pList = this.contractService.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
mv.addObject("name", name);
return mv;
}
@SecurityMapping(display = false, rsequence = 0, title = "处理管理", value = "/admin/handle_bespoke.htm*", rtype = "admin", rname = "活动管理", rcode = "activity_admin", rgroup = "运营")
@RequestMapping({ "/admin/contract_detailed.htm" })
public void handle_bespoke(HttpServletRequest request, HttpServletResponse response, String id) {
}
}
src/com/shopping/manage/buyer/action/ContractBuyerAction.java 0 → 100644
View file @ ddccebdd
This diff is collapsed.
src/com/shopping/view/web/action/ContractDetailedViewAction.java 0 → 100644
View file @ ddccebdd
package com.shopping.view.web.action;
import java.util.List;
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.domain.virtual.SysMap;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.domain.DecorateStyle;
import com.shopping.foundation.domain.DecorateType;
import com.shopping.foundation.domain.DecorateWork;
import com.shopping.foundation.domain.Design;
import com.shopping.foundation.domain.DesignExpert;
import com.shopping.foundation.domain.DesignFees;
import com.shopping.foundation.domain.query.DecorateQueryObject;
import com.shopping.foundation.domain.query.DecorateWorkQueryObject;
import com.shopping.foundation.domain.query.DesignQueryObject;
import com.shopping.foundation.domain.query.WorksQueryObject;
import com.shopping.foundation.service.IAreaService;
import com.shopping.foundation.service.IDecorateService;
import com.shopping.foundation.service.IDecorateStyleService;
import com.shopping.foundation.service.IDecorateTypeService;
import com.shopping.foundation.service.IDecorateWork;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
@Controller
public class ContractDetailedViewAction {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
}
src/com/shopping/view/web/action/ContractViewAction.java 0 → 100644
View file @ ddccebdd
package com.shopping.view.web.action;
import java.util.List;
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.domain.virtual.SysMap;
import com.shopping.core.mv.JModelAndView;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.domain.DecorateStyle;
import com.shopping.foundation.domain.DecorateType;
import com.shopping.foundation.domain.DecorateWork;
import com.shopping.foundation.domain.Design;
import com.shopping.foundation.domain.DesignExpert;
import com.shopping.foundation.domain.DesignFees;
import com.shopping.foundation.domain.query.DecorateQueryObject;
import com.shopping.foundation.domain.query.DecorateWorkQueryObject;
import com.shopping.foundation.domain.query.DesignQueryObject;
import com.shopping.foundation.domain.query.WorksQueryObject;
import com.shopping.foundation.service.IAreaService;
import com.shopping.foundation.service.IDecorateService;
import com.shopping.foundation.service.IDecorateStyleService;
import com.shopping.foundation.service.IDecorateTypeService;
import com.shopping.foundation.service.IDecorateWork;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
@Controller
public class ContractViewAction {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
}
src/com/shopping/view/web/action/DecorateViewAction.java
View file @ ddccebdd
...@@ -13,6 +13,7 @@ import org.springframework.web.servlet.ModelAndView; ...@@ -13,6 +13,7 @@ import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.domain.virtual.SysMap; import com.shopping.core.domain.virtual.SysMap;
import com.shopping.core.mv.JModelAndView; import com.shopping.core.mv.JModelAndView;
import com.shopping.core.query.support.IPageList; import com.shopping.core.query.support.IPageList;
import com.shopping.core.security.support.SecurityUserHolder;
import com.shopping.core.tools.CommUtil; import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.Area; import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Decorate; import com.shopping.foundation.domain.Decorate;
...@@ -22,6 +23,7 @@ import com.shopping.foundation.domain.DecorateWork; ...@@ -22,6 +23,7 @@ import com.shopping.foundation.domain.DecorateWork;
import com.shopping.foundation.domain.Design; import com.shopping.foundation.domain.Design;
import com.shopping.foundation.domain.DesignExpert; import com.shopping.foundation.domain.DesignExpert;
import com.shopping.foundation.domain.DesignFees; import com.shopping.foundation.domain.DesignFees;
import com.shopping.foundation.domain.User;
import com.shopping.foundation.domain.query.DecorateQueryObject; import com.shopping.foundation.domain.query.DecorateQueryObject;
import com.shopping.foundation.domain.query.DecorateWorkQueryObject; import com.shopping.foundation.domain.query.DecorateWorkQueryObject;
import com.shopping.foundation.domain.query.DesignQueryObject; import com.shopping.foundation.domain.query.DesignQueryObject;
...@@ -90,6 +92,14 @@ public class DecorateViewAction { ...@@ -90,6 +92,14 @@ public class DecorateViewAction {
IPageList pList = this.decorateService.list(qo); IPageList pList = this.decorateService.list(qo);
CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv); CommUtil.saveIPageList2ModelAndView("", "", "", pList, mv);
User user = SecurityUserHolder.getCurrentUser();
if(user == null){
mv.addObject("flag", false);
}else{
mv.addObject("flag", true);
}
return mv; return mv;
} }
...@@ -119,6 +129,24 @@ public class DecorateViewAction { ...@@ -119,6 +129,24 @@ public class DecorateViewAction {
IPageList pList = this.decorateWork.list(qo); IPageList pList = this.decorateWork.list(qo);
String params = "&decorateId=" + decorateId; String params = "&decorateId=" + decorateId;
CommUtil.saveIPageList2ModelAndView("", "", params, pList, mv); CommUtil.saveIPageList2ModelAndView("", "", params, pList, mv);
User user = SecurityUserHolder.getCurrentUser();
if(user == null){
mv.addObject("flag", false);
}else{
mv.addObject("flag", true);
}
return mv;
}
@RequestMapping({ "/zs_work_detaile.htm" })
public ModelAndView zs_work_detaile(HttpServletRequest request, HttpServletResponse response, String workId) {
ModelAndView mv = new JModelAndView("zs_work_detail.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
//获取装修公司信息
DecorateWork decorateWork = this.decorateWork.getObjById(Long.parseLong(workId));
mv.addObject("objs", decorateWork);
return mv; return mv;
} }
} }
src/com/shopping/view/web/action/DesignerViewAction.java
View file @ ddccebdd
...@@ -35,6 +35,7 @@ import com.shopping.core.tools.CommUtil; ...@@ -35,6 +35,7 @@ import com.shopping.core.tools.CommUtil;
import com.shopping.foundation.domain.Accessory; import com.shopping.foundation.domain.Accessory;
import com.shopping.foundation.domain.Album; import com.shopping.foundation.domain.Album;
import com.shopping.foundation.domain.Area; import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.DecorateWork;
import com.shopping.foundation.domain.Design; import com.shopping.foundation.domain.Design;
import com.shopping.foundation.domain.DesignExpert; import com.shopping.foundation.domain.DesignExpert;
import com.shopping.foundation.domain.DesignFees; import com.shopping.foundation.domain.DesignFees;
...@@ -135,4 +136,13 @@ public class DesignerViewAction { ...@@ -135,4 +136,13 @@ public class DesignerViewAction {
return mv; return mv;
} }
@RequestMapping({ "/zs_designwork_detaile.htm" })
public ModelAndView zs_work_detaile(HttpServletRequest request, HttpServletResponse response, String workId) {
ModelAndView mv = new JModelAndView("zs_work_detail.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
//获取装修公司信息
Works designWorks = this.worksService.getObjById(Long.parseLong(workId));
mv.addObject("objs", designWorks);
return mv;
}
} }
src/com/shopping/view/web/action/LoginViewAction.java
View file @ ddccebdd
...@@ -42,6 +42,9 @@ import com.shopping.core.tools.CommUtil; ...@@ -42,6 +42,9 @@ import com.shopping.core.tools.CommUtil;
import com.shopping.core.tools.Md5Encrypt; import com.shopping.core.tools.Md5Encrypt;
import com.shopping.foundation.domain.Album; import com.shopping.foundation.domain.Album;
import com.shopping.foundation.domain.Area; import com.shopping.foundation.domain.Area;
import com.shopping.foundation.domain.Contract;
import com.shopping.foundation.domain.ContractDetailed;
import com.shopping.foundation.domain.Decorate;
import com.shopping.foundation.domain.Goods; import com.shopping.foundation.domain.Goods;
import com.shopping.foundation.domain.GoodsCart; import com.shopping.foundation.domain.GoodsCart;
import com.shopping.foundation.domain.GoodsSpecProperty; import com.shopping.foundation.domain.GoodsSpecProperty;
...@@ -58,6 +61,9 @@ import com.shopping.foundation.domain.ZshLayout; ...@@ -58,6 +61,9 @@ import com.shopping.foundation.domain.ZshLayout;
import com.shopping.foundation.domain.ZshOrder; import com.shopping.foundation.domain.ZshOrder;
import com.shopping.foundation.service.IAlbumService; import com.shopping.foundation.service.IAlbumService;
import com.shopping.foundation.service.IAreaService; import com.shopping.foundation.service.IAreaService;
import com.shopping.foundation.service.IContractDetailedService;
import com.shopping.foundation.service.IContractService;
import com.shopping.foundation.service.IDecorateService;
import com.shopping.foundation.service.IGoodsService; import com.shopping.foundation.service.IGoodsService;
import com.shopping.foundation.service.IGroupGoodsService; import com.shopping.foundation.service.IGroupGoodsService;
import com.shopping.foundation.service.IIntegralLogService; import com.shopping.foundation.service.IIntegralLogService;
...@@ -150,6 +156,15 @@ public class LoginViewAction { ...@@ -150,6 +156,15 @@ public class LoginViewAction {
@Autowired @Autowired
private IAreaService areaService; private IAreaService areaService;
@Autowired
private IDecorateService decorateService;
@Autowired
private IContractService contractService;
@Autowired
private IContractDetailedService contractDetailedService;
/** /**
* 用户登录跳转页面 * 用户登录跳转页面
...@@ -160,7 +175,7 @@ public class LoginViewAction { ...@@ -160,7 +175,7 @@ public class LoginViewAction {
* @return * @return
*/ */
@RequestMapping({ "/user/login.htm" }) @RequestMapping({ "/user/login.htm" })
public ModelAndView login(HttpServletRequest request, HttpServletResponse response, String url) { public ModelAndView login(HttpServletRequest request, HttpServletResponse response, String url) {
ModelAndView mv = new JModelAndView("login.html", this.configService.getSysConfig(), ModelAndView mv = new JModelAndView("login.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response); this.userConfigService.getUserConfig(), 1, request, response);
...@@ -278,6 +293,110 @@ public class LoginViewAction { ...@@ -278,6 +293,110 @@ public class LoginViewAction {
} }
} }
/**
* 推荐人查询
*
* @param request
* @param response
* @return
*/
@RequestMapping({ "/getCityUserList.htm" })
public void getCityUserList(HttpServletRequest request, HttpServletResponse response, String name) {
Map map = new HashMap();
// 获取所有用户账号列表
Map<String, Object> params = new HashMap<String, Object>();
if (name != null && !(("").equals(name))) {
name = "%" + name + "%";
} else {
name = "%%";
}
params.put("name", name);
params.put("cityPartner", 1);
List<User> list = this.userService.query(
"select obj from User obj where (obj.userName like :name or obj.mobile like :name) and obj.cityPartner = :cityPartner", params, -1, -1);
response.setContentType("text/plain");
response.setContentType("application/json");
response.setHeader("Cache-Control", "no-cache");
response.setCharacterEncoding("UTF-8");
JSONArray jsArray = new JSONArray();
for (User user : list) {
JSONObject jsObj = new JSONObject();
jsObj.put("id", user.getId());
jsObj.put("mobile", user.getMobile());
jsObj.put("trueName", user.getUserName() == null ? "" : user.getUserName());
jsObj.put("refereeId", user.getRefereeUser() == null ? 0 : user.getRefereeUser().getId());
jsArray.add(jsObj);
}
try {
PrintWriter writer = response.getWriter();
writer.print(jsArray.toString());
} catch (IOException e) {
e.printStackTrace();
}
}
/**
* 装修公司列表
*
* @param request
* @param response
* @return
*/
@RequestMapping({ "/getDecorateList.htm" })
public void getDecorateList(HttpServletRequest request, HttpServletResponse response, String name) {
Map map = new HashMap();
// 获取所有用户账号列表
Map<String, Object> params = new HashMap<String, Object>();
if (name != null && !(("").equals(name))) {
name = "%" + name + "%";
} else {
name = "%%";
}
params.put("name", name);
List<Decorate> list = this.decorateService.query(
"select obj from Decorate obj where obj.decorationName like :name ", params, -1, -1);
/*
* map.put("objs", list.toString()); System.out.println(list.toString());
*/
response.setContentType("text/plain");
/* map.put("objs", list); */
response.setContentType("application/json");
response.setHeader("Cache-Control", "no-cache");
response.setCharacterEncoding("UTF-8");
JSONArray jsArray = new JSONArray();
for (Decorate decorate : list) {
JSONObject jsObj = new JSONObject();
jsObj.put("id", decorate.getId());
jsObj.put("decorationName", decorate.getDecorationName());
jsObj.put("decorationArea", decorate.getDecorationArea());
jsArray.add(jsObj);
}
try {
PrintWriter writer = response.getWriter();
// writer.print(Json.toJson(map, JsonFormat.compact()));
// writer.print(list);
//
// writer.print(Json.toJson(map, JsonFormat.full()));
writer.print(jsArray.toString());
} catch (IOException e) {
e.printStackTrace();
}
}
/** /**
* 注册保存 * 注册保存
* *
...@@ -895,6 +1014,76 @@ public class LoginViewAction { ...@@ -895,6 +1014,76 @@ public class LoginViewAction {
} }
Map<String, Object> smsMap = SendTemplateSMS.sendTemplateSMSPay(user.getMobile(), "企业"); Map<String, Object> smsMap = SendTemplateSMS.sendTemplateSMSPay(user.getMobile(), "企业");
}else if (zshOrder.getType().equals("contract")) {
User user = zshOrder.getUser();
PredepositLog log = new PredepositLog();
log.setAddTime(new Date());
log.setPd_log_amount(zshOrder.getTotalPrice());
log.setPd_log_info("用户支付装修费用");
log.setPd_log_user(user);
log.setPd_op_type("用户支付装修费用");
log.setPd_type("在线支付");
this.predepositlogService.save(log);
String contractId = zshOrder.getOrderId();
Contract contract = this.contractService.getObjById(Long.parseLong(contractId));
//首次付款或者全额付款的时候计算佣金
if("0".equals(contract.getPayState())) {
//给装修公司打首款
User decorateUser = contract.getDecorate().getUser();
Double pay = (contract.getContractAmount() - (contract.getContractAmount()*contract.getCommission()/100))*0.2;
decorateUser.setAvailableBalance(decorateUser.getAvailableBalance().add(new BigDecimal(pay.toString())));
PredepositLog logPay = new PredepositLog();
logPay.setAddTime(new Date());
logPay.setPd_log_amount(zshOrder.getTotalPrice());
logPay.setPd_log_info("装修公司首款");
logPay.setPd_log_user(decorateUser);
logPay.setPd_op_type("装修公司首款");
logPay.setPd_type("在线支付");
this.predepositlogService.save(logPay);
contract.setState("4");
contract.setPayState("1");
this.contractService.update(contract);
//保存合同明细
ContractDetailed contractDetailed = new ContractDetailed();
contractDetailed.setAddTime(new Date());
contractDetailed.setState("4");
contractDetailed.setContract(contract);
contractDetailed.setDetailedName("支付成功，开始第一起装修。");
this.contractDetailedService.save(contractDetailed);
}else {
//第二次付款
if("6".equals(contract.getState())) {
contract.setState("7");
this.contractService.update(contract);
//保存合同明细
ContractDetailed contractDetailed = new ContractDetailed();
contractDetailed.setAddTime(new Date());
contractDetailed.setState("7");
contractDetailed.setContract(contract);
contractDetailed.setDetailedName("第二期已付款，开始第二期装修。");
this.contractDetailedService.save(contractDetailed);
}else if("9".equals(contract.getState())) {
contract.setState("10");
this.contractService.update(contract);
//保存合同明细
ContractDetailed contractDetailed = new ContractDetailed();
contractDetailed.setAddTime(new Date());
contractDetailed.setState("10");
contractDetailed.setContract(contract);
contractDetailed.setDetailedName("尾款已付，开始第三期装修。");
this.contractDetailedService.save(contractDetailed);
}
}
//Map<String, Object> smsMap = SendTemplateSMS.sendTemplateSMSPay(user.getMobile(), "企业");
} }
//response.getWriter().write(WxPayService.setXml("SUCCESS", "OK")); //response.getWriter().write(WxPayService.setXml("SUCCESS", "OK"));
......
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