Browse Source

客户释放问题处理。

anderx 7 years ago
parent
commit
608f6e3a06

+ 23 - 0
src/main/java/com/goafanti/admin/bo/AdminCustomerDetailBo.java

@@ -3,6 +3,8 @@ package com.goafanti.admin.bo;
 public class AdminCustomerDetailBo {
 	private String id;
 	private String name;
+	private Integer source;
+	private String sourceName;
 	private String contacts;
 	private String contactMobile;
 	private String createTime;
@@ -44,5 +46,26 @@ public class AdminCustomerDetailBo {
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
 	}
+	public Integer getSource() {
+		return source;
+	}
+	public void setSource(Integer source) {
+		this.source = source;
+	}
+	public String getSourceName() {
+		//0 注册 1 录入 2 领取 3 转交
+		switch (getSource()) {
+		case 0:
+			return "注册";
+		case 1:
+			return "录入";
+		case 2:
+			return "领取";
+		case 3:
+			return "转交";
+		}
+		return "未知";
+	}
+	
 	
 }

+ 5 - 5
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1057,7 +1057,7 @@
 	and  share_type=0 and source !=0
 	group by aid) b on a.id=b.aid
 	left join (select aid,count(aid) as timeCount from user where aid is not null  
-	and  share_type=0 and source=1
+	and  share_type=0 and source !=0
 	 <if test="startTime != null and endTime != null"> 
     and  create_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
     </if>
@@ -1079,7 +1079,7 @@
 	and  share_type=0 and source !=0
 	group by aid) b on a.id=b.aid
 	left join (select aid,count(aid) as timeCount from user where aid is not null  
-	and  share_type=0 and source=1
+	and  share_type=0 and source !=0
 	 <if test="startTime != null and endTime != null"> 
     and  create_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
     </if>
@@ -1092,7 +1092,7 @@
   </select>
   
    <select id="selectAdminCustomerDetailList" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminCustomerDetailBo">
-  	select a.id,a.nickname as name,c.contacts,c.contact_mobile as contactMobile,
+  	select a.id,a.nickname as name,a.source,c.contacts,c.contact_mobile as contactMobile,
 	a.create_time as createTime,b.time_stamp as followTime
 	from user a 
 	left join (select uid,max(time_stamp) as time_stamp from user_follow group by uid) b  on a.id=b.uid
@@ -1101,7 +1101,7 @@
 	<if test="aid != null"> 
 	and a.aid=  #{aid,jdbcType=VARCHAR}
     </if>
-	and  a.share_type=0 and a.source=1
+	and  a.share_type=0 
 	<if test="startTime != null and endTime != null">
 	 and  a.create_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} 
     </if>
@@ -1118,7 +1118,7 @@
 	<if test="aid != null"> 
 	and a.aid=  #{aid,jdbcType=VARCHAR}
     </if>
-	and  a.share_type=0 and a.source=1
+	and  a.share_type=0 
 	<if test="startTime != null and endTime != null">
 	 and  a.create_time  between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} 
     </if>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -366,7 +366,7 @@
 	left join 
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 	on t0.uid = t1.uid 
-	where datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time))>30 or datediff(now(),t0.lock_time)>270
+	where datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time))>30
   </select>
   
   <select id="selectWaitReleaseBusiness"  resultType="com.goafanti.customer.bo.LockingReleaseBo">

+ 10 - 8
src/main/resources/props/config_local.properties

@@ -1,11 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#\u5e10\u53f7
-jdbc.username=dev
-#\u5bc6\u7801
-jdbc.password=123456
+#本地
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
+#测试
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20181217?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570
@@ -61,7 +63,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 static.host=//sb.jishutao.com/1.0.50
 avatar.host=//sb.jishutao.com
 
-#本地连生产
+#连生产
 #avatar.host=//static.kedexinxi.com
 #static.host=//s.kedexinxi.com/1.0.92
 
@@ -82,4 +84,4 @@ easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
 
 jiguang.appKey=dbcea43366e038073452a04e
 jiguang.masterSecret=59792298288e4f635c737def
-jiguang.pushUrl=https://api.jpush.cn/v3/push
+jiguang.pushUrl=https://api.jpush.cn/v3/push