Skip to content

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

保障服务

parent 3900bf6a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 889 additions and 231 deletions
WebRoot/WEB-INF/templates/zh_cn/shop/area_list.html
View file @ 36390029
......@@ -18,6 +18,42 @@
position:fixed;
bottom:0;
}
.item{
display:flex;
padding: 10px;
border: 1px solid #eee;
}
.iitem{
display:flex;
flex-direction: column;
padding: 10px;
border: 1px solid #eee;
}
.province-item{
min-width: 100px;
padding: 10px;
border-bottom: 1px solid #eee;
display: flex;
align-items: center;
}
.province-item-i:nth-child(2n+1){
border-bottom: none;
background: #eee;
}
.jcc{
border-bottom: none;
justify-content: center;
}
.cc-item{
padding: 10px;
}
.c-item{
padding:10px;
min-width: 90px;
}
</style>
<script>
jQuery(document).ready(function(){
......@@ -50,17 +86,52 @@ jQuery(document).ready(function(){
</div>
</div>
<div>
#foreach($obj in $area)
#foreach($obj in $area)
<div class="item">
<div class="province-item jcc">$obj.areaName</div>
<div class="iitem">
#foreach($objc in $obj.childs)
<div class="province-item province-item-i" style="display:flex;">
<div class="c-item">$objc.areaName：</div>
<div style="display:flex;flex-wrap: wrap;">
#foreach($objcc in $objc.childs)
<div class="cc-item"><a href="$!webPath/index.htm?id=$objcc.id">$objcc.areaName</a></div>
#end
</div>
</div>
<!-- <div style="display:flex;flex-wrap: wrap;" >
#foreach($objcc in $objc.childs)
<div class="province-item">$objcc.areaName</div>
#end
</div> -->
#end
</div>
</div>
#end
<!-- #foreach($obj in $area)
<div class="content-province">
<div class="content-province-title">$obj.areaName</div>
<div class="content-cities">
#foreach($objc in $obj.childs)
<span class="cityName"><a href="$!webPath/index.htm?id=$objc.id">$objc.areaName</a></span>
<div class="content-province-title">
<span>$objc.areaName</span>
<div class="content-cities">
#foreach($objcc in $objc.childs)
<span class="cityName"><a href="$!webPath/index.htm?id=$objc.id">$objcc.areaName</a></span>
#end
</div>
</div>
#end
</div>
</div>
#end
#end -->
</div>
<!-- #foreach($objcc in $objc.childs)
<span class="cityName"><a href="$!webPath/index.htm?id=$objc.id">$objcc.areaName</a></span>
#end -->
$!uc_logout_js
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/index.html
View file @ 36390029
......@@ -992,7 +992,7 @@ $!httpInclude.include("/nav.htm")
<div class="dialog_conten2">
<p class="diaglog_title">企业合伙人</p>
<p>共享资源，共享利润</p>
<p class="diaglog_money">￥9999</p>
<p class="diaglog_money">￥12800</p>
<p><!-- 专注提高签单效率，提高整体营业额 --></p>
<div class="content_ul">
<ul>
......@@ -1017,7 +1017,7 @@ $!httpInclude.include("/nav.htm")
</div>
<div class="ercode-right2">
<p class="ercode-numb">企业合伙人</p>
<p class="ercode-money">￥9999</p>
<p class="ercode-money">￥12800</p>
<p class="hadpay-btn2"><span class="had_pay2">已支付</span></p>
</div>
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/register.html
View file @ 36390029
......@@ -37,7 +37,7 @@ jQuery(document).ready(function(){
});
//
jQuery.validator.addMethod("verify",function(value,element){
jQuery.validator.addMethod("verify",function(value,element){debugger
var re = /^[0-9a-zA-Z]*$/;
if(re.test(jQuery("#userName").val())){
return true;
......@@ -46,6 +46,18 @@ jQuery(document).ready(function(){
return false;
}
});
/*
* 手机号验证
*/
jQuery.validator.addMethod("account",function(value,element){
var re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/;
if(re.test(value)){
return true;
}
else {
return false;
}
});
var registered_validate = $("#theForm").validate({
errorPlacement:function(error, element) {
......@@ -54,71 +66,71 @@ jQuery(document).ready(function(){
},
rules:{
userName:{
required: true,
account:true,
remote:{
url: "$!webPath/getPhoneCode.htm", //后台处理程序
type: "post", //数据发送方式
dataType: "json", //接受数据格式
data: { //要传递的数据
"userName": function(){return $("#phone").val();}
}
}
},
mobileCode:{
required: true,
},
refereeId:{
required:true,
},
password:{
required:true,
minlength:6,
maxlength:20
},
repassword:{
required:true,
equalTo:"#password"
},
trueName:{
required:true,
},
area_id:{
required:true,
},
/* email:{
required:true,
email:true,
remote:{
url: "$!webPath/verify_email.htm", //后台处理程序
type: "post", //数据发送方式
dataType: "json", //接受数据格式
data: { //要传递的数据
"email": function(){return $("#email").val();}
}
}
}, */
agree:{
required:true
}
#if($!config.securityCodeRegister),
code:{
required:true,
remote:{
url: "$!webPath/verify_code.htm", //后台处理程序
type: "post", //数据发送方式
dataType: "json", //接受数据格式
data: { //要传递的数据
"code": function(){return $("#code").val();}
}
}
}
#end
required: true,
account: true,
/* remote:{
url: "$!webPath/getPhoneCode.htm", //后台处理程序
type: "post", //数据发送方式
dataType: "json", //接受数据格式
data: { //要传递的数据
"userName": function(){return $("#phone").val();}
}
}*/
},
mobileCode:{
required: true,
},
refereeId:{
required:true,
},
password:{
required:true,
minlength:6,
maxlength:20
},
repassword:{
required:true,
equalTo:"#password"
},
trueName:{
required:true,
},
area_id:{
required:true,
},
/* email:{
required:true,
email:true,
remote:{
url: "$!webPath/verify_email.htm", //后台处理程序
type: "post", //数据发送方式
dataType: "json", //接受数据格式
data: { //要传递的数据
"email": function(){return $("#email").val();}
}
}
}, */
agree:{
required:true
}
#if($!config.securityCodeRegister),
code:{
required:true,
remote:{
url: "$!webPath/verify_code.htm", //后台处理程序
type: "post", //数据发送方式
dataType: "json", //接受数据格式
data: { //要传递的数据
"code": function(){return $("#code").val();}
}
}
}
#end
},
messages:{
userName:{
required:"手机号码不能为空",
verify:"请输入正确的手机",
account:"请输入正确的手机号码",
remote:"手机存在"
},
......
WebRoot/WEB-INF/templates/zh_cn/shop/top.html
View file @ 36390029
......@@ -15,6 +15,7 @@
<a href="$!webPath/buyer/order.htm?order_status=order_submit" rel="nofollow">待支付</a>
<a href="$!webPath/buyer/order.htm?order_status=order_shipping" rel="nofollow">待收货</a>
<a href="$!webPath/buyer/order.htm?order_status=order_receive" rel="nofollow">待评价</a>
<a href="$!webPath/buyer/contract_list.htm" rel="nofollow">装修订单</a>
</div>
</div>
</div>
......
WebRoot/WEB-INF/templates/zh_cn/shop/zs_assurance_service.html 0 → 100644
View file @ 36390029
<!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>
<script src="$!webPath/resources/js/jquery.SuperSlide.2.1.1.js"></script>
<script src="$!webPath/resources/js/jquery.shop.common.js"></script>
<script src="$!webPath/resources/js/jquery.lazyload.js"></script>
<script>
</script>
<style>
</style>
</head>
<body>
$!httpInclude.include("/top.htm")
$!httpInclude.include("/head.htm")
$!httpInclude.include("/nav1.htm")
<div class="main">
<div class="index">
<span>保障服务</span>
</div>
</div>
$!httpInclude.include("/footer.htm")
</body>
</html>
WebRoot/WEB-INF/templates/zh_cn/system/admin/blue/cityPartner_list.html
View file @ 36390029
......@@ -116,7 +116,7 @@ jQuery(document).ready(function(){
<!-- <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 width="15%" align="center">推广会员数量</td>
<td align="center" >操作</td>
</tr>
......@@ -149,7 +149,7 @@ jQuery(document).ready(function(){
</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.referee.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>
......
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/contract_detailed.html
View file @ 36390029
......@@ -186,13 +186,23 @@ $!httpInclude.include("/top.htm")
<!-- 确认之后客户支付 -->
#if($!user.id == $!objs.user.id && $!objs.state == 3)
<div class="btn">
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")>=0 and $!objs.state == 3)
<div>
<span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue yes">支付</a>
<!-- <a id="menberService" onclick="showPay($!objs.id)" class="blue yes">支付</a> -->
<a href="$!webPath/buyer/pay_Offline.htm?id=$!objs.id" class="blue yes">确认支付</a>
</span>
</div>
#end
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")<0 and $!objs.state == 3)
<p>鉴于到您的装修订单数额超过微信支付限额设置,需要使用线下银行转账方式。转账成功后，工作人员会12小时内确认该装修款项，以确保装修订单的及时进行！</p>
<p>公司名称：中科智尚荟（广东）智能科技有限公司</p>
<p>开户银行名称：建设银行东莞松山湖支行</p>
<p>开户账号：44050177005300000952</p>
<p>平台工作人员身份核对：0769-82337368</p>
#end
<!--支付完成开始装修，有完成装修按钮 -->
#if($!user.id == $!objs.decorate.user.id && $!objs.state == 4)
......@@ -213,12 +223,27 @@ $!httpInclude.include("/top.htm")
#end
<!-- 分期付款开始第二期支付 -->
#if($!user.id == $!objs.user.id && $!objs.state == 6)
<!-- #if($!user.id == $!objs.user.id && $!objs.state == 6)
<div>
<span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue yes" style="border-radius:5px;padding：6px;">支付</a>
</span>
</div>
#end -->
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")>=0 and $!objs.state == 6)
<div>
<span class="allmen size7">
<!-- <a id="menberService" onclick="showPay($!objs.id)" class="blue yes">支付</a> -->
<a href="$!webPath/buyer/pay_Offline.htm?id=$!objs.id" class="blue yes">确认支付</a>
</span>
</div>
#end
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")<0 and $!objs.state == 6)
<p>鉴于到您的装修订单数额超过微信支付限额设置,需要使用线下银行转账方式。转账成功后，工作人员会12小时内确认该装修款项，以确保装修订单的及时进行！</p>
<p>公司名称：中科智尚荟（广东）智能科技有限公司</p>
<p>开户银行名称：建设银行东莞松山湖支行</p>
<p>开户账号：44050177005300000952</p>
<p>平台工作人员身份核对：0769-82337368</p>
#end
<!--第二期装修中 -->
......@@ -240,12 +265,27 @@ $!httpInclude.include("/top.htm")
#end
<!-- 分期付款，第三起支付 -->
#if($!user.id == $!objs.user.id && $!objs.state == 9)
<!-- #if($!user.id == $!objs.user.id && $!objs.state == 9)
<div>
<span class="allmen size7">
<a id="menberService" onclick="showPay($!objs.id)" class="blue yes" style="border-radius:5px;padding：6px;">支付</a>
</span>
</div>
#end -->
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")>=0 and $!objs.state == 9)
<div>
<span class="allmen size7">
<!-- <a id="menberService" onclick="showPay($!objs.id)" class="blue yes">支付</a> -->
<a href="$!webPath/buyer/pay_Offline.htm?id=$!objs.id" class="blue yes">确认支付</a>
</span>
</div>
#end
#if($!CommUtil.indexOf("$!user.userRole","ADMIN")<0 and $!objs.state == 9)
<p>鉴于到您的装修订单数额超过微信支付限额设置,需要使用线下银行转账方式。转账成功后，工作人员会12小时内确认该装修款项，以确保装修订单的及时进行！</p>
<p>公司名称：中科智尚荟（广东）智能科技有限公司</p>
<p>开户银行名称：建设银行东莞松山湖支行</p>
<p>开户账号：44050177005300000952</p>
<p>平台工作人员身份核对：0769-82337368</p>
#end
<!-- 第三期装修中 -->
......
src/com/shopping/foundation/dao/AssuranceServiceDAO.java 0 → 100644
View file @ 36390029
package com.shopping.foundation.dao;
import com.shopping.core.base.GenericDAO;
import com.shopping.foundation.domain.Accessory;
import com.shopping.foundation.domain.AssuranceService;
import org.springframework.stereotype.Repository;
@Repository("assuranceServiceDAO")
public class AssuranceServiceDAO extends GenericDAO<AssuranceService> {
}
src/com/shopping/foundation/domain/AssuranceService.java 0 → 100644
View file @ 36390029
package com.shopping.foundation.domain;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.shopping.core.domain.IdEntity;
/**
* 地址
*
* @author shopping
*
*/
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@Entity
@Table(name = "shopping_assurance_service")
public class AssuranceService extends IdEntity {
/**
* UID
*/
private static final long serialVersionUID = -754369306890462179L;
private String address;
private String name;
private String type;
private String content;
private String phone;
// 所属人
@OneToOne(fetch = FetchType.LAZY)
private User user;
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
}
src/com/shopping/foundation/domain/query/AssuranceServiceQueryObject.java 0 → 100644
View file @ 36390029
package com.shopping.foundation.domain.query;
import org.springframework.web.servlet.ModelAndView;
import com.shopping.core.query.QueryObject;
public class AssuranceServiceQueryObject extends QueryObject {
public AssuranceServiceQueryObject(String currentPage, ModelAndView mv, String orderBy, String orderType) {
super(currentPage, mv, orderBy, orderType);
}
public AssuranceServiceQueryObject() {
}
}
src/com/shopping/foundation/service/IAssuranceService.java 0 → 100644
View file @ 36390029
package com.shopping.foundation.service;
import com.shopping.core.query.support.IPageList;
import com.shopping.core.query.support.IQueryObject;
import com.shopping.foundation.domain.Accessory;
import com.shopping.foundation.domain.AssuranceService;
import com.shopping.foundation.service.impl.AccessoryService;
import java.util.List;
import java.util.Map;
public abstract interface IAssuranceService {
public abstract boolean save(AssuranceService assuranceService);
public abstract boolean delete(Long paramLong);
public abstract boolean update(AssuranceService assuranceService);
public abstract IPageList list(IQueryObject paramIQueryObject);
public abstract AssuranceService getObjById(Long paramLong);
public abstract AssuranceService getObjByProperty(String paramString1, String paramString2);
public abstract List<AssuranceService> query(String paramString, Map paramMap, int paramInt1, int paramInt2);
}
src/com/shopping/foundation/service/impl/AssuranceServiceService.java 0 → 100644
View file @ 36390029
package com.shopping.foundation.service.impl;
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.AssuranceService;
import com.shopping.foundation.service.IAssuranceService;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@Transactional
public class AssuranceServiceService implements IAssuranceService {
@Resource(name = "assuranceServiceDAO")
private IGenericDAO<AssuranceService> assuranceServiceDAO;
public boolean delete(Long id) {
try {
this.assuranceServiceDAO.remove(id);
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
public AssuranceService getObjById(Long id) {
return (AssuranceService) this.assuranceServiceDAO.get(id);
}
public boolean save(AssuranceService assuranceService) {
try {
this.assuranceServiceDAO.save(assuranceService);
return true;
} catch (Exception e) {
}
return false;
}
public boolean update(AssuranceService assuranceService) {
try {
this.assuranceServiceDAO.update(assuranceService);
return true;
} catch (Exception e) {
}
return false;
}
public List<AssuranceService> query(String query, Map params, int begin, int max) {
return this.assuranceServiceDAO.query(query, params, begin, max);
}
public IPageList list(IQueryObject properties) {
if (properties == null) {
return null;
}
String query = properties.getQuery();
Map params = properties.getParameters();
GenericPageList pList = new GenericPageList(AssuranceService.class, query, params, this.assuranceServiceDAO);
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;
}
public AssuranceService getObjByProperty(String propertyName, String value) {
return (AssuranceService) this.assuranceServiceDAO.getBy(propertyName, value);
}
}
src/com/shopping/view/web/action/AssuranceAction.java 0 → 100644
View file @ 36390029
package com.shopping.view.web.action;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.mv.JModelAndView;
import com.shopping.core.security.support.SecurityUserHolder;
import com.shopping.core.tools.WebForm;
import com.shopping.foundation.domain.AssuranceService;
import com.shopping.foundation.domain.Bespoke;
import com.shopping.foundation.domain.User;
import com.shopping.foundation.service.IAssuranceService;
import com.shopping.foundation.service.ISysConfigService;
import com.shopping.foundation.service.IUserConfigService;
@Controller
public class AssuranceAction {
@Autowired
private ISysConfigService configService;
@Autowired
private IUserConfigService userConfigService;
@Autowired
private IAssuranceService assuranceService;
/**
* 条状页面
* @param request
* @param response
* @param id
* @param currentPage
* @return
*/
@RequestMapping({ "/zs_assurance_service.htm" })
public ModelAndView activity(HttpServletRequest request, HttpServletResponse response) {
ModelAndView mv = new JModelAndView("zs_assurance_service.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 1, request, response);
return mv;
}
/**
* 保存预约
*
* @param request
* @param response
* @return
*/
@RequestMapping({ "/add_assurance_service.htm" })
public ModelAndView add_customization_bespoke(HttpServletRequest request, HttpServletResponse response, String address,
String name, String phone, String type,String content) {
ModelAndView mv = null;
User user = SecurityUserHolder.getCurrentUser();
if(user != null) {
AssuranceService assurance = new AssuranceService();
assurance.setAddress(address);
assurance.setAddTime(new Date());
assurance.setContent(content);
assurance.setName(name);
assurance.setPhone(phone);
assurance.setType(type);
assurance.setUser(user);
this.assuranceService.save(assurance);
mv.addObject("code", 200);
mv.addObject("message", "添加成功");
mv = new JModelAndView("zs_assurance_service.html", this.configService.getSysConfig(), this.userConfigService.getUserConfig(), 1, request, response);
}else {
mv.addObject("code", 201);
mv.addObject("message", "添加失败,请先登录用户");
mv = new JModelAndView("user/login.html", this.configService.getSysConfig(),
this.userConfigService.getUserConfig(), 1, request, response);
}
return mv;
}
}
src/com/shopping/view/web/action/LoginViewAction.java
View file @ 36390029
......@@ -1507,7 +1507,7 @@ public class LoginViewAction {
.query("select obj from ZshOrder obj where obj.state = false and obj.user.id = :userId and obj.type = :type", map, -1, -1);
JHPayUtil jHPayUtil = new JHPayUtil();
String erHtml = jHPayUtil.pay("9999.00", orderSn);
String erHtml = jHPayUtil.pay("12800.00", orderSn);
resultUn = JSON.parseObject(erHtml);
// 保存或修改订单
......@@ -1527,8 +1527,8 @@ public class LoginViewAction {
zshOrder.setPaySn(orderSn);
//zshOrder.setPrepay_id(resultUn.get("prepay_id").toString());
zshOrder.setState(false);
zshOrder.setTotalPrice(new BigDecimal(9999.00));
zshOrder.setUnitPrice(new BigDecimal(9999.00));
zshOrder.setTotalPrice(new BigDecimal(12800.00));
zshOrder.setUnitPrice(new BigDecimal(12800.00));
zshOrder.setUser_id(user);
zshOrder.setType("buyAsstQiye");
this.zshOrderService.save(zshOrder);
......
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