From 16806096a94e84ce618231c0119647481bdd7c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Mon, 22 Jan 2018 19:26:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E6=89=8B=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tianpengtech/front/mobile/task/MobileTaskService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
index c44e0b1..e1cb803 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -331,7 +331,7 @@ public class MobileTaskService {
 		//检查任务类型,假如任务已经超过指定任务,则通知不能在报名了
 		int fairPrice = fair.getInt(Fair.PRICE);
 		
-		if(fairPrice<task.getInt(Task.TASK_PRICE)){
+		if(fairPrice<task.getInt(Task.TOTAL_FEE)){
 			r = R.fail("根据系统限定,你暂时不能接受当前任务");
 			return r;
 		}
-- 
Gitee


From 70e69b6c6e61eaf751423672343864ad85e43a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Mon, 22 Jan 2018 19:27:39 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=BE=E5=BC=80=E8=8B=B9=E6=9E=9C?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=8E=AF=E5=A2=83=E6=8E=A8=E9=80=81=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/tianpengtech/common/util/push/Jpush.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/tianpengtech/common/util/push/Jpush.java b/src/main/java/com/tianpengtech/common/util/push/Jpush.java
index 5690aae..681558d 100644
--- a/src/main/java/com/tianpengtech/common/util/push/Jpush.java
+++ b/src/main/java/com/tianpengtech/common/util/push/Jpush.java
@@ -29,7 +29,7 @@ public class Jpush {
 	public final static String PUSH_MSG="msg";
 	
 	public final static int LIVE_TIME=1*1000*60*10;
-	public final static boolean PRO_ENV=false;
+	public final static boolean PRO_ENV=true;
 	
 	
 	public static void pushCustomContentToSomeOne(String alias,String ALERT,String type){
-- 
Gitee


From e344cce144089284e137afbb68c64e51d4678a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Tue, 23 Jan 2018 02:47:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BD=93=E7=8E=B0?=
 =?UTF-8?q?=E9=9A=90=E8=97=8FBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FairWithdrawAdminServiceImpl.java            | 16 ++++++++--------
 .../mobile/passport/MobilePassportService.java   |  6 +++---
 .../front/mobile/task/MobileTaskService.java     |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
index a0ad080..3f93a27 100644
--- a/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
+++ b/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
@@ -100,19 +100,17 @@ public class FairWithdrawAdminServiceImpl extends AbstractAdmin implements IAdmi
 			MoneyLog moneyLog = MoneyLog.dao.findFirst(sql,id);
 			double money = moneyLog.getDouble(MoneyLog.MONEY);
 			double actualFee= money-temp.platFormFee();
-			moneyLog.set(MoneyLog.MONEY,(int)actualFee);
+			moneyLog.set(MoneyLog.MONEY,(int)money);
 			moneyLog.set(MoneyLog.DESCRIPTION,"用户提现:金额¥"+money+",实际收益:¥"+(int)actualFee);
 			moneyLog.set(MoneyLog.DELETETAG,MoneyLog.STATUS_SUCCESS).update();
 			
 			//更新网红余额数据信息
 			double leftMomey = fair.getDouble(Fair.MONEY);
-			double currentMoney = leftMomey-money;
 			
-			if(currentMoney<0){
+			if(leftMomey<0){
 				throw new ValidateException("当前网红账户提现金额已经超出账户余额");
 			}
-			fair.set(Fair.MONEY,currentMoney);
-			fair.set(Fair.AVALIABLE_FEE,currentMoney);
+			fair.set(Fair.AVALIABLE_FEE,leftMomey);
 			fair.update();
 			
 			PlatFormIncome formIncome = new PlatFormIncome();
@@ -134,9 +132,11 @@ public class FairWithdrawAdminServiceImpl extends AbstractAdmin implements IAdmi
 			String sql = "select * from "+MoneyLog.dao.tableName()+" where operid=? limit 1";
 			MoneyLog moneyLog = MoneyLog.dao.findFirst(sql,id);
 			moneyLog.set(MoneyLog.DELETETAG,MoneyLog.STATUS_ERROR).update();
-			//将提现的金额重新填入账户余额中
-//			double currentMoney = temp.getDouble(FairWithdraw.MONEY)+fair.getDouble(Fair.MONEY);
-//			fair.set(Fair.MONEY, currentMoney).update();
+//			将提现的金额重新填入账户余额中
+			double currentMoney = temp.getDouble(FairWithdraw.MONEY)+fair.getDouble(Fair.MONEY);
+			fair.set(Fair.MONEY, currentMoney);
+			fair.set(Fair.AVALIABLE_FEE, currentMoney);
+			fair.update();
 			
 //			double money = moneyLog.getDouble(MoneyLog.MONEY);
 //			//更新网红余额数据信息
diff --git a/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportService.java b/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportService.java
index 5558789..f018357 100644
--- a/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportService.java
@@ -896,10 +896,10 @@ public class MobilePassportService {
 			//String sql = "update "+Fair.dao.tableName()+" set "+Fair.MONEY+"=?,version=? where id=? and version=?";
 			String sql = "update "+Fair.dao.tableName()+" set "+Fair.MONEY+"=?,"+Fair.AVALIABLE_FEE+"=?,version=? where id=? and version=?";
 			
-			
+			double current =yue.doubleValue() - tixian;
 			//减去当前的提现金额,更新当前数据网红数据的账户银行
-			//int result = Db.update(sql,yue.doubleValue() - tixian,netxtVersion,uid,version);
-			int result = Db.update(sql,yue,yue,netxtVersion,uid,version);
+			int result = Db.update(sql,current,yue.doubleValue(),netxtVersion,uid,version);
+//			int result = Db.update(sql,yue,yue,netxtVersion,uid,version);
 			if (result>0) {
 				FairWithdraw fw = new FairWithdraw();
 				fw.set(FairWithdraw.BANK_ID, bankId);
diff --git a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
index e1cb803..6fcda34 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -225,8 +225,8 @@ public class MobileTaskService {
 						+ taskDao.tableName() + " task left join " + TaskWh.dao.tableName() + " wh on task." + Task.ID
 						+ "=wh." + TaskWh.TASK_ID + " where wh." + TaskWh.TASK_ID + "=? and wh." + TaskWh.WH_ID + "=?");
 		Task task = taskDao.findFirst(sql.toString(), id, uid);
-		String url ="http://www.ele-young.com/platform/mission?id=" + id;
-//		String url ="http://192.168.1.101:8091/platform/mission?id=" + id;
+//		String url ="http://www.ele-young.com/platform/mission?id=" + id;
+		String url ="http://192.168.1.101:8091/platform/mission?id=" + id;
 		if (task == null) {
 			sql = new StringBuffer(
 					"select task.total_fee,task.extension_type,task.wh_number,task.task_type, wh.reason , wh.code,task.task_url, task.create_user,task.task_title,task.task_description,task.task_price,task.status as status,task.id as id,task.task_start_time,task.task_end_time,wh.click_num,wh.cvs_num,wh.id as whid,task.task_url from "
@@ -439,7 +439,7 @@ public class MobileTaskService {
 			throw new ValidateException("推荐标题不能为空!!");
 		}
 		
-		if(reason.length()>10){
+		if(title.length()>10){
 			throw new ValidateException("推荐标题不能超过10个字符!!");
 		}
 		
-- 
Gitee


From 43b22b1b9f692b3ba494f5f59ca9196400c7d493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Tue, 23 Jan 2018 02:56:54 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/mobile/login/MobileLoginController.java             | 2 +-
 .../com/tianpengtech/front/mobile/task/MobileTaskService.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java b/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java
index 48a9004..d275887 100644
--- a/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java
+++ b/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java
@@ -213,7 +213,7 @@ public class MobileLoginController extends BaseController {
     
     public void upateVersion(){
     	R r = R.ok();
-    	r.put("showUpdate", true);
+    	r.put("showUpdate", false);
     	r.put("showInvite", false);
     	renderJson(r);
     }
diff --git a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
index 6fcda34..24c5739 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -225,8 +225,8 @@ public class MobileTaskService {
 						+ taskDao.tableName() + " task left join " + TaskWh.dao.tableName() + " wh on task." + Task.ID
 						+ "=wh." + TaskWh.TASK_ID + " where wh." + TaskWh.TASK_ID + "=? and wh." + TaskWh.WH_ID + "=?");
 		Task task = taskDao.findFirst(sql.toString(), id, uid);
-//		String url ="http://www.ele-young.com/platform/mission?id=" + id;
-		String url ="http://192.168.1.101:8091/platform/mission?id=" + id;
+		String url ="http://www.ele-young.com/platform/mission?id=" + id;
+//		String url ="http://192.168.1.101:8091/platform/mission?id=" + id;
 		if (task == null) {
 			sql = new StringBuffer(
 					"select task.total_fee,task.extension_type,task.wh_number,task.task_type, wh.reason , wh.code,task.task_url, task.create_user,task.task_title,task.task_description,task.task_price,task.status as status,task.id as id,task.task_start_time,task.task_end_time,wh.click_num,wh.cvs_num,wh.id as whid,task.task_url from "
-- 
Gitee


From 79728d7c6b06e68edd3911a4f44aeaa4b1d3d782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Tue, 23 Jan 2018 02:59:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=93=E5=BC=80=E7=83=AD=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tianpengtech/front/mobile/login/MobileLoginController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java b/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java
index d275887..48a9004 100644
--- a/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java
+++ b/src/main/java/com/tianpengtech/front/mobile/login/MobileLoginController.java
@@ -213,7 +213,7 @@ public class MobileLoginController extends BaseController {
     
     public void upateVersion(){
     	R r = R.ok();
-    	r.put("showUpdate", false);
+    	r.put("showUpdate", true);
     	r.put("showInvite", false);
     	renderJson(r);
     }
-- 
Gitee


From 78d9888a2fe3b112e3c2076f95c981f7e5051496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Tue, 23 Jan 2018 12:47:43 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=82=B9=E5=87=BB=E6=95=B0=E5=92=8C=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E6=95=B0=E7=9A=84key=E7=9A=84=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/web/task/TaskService.java           | 24 +++++++++----------
 .../front/web/task/TaskWebController.java     | 18 +++++++++++---
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/tianpengtech/front/web/task/TaskService.java b/src/main/java/com/tianpengtech/front/web/task/TaskService.java
index 25e2b2f..4a5c187 100644
--- a/src/main/java/com/tianpengtech/front/web/task/TaskService.java
+++ b/src/main/java/com/tianpengtech/front/web/task/TaskService.java
@@ -203,7 +203,7 @@ public class TaskService {
      * @param ua
      * @param ip
      */
-    public void saveTaskClick(String ref, String ua ,String ip,String code){
+    public void saveTaskClick(String ref, String ua ,String ip,String code,String token){
         synchronized (code) {
             TaskWh taskWh = getByCode(code);
 //            boolean devModel = PropKit.getBoolean("devMode");
@@ -221,13 +221,13 @@ public class TaskService {
             
             if(task.getInt(Task.STATUS)==Task.STATUS_START){
             	if (!devModel) {//假如是真实环境,则只记录真实的点击数
-                    Object i = CacheKit.get(TASK_CACHE_CLICK_NAME, ip + taskWh.get(TaskWh.ID));
+                    Object i = CacheKit.get(TASK_CACHE_CLICK_NAME,token);
                     if (i != null) {//假如当前记录再有效期内,则不记录当前数据
                     	return;
                     }
-                    updateRealClickNum(ref, ua, ip, code, taskWh);
+                    updateRealClickNum(ref, ua, ip, code, taskWh,token);
                 }else{
-                	updateRealClickNum(ref, ua, ip, code, taskWh);
+                	updateRealClickNum(ref, ua, ip, code, taskWh,token);
                 	updateDevClickNum(ref, ua, ip, code, taskWh,TaskCount.TYPE_DEV);
                 }
             }
@@ -235,10 +235,10 @@ public class TaskService {
         }
     }
 
-	private void updateRealClickNum(String ref, String ua, String ip, String code, TaskWh taskWh) {
+	private void updateRealClickNum(String ref, String ua, String ip, String code, TaskWh taskWh,String token) {
 		updateDevClickNum(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO);
 		//缓存内写入数据防止此IP在限制时间内再次点击
-		CacheKit.put(TASK_CACHE_CLICK_NAME, ip + taskWh.get(TaskWh.ID), 1);
+		CacheKit.put(TASK_CACHE_CLICK_NAME,token, 1);
 		//点击次数加一
 		int num = taskWh.get(TaskWh.CLICK_NUM);
 		taskWh.set(TaskWh.CLICK_NUM, ++num);
@@ -278,7 +278,7 @@ public class TaskService {
      * @param ua
      * @param ip
      */
-    public void saveTaskCvs(String ref, String ua ,String ip,String code){
+    public void saveTaskCvs(String ref, String ua ,String ip,String code,String token){
         synchronized (code) {
             TaskWh taskWh = getByCode(code);
 //            boolean devModel = PropKit.getBoolean("devMode");
@@ -294,24 +294,24 @@ public class TaskService {
             if(task.getInt(Task.STATUS)==Task.STATUS_START){
             	//如果是测试环境
                 if (!devModel) {
-                    Object i = CacheKit.get(TASK_CACHE_CLICK_NAME, ip + taskWh.get(TaskWh.ID));
+                    Object i = CacheKit.get(TASK_CACHE_CLICK_NAME,token);
                     //判断在缓存有效期内是否点击过
                     if (i != null) {
                         return;
                     }
-                    updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO);
+                    updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,token);
                 }else{
-                	updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO);
+                	updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,token);
                 	updateDevCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_DEV);
                 }
             }
         }
     }
 
-	private void updateRealCVS(String ref, String ua, String ip, String code, TaskWh taskWh,int type) {
+	private void updateRealCVS(String ref, String ua, String ip, String code, TaskWh taskWh,int type,String token) {
 		updateDevCVS(ref, ua, ip, code, taskWh, type);
 		//缓存内写入数据防止此IP在限制时间内再次点击
-		CacheKit.put(TASK_CACHE_CLICK_NAME, ip + taskWh.get(TaskWh.ID), 1);
+		CacheKit.put(TASK_CACHE_CLICK_NAME, token, 1);
 		//点击次数加一
 		int num = taskWh.get(TaskWh.CVS_NUM);
 		taskWh.set(TaskWh.CVS_NUM, ++num);
diff --git a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
index f001b16..0a2c10a 100644
--- a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
+++ b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
@@ -1,5 +1,6 @@
 package com.tianpengtech.front.web.task;
 
+import com.alibaba.druid.util.StringUtils;
 import com.jfinal.aop.Before;
 import com.jfinal.aop.Clear;
 import com.jfinal.kit.Ret;
@@ -42,6 +43,7 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * Controller for task management.
@@ -53,7 +55,7 @@ public class TaskWebController extends BaseController {
 	private TaskService service = new TaskService();
 	private FairService fairService = new FairService();
 	private DictionaryDao dictionaryDao = new DictionaryDao();
-
+	private int COOKIE_TIME_OUT=1000*60*60*24*30;
 	public void index() {
 		render("task_list.html");
 	}
@@ -211,7 +213,13 @@ public class TaskWebController extends BaseController {
 		String ref = getHeader("Referer");
 		String ip = IpKit.getRealIp(getRequest());
 		String code = getPara("code");
-		service.saveTaskClick(ref, ua, ip, code);
+		
+		//为客户端生成TOKEN值,这样方便统计信息
+		String token = getCookie("token");
+		if(StringUtils.isEmpty(token)){
+			setCookie("token", UUID.randomUUID().toString(),COOKIE_TIME_OUT);
+		}
+		service.saveTaskClick(ref, ua, ip, code,token);
 		renderJson(JsonUtil.printSuccess("记录成功"));
 	}
 
@@ -225,7 +233,11 @@ public class TaskWebController extends BaseController {
 		String ref = getHeader("Referer");
 		String ip = IpKit.getRealIp(getRequest());
 		String code = getPara("code");
-		service.saveTaskCvs(ref, ua, ip, code);
+		String token = getCookie("cvs_token");
+		if(StringUtils.isEmpty(token)){
+			setCookie("cvs_token", UUID.randomUUID().toString(),COOKIE_TIME_OUT);
+		}
+		service.saveTaskCvs(ref, ua, ip, code,token);
 		renderJson(JsonUtil.printSuccess("记录成功"));
 	}
 
-- 
Gitee