Jelajahi Sumber

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java
wangxiaoming 7 tahun lalu
induk
melakukan
af7e9a0256

+ 9 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -328,6 +328,15 @@ public class CustomerServiceImpl implements CustomerService {
 
         EfastOrder efastOrder = new EfastOrder();
         efastOrder.setOrderAddressName(customerCommon.getRelationSendName());//收货人姓名
+        efastOrder.setOrderAddressTel(customerCommon.getRelationSendTel());//收货人电话
+        efastOrder.setOrderOpenId("");//身份证
+
+        String[] address = customerCommon.getRelationSendMergeAddress().split("-");
+        efastOrder.setOrderProvince(address[0]);
+        efastOrder.setOrderCity(address[1]);
+        efastOrder.setOrderArea(address[2]);
+        efastOrder.setOrderAddress(customerCommon.getRelationSendAddress());
+//        efastOrder.set
 
 //        try {
 //            efastOrderService.sendOrderInfoToEfast(orderList,itemList);

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -1475,7 +1475,7 @@
                         if (data.resultCode == 200) {
                             location.href = "${path}/admin/customer/select_customer_list";
                         } else {
-                            layer.msg(data.resultMsg, {icon: 5, time: 3000});
+                            layer.close(index);
                         }
                         return ;
                     });

+ 154 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/request_message.html

@@ -0,0 +1,154 @@
+<!DOCTYPE HTML>
+<html>
+
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<#assign path="${request.contextPath}">
+		<link href="${path}/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/lib/mui/css/mui.min.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/lib/mui/css/mui.picker.min.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/lib/mui/css/mui.poppicker.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/css/input_order/input_order1.css" rel="stylesheet" type="text/css" />
+		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/new/css/iconfont.css?v=2017072401" />
+		<title>回复消息</title>
+		<style>
+			body{background-color: #fff;}
+			.mui-content{background-color: #fff;}
+			.my-content{margin:10px 0;padding:10px 5px; background-color: #f4f4f4;border-radius: 5px;}
+			.icon-wen{display: inline-block; width: 30px;height: 30px;line-height: 30px;text-align: center;background-color: #f74949;color: #fff;border-radius: 50%;margin-right: 5px;}
+			.icon-ji{display: inline-block; width: 30px;height: 30px;line-height: 30px;text-align: center;background-color: #30c9aa;color: #fff;border-radius: 50%;margin-right: 5px;}
+			.tit{color: #33a2d8;font-size: 14px;}
+			.ul-list{list-style: none;margin: 0;padding: 0;font-size: 12px;}
+			.ul-list>li{margin: 10px 0;line-height: 1.5;white-space: pre-wrap;word-break: break-all;}
+			.my-btn{color: #33a2d8;border: 1px solid #33a2d8;background-color: #fff;border-radius: 0;padding:6px 30px;margin: 0 10px;}
+			.my-btn:active{color: #fff;background-color: #33a2d8 !important;}
+		</style>
+	</head>
+<body>	
+<div class="mui-content">
+	<div class="mui-content-padded">
+		<strong>尊敬的客户,您好!</strong>
+		<div style="padding: 10px 0;">
+			感谢您的来访,关于您提出的问题:
+		</div>
+		<div class="my-content">
+			<div style="margin: 10px 0;">
+			<label class="tit"><div class="icon-wen">问</div><span id="questionName"></span></label>
+			</div>
+			<label class="tit"><div class="icon-ji">答</div></label>
+			<ul class="ul-list">
+				<!--<li>01.拧开背部排水口阀门螺母,拔掉硅胶塞,套上配备的出水硅胶管,放置接水容器</li>
+				<li>02.插上电源,开启设备背部电源开关,面板所有指示灯亮起</li>
+				<li>03.机器开始制水,制水时,显示屏风扇符号亮起</li>
+				<li>04.机器开始制水,制好的水直接通过出水口排出,水箱中剩余的水要倒掉,接一桶新的自来水</li>
+				<li>05.按以上步骤重复盛装3桶水,制水完成并排完后,取下硅胶管塞紧硅胶塞,拧紧排水口阀门螺母</li>-->
+			</ul>
+		</div>
+		<p>如因问题对您的生活造成影响,敬请谅解!我们会持续改进,为您提供更好的服务!</p>
+	</div>
+			<div style="padding:20px 0 35px 0;text-align: center;border-bottom: 1px solid #ccc;margin-bottom:10px;">
+			售后热线:<a href="tel:4008006692">400-800-6692</a>
+		</div>
+		<div style="text-align: center;">
+			<p>以上信息是否解决了您的问题?</p>
+		</div>
+		<div style="text-align: center;">
+			<button type="button" class="mui-btn my-btn no">未解决</button>
+			<button type="button" class="mui-btn my-btn yes">已解决</button>
+		</div>
+</div>	
+<script type="text/javascript" src="../lib/mui/js/mui.min.js"></script>
+<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
+<script>
+	var questionId=getQueryString("questionId");
+	//自己写的js
+	mui.ready(function() {
+		if(questionId!=null){
+		$.ajax('${path}/admin/complaintQuestion/get_question?dates=' + new Date().getTime(), {
+						data: {
+							"questionId":questionId
+						},
+						dataType: 'json',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						type: 'post',
+						timeout: 15000,
+						success: function(dt) {
+							console.log(dt);
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.returnCode == "200") {
+									$(".my-btn").attr("name",dt.complaintQuestionInfo.questionId);
+									$("#questionName").text(dt.complaintQuestionInfo.questionName);
+									$(".ul-list").html('<li>'+dt.complaintQuestionInfo.questionProfile+'</li>');
+								}else {
+									mui.alert("获取数据失败!")
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							console.log(xhr);
+							mui.alert("获取数据失败!请检查网络");
+						}
+		});
+		}
+	});
+	$(document).on('tap', '.my-btn', function() {
+		var th=$(this),parameter = {},questionid=th.attr("name");
+		if(typeof(questionid)!="undefined"){
+		parameter["questionId"] = questionid;
+		if(th.hasClass("yes")){
+			parameter["questionResolvedNum"] = 1;
+		}else{
+			parameter["questionNotSolvedNum"] = 1;
+		}
+		
+		$.ajax('${path}/admin/complaintQuestion/update_question_num?dates=' + new Date().getTime(), {
+						data:parameter,
+						dataType: 'json',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						type: 'post',
+						timeout: 15000,
+						success: function(dt) {
+							console.log(dt);
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.returnCode == "200") {
+									$('.my-btn').attr('disabled','disabled');
+									mui.alert("提交成功!",function(){
+										//do something
+									});
+								}else {
+									mui.alert("提交失败!")
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							console.log(xhr);
+							mui.alert("提交失败!请检查网络");
+						}
+				});
+			}else{
+				mui.alert("提交失败!")
+			}
+	});	
+	
+function getQueryString(name) { 
+var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); 
+var r = window.location.search.substr(1).match(reg); 
+if (r != null) return unescape(r[2]); return null; 
+} 
+</script>
+</body>
+
+</html>

+ 139 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/send_message.html

@@ -0,0 +1,139 @@
+<!DOCTYPE HTML>
+<html>
+
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<#assign path="${request.contextPath}">
+		<link href="${path}/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/lib/mui/css/mui.min.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/lib/mui/css/mui.picker.min.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/lib/mui/css/mui.poppicker.css" rel="stylesheet" type="text/css" />
+		<link href="${path}/common/css/input_order/input_order1.css" rel="stylesheet" type="text/css" />
+		<link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/new/css/iconfont.css?v=2017072401" />
+		<title>邮寄信息</title>
+		<style>
+			body{background-color: #fff;}
+			.mui-content{background-color: #fff;}
+			.my-content{margin:10px 0;padding:10px 5px; background-color: #f4f4f4;border-radius: 5px;}
+			.icon-ji{display: inline-block; width: 30px;height: 30px;line-height: 30px;text-align: center;background-color: #30c9aa;color: #fff;border-radius: 50%;margin-right: 5px;}
+			.tit{color: #33a2d8;font-size: 14px;}
+			.ul-list{list-style: none;margin: 0;padding: 0;font-size: 12px;}
+			.ul-list>li{margin: 10px 0;line-height: 1.5;white-space:pre-wrap;word-break: break-all;}
+			.my-btn{color: #33a2d8;border: 1px solid #33a2d8;background-color: #fff;border-radius: 0;padding:6px 30px;margin: 0 10px;}
+			.my-btn:active{color: #fff;background-color: #33a2d8 !important;}
+			.tel{padding: 30px 0;text-align: center;border-bottom: 1px solid #ccc;margin-bottom:10px;}
+		</style>
+	</head>
+<body>	
+<div class="mui-content">
+	<div class="mui-content-padded">
+		<strong>尊敬的客户,您好!对此结果我们非常遗憾!</strong>
+		<div style="padding: 10px 0;">
+			我们会持续改进我们的服务、产品,希望为您提供更好的服务!
+		</div>
+		<div class="my-content">
+			<label class="tit"><div class="icon-ji">寄</div>邮寄信息</label>
+			<ul class="ul-list">
+				<!--<li><strong>地址:</strong>东莞清溪三中金龙工业区徐福记对面优尼雅电子科技</li>
+				<li><strong>收货人:</strong>杨春有 &nbsp;&nbsp;<strong>电话:</strong>13592708169</li>
+				<li><strong>邮寄备注:</strong>您好,麻烦您那边把机器邮寄前请将水箱、接水台中的水倒掉并擦干,不要留有水渍,避免运输途中水或奶粉溅入机器内部造成不必要的损失。</li>
+				<li>用原包装或泡沫等材质包裹好机身。避免运输途中造成机器磕碰、损坏。</li>
+				<li>请勿寄顺丰、圆通、EMS以及到付件快递,其他快递物流随意,寄回时,麻烦您在产品里面留下故障原因说明。</li>
+				<li><strong>提示:</strong>产品寄回后请把单号和您的姓名、地址、电话等信息提供给客服,方便我们修好后给您寄回去。</li>-->
+			</ul>
+		</div>
+	</div>
+		<div class="tel">
+			售后热线:<a href="tel:4008006692">400-800-6692</a>
+		</div>
+		<div style="text-align: center;">
+			<p>以上信息是否解决了您的问题?</p>
+		</div>
+		<div style="text-align: center;">
+			<button type="button" class="mui-btn my-btn no">未解决</button>
+			<button type="button" class="mui-btn my-btn yes">已解决</button>
+		</div>
+</div>	
+<script type="text/javascript" src="../lib/mui/js/mui.min.js"></script>
+<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
+<script>
+	//自己写的js
+	mui.ready(function() {
+		$.ajax('${path}/admin/complaintQuestion/get_back_out_question?dates=' + new Date().getTime(), {
+						data: {},
+						dataType: 'json',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						type: 'post',
+						timeout: 15000,
+						success: function(dt) {
+							console.log(dt);
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.returnCode == "200") {
+									$(".my-btn").attr("name",dt.complaintQuestionInfo.questionId);
+									$(".ul-list").html('<li>'+dt.complaintQuestionInfo.questionProfile+'</li>');
+								}else {
+									mui.alert("获取数据失败!")
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							console.log(xhr);
+							mui.alert("获取数据失败!请检查网络");
+						}
+		});
+	});
+	$(document).on('tap', '.my-btn', function() {
+		var th=$(this),parameter = {},questionId=th.attr("name");
+		if(typeof(questionId)!="undefined"){
+		parameter["questionId"] = questionId;
+		if(th.hasClass("yes")){
+			parameter["questionResolvedNum"] = 1;
+		}else{
+			parameter["questionNotSolvedNum"] = 1;
+		}
+		
+		$.ajax('${path}/admin/complaintQuestion/update_question_num?dates=' + new Date().getTime(), {
+						data:parameter,
+						dataType: 'json',
+						xhrFields: {
+							withCredentials: true
+						},
+						crossDomain: true,
+						type: 'post',
+						timeout: 15000,
+						success: function(dt) {
+							console.log(dt);
+							if(dt.isRedirect) {
+								location.href = dt.redirectURL;
+							} else {
+								if(dt.returnCode == "200") {
+									$('.my-btn').attr('disabled','disabled');
+									mui.alert("提交成功!",function(){
+										//do something
+									});
+								}else {
+									mui.alert("提交失败!")
+								}
+							}
+						},
+						error: function(xhr, type, errorThrown) {
+							console.log(xhr);
+							mui.alert("提交失败!请检查网络");
+						}
+				});
+			}else{
+				mui.alert("提交失败!")
+			}
+	});	
+</script>
+</body>
+
+</html>