手机号码验证

.gitignore

@@ -3,3 +3,4 @@
 /.classpath
 /buying.iml
 /WebContent/WEB-INF/classes/
+/out/

WebContent/static/mobile/js/cutProductList.js

@@ -133,21 +133,19 @@ function getProduct(type){
 							}else{
 								html.push('</em>')
 							}
-							if(type==0){
-								if(item.time_status==0){
-									html.push('<span class="mui-btn mui-btn-primary">立即参与</span>');
-								}else if(item.time_status==1){
-									html.push('<span class="mui-btn mui-btn-grey">已抢完</span>');
-								}else if(item.time_status==2){
-									html.push('<span class="mui-btn mui-btn-grey">已结束</span>');
-								}
+							if(item.time_status==0){
+								html.push('<span class="mui-btn mui-btn-primary">立即参与</span>');
+							}else if(item.time_status==1){
+								html.push('<span class="mui-btn mui-btn-grey">已抢完</span>');
+							}else if(item.time_status==2){
+								html.push('<span class="mui-btn mui-btn-grey">已结束</span>');
 							}else{
-								html.push('<span class="mui-btn mui-btn-grey">已过期</span>');
-							}
+                                html.push('<span class="mui-btn mui-btn-grey">已过期</span>');
+                            }
 							html.push('</p>');
 							html.push('<p class="main-color items product-time">');
 							html.push('<span class="item end_time"></span>');
-							if(type==0){
+                            if(item.time_status!=3){
 								html.push('<span>'+item.visit_num+'人关注</span>');
 							}else{
 								html.push('<span class="color2">'+item.visit_num+'人关注</span>');
@@ -155,7 +153,7 @@ function getProduct(type){
 							html.push('</p>');
 							html.push('</div>');
 							html.push('</li>');
-							if(type==0){
+                            if(item.time_status!=3){
 								clearInterval(interval);
 		                        var interval= setInterval(function() {
 		                        	var data_id=item.id;

WebContent/static/mobile/js/index.js

@@ -157,7 +157,7 @@ function getProduct(type){
 							html.push('<p class="product-merchant mui-ellipsis">'+item.merchant_name+'</p>');
 							html.push('<p class="product-title mui-ellipsis-2">'+item.product_name+'</p>');
 							html.push('<p class="product-price items">');
-							html.push('<em class="item"><b>¥</b>'+item.product_price+'<span class="del-line color3 ml5">'+item.product_old_price+'元</span>');
+							html.push('<em class="item"><b>¥</b>'+item.product_price+'<span class="del-line color3 ml5 fs12">'+item.product_old_price+'元</span>');
 							if(item.share_price&&user.is_share=="1"){
 								html.push('<span class="fs12 pl5" style="color:#e69809">佣金¥'+item.share_price+'</span></em>')
 							}else{

WebContent/static/web/js/user/userOrderList.js

@@ -84,6 +84,7 @@ layui.define(['laydate', 'layer', 'form','element'], function (exports) {
                 data.startCreateTime1 = $.trim($("#startCreateTime1").val());
                 data.endCreateTime1 = $("#endCreateTime1").val();
                 data.mobile = $("#mobile").val();
+                data.orderNo = $("#orderNo").val();
                 data.productId = productId;
                 data.orderStatus = "3";
             }   

WebContent/web/user/userOrderList.jsp

@@ -111,6 +111,11 @@
 		           		<input type="text" id="mobile" name="mobile" autocomplete="off" 
 		           			placeholder="手机号码" class="layui-input layui-col-xs7">
 					</div>
+					<div class="layui-col-xs2_4">
+						<label class="layui-form-label layui-col-xs4">订单编号</label>
+						<input type="text" id="orderNo" name="orderNo" autocomplete="off"
+							   placeholder="订单编号" class="layui-input layui-col-xs7">
+					</div>
 					<div class="layui-col-xs2_4 f0"> 
 			        	<button class="layui-btn layui-btn-small" id="btn-query3"><i class="layui-icon">&#xe604;</i>查询</button>
 			        	<button class="layui-btn layui-btn-small layui-btn-primary" type="reset" id="btn-reset">重置</button>

src/com/mall/config/MyConfig.java

@@ -121,6 +121,7 @@ public class MyConfig extends JFinalConfig {
 		WallFilter wf = new WallFilter();
 		wf.setDbType("mysql");
 		dp.addFilter(wf);
+		dp.setConnectionInitSql("set names utf8mb4;");
 		me.add(dp);
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arp = new ActiveRecordPlugin(dp);

src/com/mall/controller/user/UserShareLogController.java

@@ -6,6 +6,7 @@ import com.jfinal.ext.interceptor.POST;
 import com.mall.controller.common.BaseController;
 import com.mall.model.user.UserShareLog;
 import com.mall.util.Ret;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.Date;
 
@@ -32,7 +33,9 @@ public class UserShareLogController extends BaseController{
 		UserShareLog log = new UserShareLog();
 		log.set("openid", openid);
 		log.set("page", page);
-		log.set("page_id", id);
+		if(StringUtils.isNotEmpty(id)){
+			log.set("page_id", id);
+		}
 		log.set("type", type);
 		log.set("create_time", new Date());
 		log.save();

src/com/mall/model/product/Product.java

@@ -1,20 +1,19 @@
 
 package com.mall.model.product;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Model;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.mall.util.DateUtil;
 import com.mall.util.Utility;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 
 @SuppressWarnings("serial")
@@ -104,11 +103,11 @@ public class Product extends Model<Product>
         select.append(" t.product_main_img,t.visit_num,t.end_time,t.use_time,t.order_hour,t.time_status,t.share_price");
         sql.append(" from product t where product_type='20' and t.status='1' ");
         sql.append(" and t.start_time<'"+DateUtil.formatDateTime(new Date())+"'");
-        if("0".equals(type)){
-            sql.append(" and t.use_time>'"+DateUtil.formatDateTime(new Date())+"'");
-        }else {
-            sql.append(" and t.use_time<'"+DateUtil.formatDateTime(new Date())+"'");
-        }
+//        if("0".equals(type)){
+//            sql.append(" and t.use_time>'"+DateUtil.formatDateTime(new Date())+"'");
+//        }else {
+//            sql.append(" and t.use_time<'"+DateUtil.formatDateTime(new Date())+"'");
+//        }
         sql.append(" order by t.time_status , t.is_hot desc, t.sort desc");
         return paginate(pageNumber, pageSize, select.toString(), sql.toString());
     }

src/com/mall/model/user/UserOrder.java

@@ -80,6 +80,10 @@ public class UserOrder extends Model<UserOrder>
         		sql.append(" and a.mobile = ? ");
         		param.add(params.get("mobile"));
         	}
+        	if(Utility.isNotEmpty(params.get("orderNo"))){
+        		sql.append(" and a.order_no = ? ");
+        		param.add(params.get("orderNo"));
+        	}
     	}else if("4".equals(params.get("orderStatus"))){
     		sql.append(" and a.status ='1'");
     		if(Utility.isNotEmpty(params.get("startCreateTime2"))){
@@ -286,7 +290,7 @@ public class UserOrder extends Model<UserOrder>
     }
 	public int getOrderNumMy(String startDate,String endDate,String merchant) {
         StringBuffer sql = new StringBuffer();
-        sql.append(" select a.openid from user_order a ,user_order_detail b where a.id = b.order_id and a.order_type='40' ");
+        sql.append(" select count(1) num from user_order a ,user_order_detail b where a.id = b.order_id and a.order_type='40' ");
         if(StringUtils.isNotEmpty(startDate)) {
             sql.append(" and a.create_time >= '"+startDate+" 00:00:00'");
         }
@@ -294,12 +298,13 @@ public class UserOrder extends Model<UserOrder>
             sql.append(" and a.create_time <= '"+endDate+" 23:59:59'");
         }
         sql.append(" and (a.order_status='30' or a.order_status='20') and b.merchant_id = "+merchant+"");
-        List<Record> list = Db.find(sql.toString());
-		return list.size();
+        Record record = Db.findFirst(sql.toString());
+        return record.getLong("num").intValue();
 	}
 	public int getOrderNum(String userType,String startDate,String endDate,String company,String merchant) {
+        long starttime = System.currentTimeMillis();
 		StringBuffer sql = new StringBuffer();
-		sql.append(" select a.openid from user_order a ,user_order_detail b where a.id = b.order_id and a.order_type='10' ");
+		sql.append(" select count(1) num from user_order a ,user_order_detail b where a.id = b.order_id and a.order_type='10' ");
 		if("10".equals(userType)) {
 			
 			if(StringUtils.isNotEmpty(company)) {
@@ -349,8 +354,9 @@ public class UserOrder extends Model<UserOrder>
 				sql.append(" and a.order_status='30' and b.merchant_id = "+merchant+"");
 			}
 		}
-		List<Record> list = Db.find(sql.toString());
-		return list.size();
+		Record record = Db.findFirst(sql.toString());
+        System.out.println("OrderNum"+(System.currentTimeMillis()-starttime));
+		return record.getLong("num").intValue();
 	}
 
     public double getOrderPayMy(String startDate,String endDate ,String merchant) {
@@ -369,6 +375,7 @@ public class UserOrder extends Model<UserOrder>
         return record.getBigDecimal("price").doubleValue();
     }
 	public double getOrderPay(String userType,String startDate,String endDate ,String company,String merchant) {
+        long starttime = System.currentTimeMillis();
 		StringBuffer sql = new StringBuffer();
 		if("10".equals(userType)) {
 			if(StringUtils.isNotEmpty(company)) {
@@ -423,6 +430,7 @@ public class UserOrder extends Model<UserOrder>
 			}
 		}
 		Record record = Db.findFirst(sql.toString());
+        System.out.println("OrderPay"+(System.currentTimeMillis()-starttime));
 		return record.getBigDecimal("price").doubleValue();
 	}
 

src/com/mall/model/user/UserViewLog.java

@@ -16,8 +16,9 @@ public class UserViewLog extends Model<UserViewLog>
 	public static final UserViewLog dao = new UserViewLog();
 	
 	public int getViewLog(String userType,String startDate,String endDate,String company,String merchant) {
+        long starttime = System.currentTimeMillis();
 		StringBuffer sql = new StringBuffer();
-		sql.append(" select a.id from user_view_log a where 1=1 ");
+		sql.append(" select count(1) num from user_view_log a where 1=1 ");
 		if(StringUtils.isNotEmpty(startDate)) {
 			sql.append(" and a.create_time >= '"+startDate+" 00:00:00'");
 		}
@@ -41,13 +42,15 @@ public class UserViewLog extends Model<UserViewLog>
 				sql.append(" or (a.page like '%productDetail%' and a.page_id in (select id from product where merchant_id="+merchant+"))");
 			}
 		}
-		List<Record> list = Db.find(sql.toString());
-		return list.size();
+		Record record = Db.findFirst(sql.toString());
+		System.out.println("viewNum"+(System.currentTimeMillis()-starttime));
+		return record.getLong("num").intValue();
 	}
 	
 	public int getViewUser(String userType,String startDate,String endDate,String company,String merchant) {
+        long starttime = System.currentTimeMillis();
 		StringBuffer sql = new StringBuffer();
-		sql.append(" select a.id from user_view_log a where 1=1 ");
+		sql.append(" select count(distinct openid) num from user_view_log a where 1=1 ");
 		if(StringUtils.isNotEmpty(startDate)) {
 			sql.append(" and a.create_time >= '"+startDate+" 00:00:00'");
 		}
@@ -57,38 +60,23 @@ public class UserViewLog extends Model<UserViewLog>
 		if("10".equals(userType)) {
 			if(StringUtils.isNotEmpty(company)) {
 				sql.append(" and a.company_id = "+company+"");
-				if("1".equals(company)) {
-					sql.append(" group by openid,ip_address");
-				}else {
-					sql.append(" group by openid");
-				}
 			}else if(StringUtils.isNotEmpty(merchant)) {
 				sql.append(" and (a.page_id = "+merchant+" and (a.page like '%merchantDetail%' or a.page like '%productView%')) ");
 				sql.append(" or (a.page like '%productDetail%' and a.page_id in (select id from product where merchant_id="+merchant+"))");
-				sql.append(" group by openid");
-			}else {
-				sql.append(" group by openid");
 			}
 		}else if("20".equals(userType)) {
 			if(StringUtils.isNotEmpty(company)) {
 				sql.append(" and a.company_id = "+company+"");
-				if("1".equals(company)) {
-					sql.append(" group by openid,ip_address");
-				}else {
-					sql.append(" group by openid");
-				}
 			}
 		}else {
 			if(StringUtils.isNotEmpty(merchant)) {
 				sql.append(" and (a.page_id = "+merchant+" and (a.page like '%merchantDetail%' or a.page like '%productView%')) ");
 				sql.append(" or (a.page like '%productDetail%' and a.page_id in (select id from product where merchant_id="+merchant+"))");
-				sql.append(" group by openid");
-			}else {
-				sql.append(" group by openid");
 			}
 		}
-		List<Record> list = Db.find(sql.toString());
-		return list.size();
+        Record record = Db.findFirst(sql.toString());
+        System.out.println("viewUser"+(System.currentTimeMillis()-starttime));
+        return record.getLong("num").intValue();
 	}
 	
 	

src/com/mall/model/user/Users.java

@@ -40,7 +40,7 @@ public class Users extends Model<Users>
 		//判断openId 是否存在 如果存在就update 如果不存在就保存
 		Users user = getByOpenid(obj.getString("openid"));
 		if (user!=null) {
-			user.set("nickname", WechatUtils.filterWeixinEmoji(obj.getString("nickname")));
+			user.set("nickname", obj.getString("nickname"));
 			user.set("sex", obj.getString("sex"));
 			user.set("city", obj.getString("city"));
 			user.set("headimgurl", obj.getString("headimgurl"));
@@ -51,7 +51,7 @@ public class Users extends Model<Users>
 			if (StrKit.notBlank(obj.getString("openid"))) {
 				Users me = new Users();
 				me.set("openid", obj.getString("openid"));
-				me.set("nickname", WechatUtils.filterWeixinEmoji(obj.getString("nickname")));
+				me.set("nickname", obj.getString("nickname"));
 				me.set("sex", obj.getString("sex"));
 				me.set("city", obj.getString("city"));
 				me.set("headimgurl", obj.getString("headimgurl"));