From b13e51b8f1991559ba94f15e4a3069b8722e2cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 15:34:03 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD=E4=B9=9F=E8=83=BD=E8=BF=9B=E8=A1=8C?=
=?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=8F=82=E4=B8=8E=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../front/mobile/task/MobileTaskService.java | 25 ++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
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 068bf53..fc9a7da 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -51,6 +51,9 @@ public class MobileTaskService {
* @return
*/
public R taskIndex(int pageNum, int length, long uid) {
+
+ boolean isOpenFairLevel=SysConfigDao.ME.isOpenFairLevel();
+
String s = String.format("select task.task_type,task.total_fee, task.create_user, %s,%s,%s,%s,%s,%s,%s,%s ", Task.STATUS,
Task.ID, Task.TASK_TITLE, Task.TASK_START_TIME, Task.TASK_END_TIME, Task.TASK_DESCRIPTION,
Task.TASK_PRICE, Task.WH_NUMBER);
@@ -92,8 +95,13 @@ public class MobileTaskService {
t.put("hasApprover", hasApprover);
//检查当前登录用户是否有资格接任务
int priceLevel = fair.getInt(Fair.PRICE);
- boolean canApply = (priceLevel>=t.getDouble(Task.TASK_PRICE));
- t.put("canApply", canApply);
+ boolean canApply = (priceLevel>=t.getDouble(Task.TOTAL_FEE));
+
+ if(isOpenFairLevel){
+ t.put("canApply", canApply);
+ }else{
+ t.put("canApply", true);
+ }
t.set("task_price",TaskCalculateService.ME.calculateTaskTotalFee(t));
t.set(Task.TASK_TITLE,XxxUtil.handleContent(t.getStr(Task.TASK_TITLE), 14));
t.set(Task.TASK_DESCRIPTION,XxxUtil.handleContent(t.getStr(Task.TASK_DESCRIPTION),103));
@@ -228,6 +236,7 @@ public class MobileTaskService {
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;
+
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 "
@@ -239,6 +248,7 @@ public class MobileTaskService {
task.put("click_num",0);
task.put("cvs_num",0);
task.put("actual_price",0);
+
} else {
task.put("sumClick", task.getClick());
task.put("sumCvs", task.getCvs());
@@ -252,6 +262,16 @@ public class MobileTaskService {
url =url+ "&ucode=" + task.getStr("code");
}
}
+ boolean isOpenFairLevel=SysConfigDao.ME.isOpenFairLevel();
+ Fair fair = Fair.dao.findById(uid);
+ int priceLevel = fair.getInt(Fair.PRICE);
+ boolean canApply = (priceLevel>=task.getDouble(Task.TOTAL_FEE));
+ if(isOpenFairLevel){
+ task.put("canApply", canApply);
+ }else{
+ task.put("canApply", true);
+ }
+
task.set("task_price",TaskCalculateService.ME.calculateTaskTotalFee(task));
task.put("dateString", task.getDateString());
Authenticate auth = AuthenticateSerivce.ME.findAuthenticateByUserId(task.getInt(Task.CREATE_USER));
@@ -306,7 +326,6 @@ public class MobileTaskService {
// }
boolean result = TaskService.isExistFairTask(uid + "", id + "");
task.put("isJoin", result);
- Fair fair = Fair.dao.findById(uid);
boolean hasApprover = (fair != null && (fair.getInt(Fair.STATUS) == Fair.STATUS_SUCCESS)) ? true : false;
task.put("hasApprover", hasApprover);
task.put("wh_status", Task.STATUS_COMPLETED);
--
Gitee
From 4d3e1d309f71342e7064f150f932ced31a75ceda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 18:00:10 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
=?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=92=8C=E5=BE=AE=E4=BF=A1=E6=98=B5=E7=A7=B0?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/model/task/TaskCVS.java | 3 +-
.../common/model/task/TaskCount.java | 2 ++
.../front/web/task/TaskService.java | 34 +++++++++++--------
.../front/web/task/TaskWebController.java | 21 ++++++++++--
4 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/tianpengtech/common/model/task/TaskCVS.java b/src/main/java/com/tianpengtech/common/model/task/TaskCVS.java
index 47eab76..9133817 100644
--- a/src/main/java/com/tianpengtech/common/model/task/TaskCVS.java
+++ b/src/main/java/com/tianpengtech/common/model/task/TaskCVS.java
@@ -33,7 +33,8 @@ public class TaskCVS extends AbstractBaseModel<TaskCVS> {
public static final String PROVINCE ="province"; //省份
public static final String CITY ="city"; //市
public static final String type ="type"; //市
-
+ public static final String WEIXIN_AVATAR = "weixin_avatar"; // 微信头像
+ public static final String WEIXIN_NICKNAME = "weixin_nickname"; // 微信昵称
@Override
public String tableName() {
diff --git a/src/main/java/com/tianpengtech/common/model/task/TaskCount.java b/src/main/java/com/tianpengtech/common/model/task/TaskCount.java
index 6415c95..5dd45e8 100644
--- a/src/main/java/com/tianpengtech/common/model/task/TaskCount.java
+++ b/src/main/java/com/tianpengtech/common/model/task/TaskCount.java
@@ -31,6 +31,8 @@ public class TaskCount extends AbstractBaseModel<TaskCount> {
public static final String PROVINCE = "province"; // 省份
public static final String CITY = "city"; // 市
public static final String TYPE = "type"; // 统计方式
+ public static final String WEIXIN_AVATAR = "weixin_avatar"; // 微信头像
+ public static final String WEIXIN_NICKNAME = "weixin_nickname"; // 微信昵称
public static final int TYPE_DEV = 1;
public static final int TYPE_PRO = 0;
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 76f2cff..4fdce81 100644
--- a/src/main/java/com/tianpengtech/front/web/task/TaskService.java
+++ b/src/main/java/com/tianpengtech/front/web/task/TaskService.java
@@ -204,7 +204,7 @@ public class TaskService {
* @param ua
* @param ip
*/
- public void saveTaskClick(String ref, String ua ,String ip,String code,String token){
+ public void saveTaskClick(String ref, String ua ,String ip,String code,String token,String avatarUrl,String nickName){
synchronized (code) {
TaskWh taskWh = getByCode(code);
// boolean devModel = PropKit.getBoolean("devMode");
@@ -238,18 +238,19 @@ public class TaskService {
if (i != null) {//假如当前记录再有效期内，则不记录当前数据
return;
}
- updateRealClickNum(ref, ua, ip, code, taskWh,token);
+ updateRealClickNum(ref, ua, ip, code, taskWh,token,avatarUrl,nickName);
}else{
- updateRealClickNum(ref, ua, ip, code, taskWh,token);
- updateDevClickNum(ref, ua, ip, code, taskWh,TaskCount.TYPE_DEV);
+ updateRealClickNum(ref, ua, ip, code, taskWh,token,avatarUrl,nickName);
+ updateDevClickNum(ref, ua, ip, code, taskWh,TaskCount.TYPE_DEV,avatarUrl,nickName);
}
}
}
}
- private void updateRealClickNum(String ref, String ua, String ip, String code, TaskWh taskWh,String token) {
- updateDevClickNum(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO);
+ private void updateRealClickNum(String ref, String ua, String ip, String code,
+ TaskWh taskWh,String token,String avatarUrl,String nickName) {
+ updateDevClickNum(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,avatarUrl,nickName);
//缓存内写入数据防止此IP在限制时间内再次点击
CacheKit.put(TASK_CACHE_CLICK_NAME,token, 1);
//点击次数加一
@@ -258,7 +259,7 @@ public class TaskService {
taskWh.update();
}
- private void updateDevClickNum(String ref, String ua, String ip, String code, TaskWh taskWh,int type) {
+ private void updateDevClickNum(String ref, String ua, String ip, String code, TaskWh taskWh,int type,String avatarUrl,String nickName) {
UserAgentInfo userAgentInfo = UAUtil.get(ua);
IpInfo info = IpUtil.getIpInfo(ip);
TaskCount taskCount = new TaskCount();
@@ -269,6 +270,8 @@ public class TaskService {
taskCount.set(TaskCount.TASK_CODE, code);
taskCount.set(TaskCount.USER_AGENT, ua);
taskCount.set(TaskCount.TYPE,type);
+ taskCount.set(TaskCount.WEIXIN_AVATAR, avatarUrl);
+ taskCount.set(TaskCount.WEIXIN_NICKNAME, nickName);
if (userAgentInfo != null) {
taskCount.set(TaskCount.OS_NAME, userAgentInfo.getOsName());
taskCount.set(TaskCount.UA_NAME, userAgentInfo.getUaName());
@@ -291,7 +294,7 @@ public class TaskService {
* @param ua
* @param ip
*/
- public void saveTaskCvs(String ref, String ua ,String ip,String code,String token){
+ public void saveTaskCvs(String ref, String ua ,String ip,String code,String token,String avartar,String nickName){
synchronized (code) {
TaskWh taskWh = getByCode(code);
// boolean devModel = PropKit.getBoolean("devMode");
@@ -322,17 +325,18 @@ public class TaskService {
if (i != null) {
return;
}
- updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,token);
+ updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,token,avartar,nickName);
}else{
- updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,token);
- updateDevCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_DEV);
+ updateRealCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_PRO,token,avartar,nickName);
+ updateDevCVS(ref, ua, ip, code, taskWh,TaskCount.TYPE_DEV,avartar,nickName);
}
}
}
}
- private void updateRealCVS(String ref, String ua, String ip, String code, TaskWh taskWh,int type,String token) {
- updateDevCVS(ref, ua, ip, code, taskWh, type);
+ private void updateRealCVS(String ref, String ua, String ip, String code, TaskWh taskWh
+ ,int type,String token,String avatarUrl,String nickName) {
+ updateDevCVS(ref, ua, ip, code, taskWh, type,avatarUrl,nickName);
//缓存内写入数据防止此IP在限制时间内再次点击
CacheKit.put(TASK_CACHE_CLICK_NAME, token, 1);
//点击次数加一
@@ -341,7 +345,7 @@ public class TaskService {
taskWh.update();
}
- private void updateDevCVS(String ref, String ua, String ip, String code, TaskWh taskWh, int type) {
+ private void updateDevCVS(String ref, String ua, String ip, String code, TaskWh taskWh, int type,String avatarUrl,String nickName) {
UserAgentInfo userAgentInfo = UAUtil.get(ua);
IpInfo info = IpUtil.getIpInfo(ip);
TaskCVS taskCvs = new TaskCVS();
@@ -352,6 +356,8 @@ public class TaskService {
taskCvs.set(TaskCount.TASK_CODE, code);
taskCvs.set(TaskCount.USER_AGENT, ua);
taskCvs.set(TaskCount.TYPE, type);
+ taskCvs.set(TaskCount.WEIXIN_AVATAR, avatarUrl);
+ taskCvs.set(TaskCount.WEIXIN_NICKNAME, nickName);
if (userAgentInfo != null) {
taskCvs.set(TaskCount.OS_NAME, userAgentInfo.getOsName());
taskCvs.set(TaskCount.UA_NAME, userAgentInfo.getUaName());
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 c247d31..24cbf38 100644
--- a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
+++ b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
@@ -213,6 +213,15 @@ public class TaskWebController extends BaseController {
String ref = getHeader("Referer");
String ip = IpKit.getRealIp(getRequest());
String code = getPara("code");
+ Map<String,Object> wxUser = getSessionAttr("wxuser");
+
+ String avatar="123";
+ String nickName="1234";
+
+ if(wxUser!=null){
+ avatar = (String) wxUser.get("avatarUrl");
+ nickName = (String) wxUser.get("nickName");
+ }
//为客户端生成TOKEN值，这样方便统计信息
String token = getCookie("token");
@@ -220,7 +229,7 @@ public class TaskWebController extends BaseController {
token = UUID.randomUUID().toString();
setCookie("token",token,COOKIE_TIME_OUT);
}
- service.saveTaskClick(ref, ua, ip, code,token);
+ service.saveTaskClick(ref, ua, ip, code,token,avatar,nickName);
renderJson(JsonUtil.printSuccess("记录成功"));
}
@@ -235,11 +244,19 @@ public class TaskWebController extends BaseController {
String ip = IpKit.getRealIp(getRequest());
String code = getPara("code");
String token = getCookie("cvs_token");
+ Map<String,Object> wxUser = getSessionAttr("wxuser");
+ String avatar="123";
+ String nickName="1234";
+ if(wxUser!=null){
+ avatar = (String) wxUser.get("avatarUrl");
+ nickName = (String) wxUser.get("nickName");
+ }
+
if(StringUtils.isEmpty(token)){
token = UUID.randomUUID().toString();
setCookie("cvs_token",token,COOKIE_TIME_OUT);
}
- service.saveTaskCvs(ref, ua, ip, code,token);
+ service.saveTaskCvs(ref, ua, ip, code,token,avatar,nickName);
renderJson(JsonUtil.printSuccess("记录成功"));
}
--
Gitee
From ac3f82f046b2dd5e3e9a2b2c6bed2a69352433ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 18:15:20 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tianpengtech/front/web/task/TaskWebController.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 24cbf38..634ebe9 100644
--- a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
+++ b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
@@ -215,8 +215,8 @@ public class TaskWebController extends BaseController {
String code = getPara("code");
Map<String,Object> wxUser = getSessionAttr("wxuser");
- String avatar="123";
- String nickName="1234";
+ String avatar="";
+ String nickName="";
if(wxUser!=null){
avatar = (String) wxUser.get("avatarUrl");
@@ -245,8 +245,8 @@ public class TaskWebController extends BaseController {
String code = getPara("code");
String token = getCookie("cvs_token");
Map<String,Object> wxUser = getSessionAttr("wxuser");
- String avatar="123";
- String nickName="1234";
+ String avatar="";
+ String nickName="";
if(wxUser!=null){
avatar = (String) wxUser.get("avatarUrl");
nickName = (String) wxUser.get("nickName");
--
Gitee
From 90b4df29bac5ef14f8dc281b2a37e7b604db099c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 18:40:24 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95?=
=?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/web/count/TaskCountController.java | 1 +
.../java/com/tianpengtech/front/web/task/TaskWebController.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/tianpengtech/front/web/count/TaskCountController.java b/src/main/java/com/tianpengtech/front/web/count/TaskCountController.java
index 78fd070..8e0a22d 100644
--- a/src/main/java/com/tianpengtech/front/web/count/TaskCountController.java
+++ b/src/main/java/com/tianpengtech/front/web/count/TaskCountController.java
@@ -172,6 +172,7 @@ public class TaskCountController extends Controller{
wxUser = tcService.getUserInfoFromWeixin(code,ip);
setSessionAttr("wxuser", wxUser);
}
+ System.out.println("getUserInfoFromWeixin:-------->"+wxUser);
renderJson(JsonUtil.printObject(wxUser));
}
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 634ebe9..321022c 100644
--- a/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
+++ b/src/main/java/com/tianpengtech/front/web/task/TaskWebController.java
@@ -217,7 +217,7 @@ public class TaskWebController extends BaseController {
String avatar="";
String nickName="";
-
+ System.out.println("taskCount:-------->"+wxUser);
if(wxUser!=null){
avatar = (String) wxUser.get("avatarUrl");
nickName = (String) wxUser.get("nickName");
--
Gitee
From 5c3f3e3259f2fb0c970663c1f4393b5bd2f12d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 19:20:16 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E9=A1=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/task_template/common/__task_base_template.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/webapp/task_template/common/__task_base_template.html b/src/main/webapp/task_template/common/__task_base_template.html
index e3a8f6b..95d3612 100644
--- a/src/main/webapp/task_template/common/__task_base_template.html
+++ b/src/main/webapp/task_template/common/__task_base_template.html
@@ -140,7 +140,7 @@
<script type="text/javascript" src="#(contextPath)/task_template/common/js/jquery.min.js" ></script>
<script type="text/javascript" src="http://pv.sohu.com/cityjson"></script>
-<script type="text/javascript" src="#(contextPath)/assets/front/web/script/task-count.js"></script>
+
<script src="#(contextPath)/assets/front/web/script/layer.js"></script>
<script type="text/javascript">
taskCount("#(ucode??'')");
@@ -162,6 +162,7 @@
</script>
<script type="text/javascript" src="#(contextPath)/task_template/common/js/common.js" ></script>
<script type="text/javascript" src="#(contextPath)/task_template/common/js/index.js"></script>
+<script type="text/javascript" src="#(contextPath)/assets/front/web/script/task-count.js"></script>
#@taskJs()
</body>
</html>
--
Gitee
From fd70eb310fc8bc73440162fc6fde76c22f541e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 19:26:40 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3JS=E8=84=9A=E6=9C=AC?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../webapp/task_template/common/__task_base_template.html | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/task_template/common/__task_base_template.html b/src/main/webapp/task_template/common/__task_base_template.html
index 95d3612..e0fdacc 100644
--- a/src/main/webapp/task_template/common/__task_base_template.html
+++ b/src/main/webapp/task_template/common/__task_base_template.html
@@ -142,6 +142,10 @@
<script type="text/javascript" src="http://pv.sohu.com/cityjson"></script>
<script src="#(contextPath)/assets/front/web/script/layer.js"></script>
+
+<script type="text/javascript" src="#(contextPath)/task_template/common/js/common.js" ></script>
+<script type="text/javascript" src="#(contextPath)/task_template/common/js/index.js"></script>
+<script type="text/javascript" src="#(contextPath)/assets/front/web/script/task-count.js"></script>
<script type="text/javascript">
taskCount("#(ucode??'')");
$("#ip").val(returnCitySN.cip);
@@ -160,9 +164,6 @@
});
</script>
-<script type="text/javascript" src="#(contextPath)/task_template/common/js/common.js" ></script>
-<script type="text/javascript" src="#(contextPath)/task_template/common/js/index.js"></script>
-<script type="text/javascript" src="#(contextPath)/assets/front/web/script/task-count.js"></script>
#@taskJs()
</body>
</html>
--
Gitee
From e5719aa4ced4f9ae0936f7fc2ef57e31deb25610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 25 Jan 2018 19:35:46 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=B6=E6=97=B6?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=B8=8E=E8=8E=B7=E5=8F=96=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=96=B9=E6=B3=95=E9=94=99?=
=?UTF-8?q?=E5=BC=80=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../webapp/task_template/common/__task_base_template.html | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/webapp/task_template/common/__task_base_template.html b/src/main/webapp/task_template/common/__task_base_template.html
index e0fdacc..cc1b1a5 100644
--- a/src/main/webapp/task_template/common/__task_base_template.html
+++ b/src/main/webapp/task_template/common/__task_base_template.html
@@ -147,7 +147,10 @@
<script type="text/javascript" src="#(contextPath)/task_template/common/js/index.js"></script>
<script type="text/javascript" src="#(contextPath)/assets/front/web/script/task-count.js"></script>
<script type="text/javascript">
- taskCount("#(ucode??'')");
+
+
+ setTimeout(function(){ taskCount("#(ucode??'')");},1000);
+
$("#ip").val(returnCitySN.cip);
$("#commentBtn").click(function(){
layer.open({
--
Gitee
From 0b14f0aac20175b8aa4d79604953d441a404c9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Sat, 3 Mar 2018 11:14:23 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=83=E7=89=9BDOMAI?=
=?UTF-8?q?N?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fairwithdraw/FairWithdrawAdminServiceImpl.java | 1 -
src/main/java/com/tianpengtech/common/MyConfig.java | 10 +++++++++-
.../com/tianpengtech/common/util/push/Jpush.java | 13 +++++++------
.../com/tianpengtech/front/im/ImController.java | 11 +++++------
src/main/resources/qiniu.properties | 4 ++--
.../admin/fairwithdraw/fairwithdraw-reason.html | 4 +---
6 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
index 3f93a27..e11b1e3 100644
--- a/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
+++ b/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
@@ -149,7 +149,6 @@ public class FairWithdrawAdminServiceImpl extends AbstractAdmin implements IAdmi
// fair.set(Fair.MONEY,currentMoney);
// fair.set(Fair.AVALIABLE_FEE,currentMoney);
// fair.update();
-
Jpush.pushCustomContentToSomeOne(fair.getStr(Fair.MOIBILE), result, Jpush.PUSH_MSG);
Jpush.pushMessageInfoToSomeOne(fair.getStr(Fair.MOIBILE), result, Jpush.PUSH_MSG);
}
diff --git a/src/main/java/com/tianpengtech/common/MyConfig.java b/src/main/java/com/tianpengtech/common/MyConfig.java
index b074f99..94f07bb 100644
--- a/src/main/java/com/tianpengtech/common/MyConfig.java
+++ b/src/main/java/com/tianpengtech/common/MyConfig.java
@@ -4,6 +4,7 @@ package com.tianpengtech.common;
import com.alibaba.druid.filter.stat.StatFilter;
import com.alibaba.druid.wall.WallFilter;
import com.jfinal.config.*;
+import com.jfinal.config.Routes.Route;
import com.jfinal.core.JFinal;
import com.jfinal.ext.handler.ContextPathHandler;
import com.jfinal.kit.PropKit;
@@ -64,10 +65,12 @@ import com.tianpengtech.front.web.tasktemplate.TaskTemplateController;
import com.tianpengtech.front.website.H5AdController;
import com.tianpengtech.front.website.WebSiteRoutes;
+import java.lang.reflect.Method;
import java.util.Properties;
public class MyConfig extends JFinalConfig {
+ private Routes routes;
public Properties loadProp(String pro, String dev) {
try {
return loadPropertyFile(pro);
@@ -78,7 +81,6 @@ public class MyConfig extends JFinalConfig {
@Override
public void configConstant(Constants me) {
-
PropKit.use("a_little_config.txt");
me.setDevMode(PropKit.getBoolean("devMode", false));
// me.setBaseUploadPath(PropKit.get("user.upload.dir"));
@@ -200,6 +202,12 @@ public class MyConfig extends JFinalConfig {
QuartzPlugin.addJob("TaskJob_first", "0 5 0 * * ?", TaskStartJob.class);//每天凌晨12：05检查当天需要被标记进行中的任务
QuartzPlugin.addJob("TaskJob_second", "0 50 23 * * ?", TaskEndJob.class);//每天11:50检查当天需要结束的任务
QuartzPlugin.addJob("SessionJob", "0 0/2 * * * ?", SessionJob.class);
+
+
+// for (Route r : this.routes.getRouteItemList()) {
+// System.out.println(r.getControllerClass()+":"+r.getControllerKey());
+// }
+
}
public static void main(String[] args) {
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 681558d..c59512d 100644
--- a/src/main/java/com/tianpengtech/common/util/push/Jpush.java
+++ b/src/main/java/com/tianpengtech/common/util/push/Jpush.java
@@ -25,6 +25,10 @@ public class Jpush {
private static String masterSecret = "16fa00649bab368bca6754b3";
private static String appKey = "6a81d135389c221b23441e27";
+// private static String masterSecret = "61dbbaa4d280ec4924de0cb1";
+// private static String appKey = "73f08e92f37b08fa4c9f05bf";
+
+
public final static String PUSH_TASK="task";
public final static String PUSH_MSG="msg";
@@ -98,6 +102,7 @@ public class Jpush {
.addPlatformNotification(IosNotification.newBuilder()
.addExtra("type",type)
.setAlert(title)
+ .setBadge(0)
.build())
.build())
.setOptions(Options.newBuilder()
@@ -142,10 +147,6 @@ public class Jpush {
.setApnsProduction(PRO_ENV)//true-推送生产环境 false-推送开发环境（测试使用参数）
.setTimeToLive(LIVE_TIME)//消息在JPush服务器的失效时间（测试使用参数）
.build())
- .setOptions(Options.newBuilder()
- .setApnsProduction(PRO_ENV)//true-推送生产环境 false-推送开发环境（测试使用参数）
- .setTimeToLive(LIVE_TIME)//消息在JPush服务器的失效时间（测试使用参数）
- .build())
.build();
}
@@ -230,8 +231,8 @@ public class Jpush {
public static void main(String[] args) {
// Jpush.pushCustomContentToAll("xxxxqqq！！",Jpush.PUSH_TASK);
// Jpush.pushCustomContentToSomeOne("13262535273","你的消息····来了123ddd!23223!!",Jpush.PUSH_MSG);
-// Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_MSG);
- Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_TASK);
+ Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息MSG 我来了！！！",Jpush.PUSH_MSG);
+// Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_TASK);
// Jpush.pushMessageInfoToAll("您的快递到了，请到楼下取",Jpush.PUSH_TASK);
}
}
diff --git a/src/main/java/com/tianpengtech/front/im/ImController.java b/src/main/java/com/tianpengtech/front/im/ImController.java
index cffa94f..d64b9ad 100644
--- a/src/main/java/com/tianpengtech/front/im/ImController.java
+++ b/src/main/java/com/tianpengtech/front/im/ImController.java
@@ -3,15 +3,14 @@ package com.tianpengtech.front.im;
import com.jfinal.core.Controller;
import com.tianpengtech.common.im.kit.PushKit;
-public class ImController extends Controller{
+public class ImController extends Controller {
- public void index(){
+ public void index() {
renderTemplate("index.html");
}
-
-
- public void pushMsg(){
- String msg= "你好美人！！";
+
+ public void pushMsg() {
+ String msg = "你好美人！！";
PushKit.pushSystemMessage(msg);
renderText(msg);
}
diff --git a/src/main/resources/qiniu.properties b/src/main/resources/qiniu.properties
index e84feee..d55de28 100644
--- a/src/main/resources/qiniu.properties
+++ b/src/main/resources/qiniu.properties
@@ -2,8 +2,8 @@
qiniu.accesskey = PjlZQxB-Fgig0eOX_lifvqRHHxN0TB7crVA-UOFg
qiniu.secretkey = 92vtRIpmXznDkU67tbuo3Dzp-Cd-HrTrjanmEfuc
qiniu.bucket = bosu-web
-qiniu.domain = http://osyy0ckv9.bkt.clouddn.com
-
+#qiniu.domain = http://osyy0ckv9.bkt.clouddn.com
+qiniu.domain = http://pic.ele-young.com
#����
#qiniu.accesskey = -JDM4qj1rwRHp4xQ3A3ThRFygi8u7fMMD6t_oPVj
#qiniu.secretkey = qkE3ci-jgw3hN5GQFjDwOBHxYaLxSRqiPHIzlBxs
diff --git a/src/main/webapp/WEB-INF/view/admin/fairwithdraw/fairwithdraw-reason.html b/src/main/webapp/WEB-INF/view/admin/fairwithdraw/fairwithdraw-reason.html
index 59953a0..26bc75e 100644
--- a/src/main/webapp/WEB-INF/view/admin/fairwithdraw/fairwithdraw-reason.html
+++ b/src/main/webapp/WEB-INF/view/admin/fairwithdraw/fairwithdraw-reason.html
@@ -31,9 +31,7 @@
<div class="row cl">
<label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>拒绝理由</label>
<div class="formControls col-xs-8 col-sm-9">
- <textarea name="content" class="textarea" rows="5" maxlength="40" placeholder="请输入简短的拒绝理由，最多40个字符...，处理失败，提现的金额会退回申请人账户余额。">
- #(content)
- </textarea>
+ <textarea name="content" class="textarea" rows="5" maxlength="40" placeholder="请输入简短的拒绝理由，最多40个字符...，处理失败，提现的金额会退回申请人账户余额。">#(content)</textarea>
</div>
</div>
<div class="row cl">
--
Gitee
From d1f5daec553c8be34897b61ff41380a2d2ecee76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Thu, 8 Mar 2018 11:49:09 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/2dI3Wtkkw9.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 src/main/webapp/2dI3Wtkkw9.txt
diff --git a/src/main/webapp/2dI3Wtkkw9.txt b/src/main/webapp/2dI3Wtkkw9.txt
new file mode 100644
index 0000000..2c329ec
--- /dev/null
+++ b/src/main/webapp/2dI3Wtkkw9.txt
@@ -0,0 +1 @@
+fca7037a6b2302c28c33d01b86efd6e1
\ No newline at end of file
--
Gitee
From 81dfc5adcfa05dd7011e82ece864722b91fa2634 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, 12 Mar 2018 10:56:46 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=BB=E5=8A=A1=E5=9B=BE=E7=89=87=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/tianpengtech/common/MyConfig.java | 2 +-
.../java/com/tianpengtech/common/util/push/Jpush.java | 4 ++--
.../tianpengtech/front/mobile/common/util/UserUtil.java | 1 +
.../front/mobile/task/MobileTaskService.java | 9 +++++++++
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/tianpengtech/common/MyConfig.java b/src/main/java/com/tianpengtech/common/MyConfig.java
index 94f07bb..ad564ae 100644
--- a/src/main/java/com/tianpengtech/common/MyConfig.java
+++ b/src/main/java/com/tianpengtech/common/MyConfig.java
@@ -211,7 +211,7 @@ public class MyConfig extends JFinalConfig {
}
public static void main(String[] args) {
- JFinal.start("src/main/webapp", 8091, "/",5);
+ JFinal.start("src/main/webapp", 8091,"/",5);
}
@Override
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 c59512d..a7c50df 100644
--- a/src/main/java/com/tianpengtech/common/util/push/Jpush.java
+++ b/src/main/java/com/tianpengtech/common/util/push/Jpush.java
@@ -231,8 +231,8 @@ public class Jpush {
public static void main(String[] args) {
// Jpush.pushCustomContentToAll("xxxxqqq！！",Jpush.PUSH_TASK);
// Jpush.pushCustomContentToSomeOne("13262535273","你的消息····来了123ddd!23223!!",Jpush.PUSH_MSG);
- Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息MSG 我来了！！！",Jpush.PUSH_MSG);
-// Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_TASK);
+// Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息MSG 我来了！！！",Jpush.PUSH_MSG);
+ Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_TASK);
// Jpush.pushMessageInfoToAll("您的快递到了，请到楼下取",Jpush.PUSH_TASK);
}
}
diff --git a/src/main/java/com/tianpengtech/front/mobile/common/util/UserUtil.java b/src/main/java/com/tianpengtech/front/mobile/common/util/UserUtil.java
index f1da49c..61912f1 100644
--- a/src/main/java/com/tianpengtech/front/mobile/common/util/UserUtil.java
+++ b/src/main/java/com/tianpengtech/front/mobile/common/util/UserUtil.java
@@ -18,6 +18,7 @@ public class UserUtil {
* @return
*/
public static User getCurrentUser(String token, String source) {
+// token="4304585384ecef7061eb176ffed77f9c";
User user = CacheKit.get(CACHE_NAME,source.toUpperCase()+"_USER_CLIENT_" + token);
if (user != null) {
setCurrentUser( user, token, source);
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 fc9a7da..a8a10f4 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -12,6 +12,7 @@ import com.tianpengtech.common.model.authenticate.Authenticate;
import com.tianpengtech.common.model.dictionary.Dictionary;
import com.tianpengtech.common.model.fair.Fair;
import com.tianpengtech.common.model.task.Task;
+import com.tianpengtech.common.model.task.TaskSource;
import com.tianpengtech.common.model.task.TaskWh;
import com.tianpengtech.common.model.taskscreenshot.TaskScreenShot;
import com.tianpengtech.common.util.DateUtils;
@@ -283,9 +284,16 @@ public class MobileTaskService {
task.put("companyId", companyId);
task.put("companyLogo", logo);
//
+ List<TaskSource> source = taskService.findSourceByTask(task.getInt(Task.ID));
+ for (TaskSource taskSource : source) {
+ String s = taskSource.getStr(TaskSource.SOURCE);
+ s = s+"?imageMogr2/gravity/Center/100x100";
+ taskSource.set(TaskSource.SOURCE, s);
+ }
task.put("task_url", url);
+ task.put("task_count_url", "http://ele-young.com/h5/taskStatistical/analysis2.html?taskId="+task.getInt(Task.ID));
R r = R.ok();
r.p("task", task);
task.put("acceptNum", 0);
@@ -321,6 +329,7 @@ public class MobileTaskService {
f.put("fairUrl",fairUrl);
}
r.p("fairs", fairses);
+ r.p("source", source);
int num = (fairses.isEmpty()) ? 0 : fairses.size();
task.put("acceptNum", num);
// }
--
Gitee
From bf4961dd920d247b7150561b3111b44f11b471e8 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, 12 Mar 2018 19:38:03 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=96=B9?=
=?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../front/mobile/task/MobileTaskService.java | 22 ++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
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 a8a10f4..e97f0e2 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -54,7 +54,7 @@ public class MobileTaskService {
public R taskIndex(int pageNum, int length, long uid) {
boolean isOpenFairLevel=SysConfigDao.ME.isOpenFairLevel();
-
+ R r = R.ok();
String s = String.format("select task.task_type,task.total_fee, task.create_user, %s,%s,%s,%s,%s,%s,%s,%s ", Task.STATUS,
Task.ID, Task.TASK_TITLE, Task.TASK_START_TIME, Task.TASK_END_TIME, Task.TASK_DESCRIPTION,
Task.TASK_PRICE, Task.WH_NUMBER);
@@ -106,8 +106,16 @@ public class MobileTaskService {
t.set("task_price",TaskCalculateService.ME.calculateTaskTotalFee(t));
t.set(Task.TASK_TITLE,XxxUtil.handleContent(t.getStr(Task.TASK_TITLE), 14));
t.set(Task.TASK_DESCRIPTION,XxxUtil.handleContent(t.getStr(Task.TASK_DESCRIPTION),103));
+
+ List<TaskSource> source = taskService.findSourceByTask(t.getInt(Task.ID));
+ for (TaskSource taskSource : source) {
+ String ts = taskSource.getStr(TaskSource.SOURCE);
+ ts = ts+"?imageMogr2/gravity/Center/100x100";
+ taskSource.set(TaskSource.SOURCE, ts);
+ }
+ t.put("source", source);
});
- R r = R.ok();
+
r.p("pageNum", pageNum);
r.p("task", page.getList());
r.p("totalRow", page.getTotalRow());
@@ -219,6 +227,14 @@ public class MobileTaskService {
// t.put("hasApprover", hasApprover);
t.set(Task.TASK_TITLE,XxxUtil.handleContent(t.getStr(Task.TASK_TITLE), 14));
t.set(Task.TASK_DESCRIPTION,XxxUtil.handleContent(t.getStr(Task.TASK_DESCRIPTION),103));
+
+ List<TaskSource> source = taskService.findSourceByTask(t.getInt(Task.ID));
+ for (TaskSource taskSource : source) {
+ String ts = taskSource.getStr(TaskSource.SOURCE);
+ ts = ts+"?imageMogr2/gravity/Center/100x100";
+ taskSource.set(TaskSource.SOURCE, ts);
+ }
+ t.put("source", source);
}
R r = R.ok();
r.p("count", page.getTotalRow());
@@ -293,7 +309,7 @@ public class MobileTaskService {
}
task.put("task_url", url);
- task.put("task_count_url", "http://ele-young.com/h5/taskStatistical/analysis2.html?taskId="+task.getInt(Task.ID));
+ task.put("task_count_url", "http://ele-young.com/h5/taskStatistical/analysis2.html?taskId="+task.getInt(Task.ID)+"&whId="+fair.getInt(Fair.ID));
R r = R.ok();
r.p("task", task);
task.put("acceptNum", 0);
--
Gitee
From fdc576e485cb1f878cdecfd4fda08fa285a0ceb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Wed, 14 Mar 2018 11:41:09 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9A=84=E8=BF=9E=E6=8E=A5=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E5=B8=90=E5=8F=B7=E7=9B=B8=E5=85=B3=E8=AE=BE=E7=BD=AE=E6=96=B9?=
=?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../front/mobile/task/MobileTaskService.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
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 e97f0e2..0e89e9f 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -119,7 +119,11 @@ public class MobileTaskService {
r.p("pageNum", pageNum);
r.p("task", page.getList());
r.p("totalRow", page.getTotalRow());
- r.p("taskTodayNum",taskTodayNum(uid));
+ if(isSpacial(fair.getStr(Fair.MOIBILE))){
+ r.p("taskTodayNum",1000);
+ }else{
+ r.p("taskTodayNum",taskTodayNum(uid));
+ }
return r;
}
@@ -309,7 +313,7 @@ public class MobileTaskService {
}
task.put("task_url", url);
- task.put("task_count_url", "http://ele-young.com/h5/taskStatistical/analysis2.html?taskId="+task.getInt(Task.ID)+"&whId="+fair.getInt(Fair.ID));
+ task.put("task_count_url", "http://ele-young.com/h5/appTaskStatistical/analysis.html?taskId="+task.getInt(Task.ID)+"&whId="+fair.getInt(Fair.ID));
R r = R.ok();
r.p("task", task);
task.put("acceptNum", 0);
@@ -404,7 +408,10 @@ public class MobileTaskService {
Dictionary dictionary = DictionaryDao.ME.readDirecotryByCode(Dictionary.SYS_APPLY_NUM);
int applyNum = Integer.parseInt(dictionary.getStr(Dictionary.NAME));
List<TaskWh> wh_tasks = queryFairWhTasksToday(uid);
- if(wh_tasks.size()>=applyNum){
+
+ //添加特殊帐号，让其无限接受任务
+
+ if(wh_tasks.size()>=applyNum && (!isSpacial(fair.getStr(Fair.MOIBILE)))){
r = R.fail("你每天只能接受"+applyNum+"个任务");
return r;
}
@@ -431,6 +438,11 @@ public class MobileTaskService {
}
return r;
}
+
+ private boolean isSpacial(String mobile){
+ String special="18268114484,18721608514,15720605907,13819492790,13262535273";
+ return special.contains(mobile);
+ }
public R isExistFairTask(String taskId, long uid) {
R r;
--
Gitee
From 16c36e2039d6f20c29d36c843719cbac2638dc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Wed, 14 Mar 2018 18:55:12 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/fairwithdraw/FairWithdrawAdminServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
index e11b1e3..74e21cb 100644
--- a/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
+++ b/src/main/java/com/tianpengtech/admin/fairwithdraw/FairWithdrawAdminServiceImpl.java
@@ -66,8 +66,8 @@ public class FairWithdrawAdminServiceImpl extends AbstractAdmin implements IAdmi
public void changeStatus(Model<?> model, long id, int status, Kv params) throws ValidateException {
FairWithdraw temp = FairWithdraw.dao.findById(id);
- if(temp.getInt(FairWithdraw.STATUS)==FairWithdraw.STATUS_ERROR){
- throw new ValidateException("当前状态已经是处理失败状态，请勿重复当前操作");
+ if(temp.getInt(FairWithdraw.STATUS)!=FairWithdraw.STATUS_APPROVING){
+ throw new ValidateException("当前记录已经被处理过了，请勿重复当前操作");
}
String content = params.getStr(Opertion.CONTENT);
--
Gitee
From 37ea4769ceb5d041e43cc758dea0aac76ecf6c6f 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, 20 Mar 2018 23:53:42 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=8E=92=E8=A1=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/tianpengtech/front/mobile/task/MobileTaskService.java | 1 +
1 file changed, 1 insertion(+)
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 0e89e9f..6fd82be 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -361,6 +361,7 @@ public class MobileTaskService {
String photo = ((fair.getStr(Fair.PHOTO).equals("/upload/avatar/x.jpg")) ? defaultAvatar
: fair.getStr(Fair.PHOTO));
task.put("myAvatar",photo);
+ task.put("wh_id",uid);
return r;
}
--
Gitee
From 34661a09b296b042eeff6c1a0375b4bbd5196099 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, 27 Mar 2018 09:13:10 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?=
=?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=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/common/constant/Constant.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/tianpengtech/front/mobile/common/constant/Constant.java b/src/main/java/com/tianpengtech/front/mobile/common/constant/Constant.java
index d3fbabe..62eeaef 100644
--- a/src/main/java/com/tianpengtech/front/mobile/common/constant/Constant.java
+++ b/src/main/java/com/tianpengtech/front/mobile/common/constant/Constant.java
@@ -7,7 +7,7 @@ public class Constant {
public static final String DEFAULT_PASSWORD = "zxc@#@$6";
- public static final String REGEX_MOBILE = "^((17[0-9])|(14[0-9])|(13[0-9])|(15[^4,\\D])|(18[0-9]))\\d{8}$";
+ public static final String REGEX_MOBILE = "^(|(16[0-9])|(17[0-9])|(14[0-9])|(13[0-9])|(15[^4,\\D])|(18[0-9]))\\d{8}$";
public static final String REGEX_INTERGER = "^\\d+$";
public static final String REGEX_MONEY = "(^[1-9]([0-9]+)?(\\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\\.[0-9]([0-9])?$)";
}
--
Gitee
From 216529f3bb133f8752cba80820685af7e1a8ad7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E6=89=BF=E6=B7=9E?= <644344980@qq.com>
Date: Wed, 28 Mar 2018 00:00:00 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8E=A8=E9=80=81?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/task/TaskAdminServiceImpl.java | 2 +-
.../common/model/fairreport/FairReport.java | 23 +++++++++----------
.../tianpengtech/common/model/task/Task.java | 10 ++++----
.../tianpengtech/common/util/push/Jpush.java | 16 +++++++------
4 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java b/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java
index d842ad7..284cc3a 100644
--- a/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java
+++ b/src/main/java/com/tianpengtech/admin/task/TaskAdminServiceImpl.java
@@ -111,7 +111,7 @@ public class TaskAdminServiceImpl extends AbstractAdmin implements IAdminOpt{
PushKit.pushSystemMessageNow("管理员"+result);
OperationDao.ME.recordLog(id, Opertion.OPT_TASK_LOG,userId,result);
Jpush.pushCustomContentToAll("任务《"+temp.getStr(Task.TASK_TITLE)+"》发布啦，快来接任务吧！",Jpush.PUSH_TASK);
- Jpush.pushMessageInfoToAll("任务《"+temp.getStr(Task.TASK_TITLE)+"》发布啦，快来接任务吧！",Jpush.PUSH_TASK);
+ Jpush.pushMessageInfoToAll("任务《"+temp.getStr(Task.TASK_TITLE)+"》发布啦，快来接任务吧！",Jpush.PUSH_TASK,id+"");
if(SysConfigDao.ME.isSendTaskSMS()){
List<Fair> fairs = readAllFair();
diff --git a/src/main/java/com/tianpengtech/common/model/fairreport/FairReport.java b/src/main/java/com/tianpengtech/common/model/fairreport/FairReport.java
index a41e1c1..afc02c1 100644
--- a/src/main/java/com/tianpengtech/common/model/fairreport/FairReport.java
+++ b/src/main/java/com/tianpengtech/common/model/fairreport/FairReport.java
@@ -1,12 +1,13 @@
package com.tianpengtech.common.model.fairreport;
+
import com.tianpengtech.common.model.AbstractBaseModel;
+
/**
- *实体类名-举报信息表
- * fair_report
+ * 实体类名-举报信息表 fair_report
*
* @since Sat Aug 05 13:55:06 CST 2017
*/
-public class FairReport extends AbstractBaseModel< FairReport > {
+public class FairReport extends AbstractBaseModel<FairReport> {
/**
*
@@ -14,15 +15,13 @@ public class FairReport extends AbstractBaseModel< FairReport > {
private static final long serialVersionUID = 1L;
public static final FairReport dao = new FairReport();
-
- public static final String ID ="id"; //
- public static final String CONTENT ="content"; //举报内容
- public static final String CREATE_TIME ="create_time"; //
- public static final String STATUS ="status"; //状态
- public static final String USER_ID ="user_id"; //被举报人ID
- public static final String FAIR_ID ="fair_id"; //举报人ID
- public static final String CONTENT_ID ="content_id"; //数据字典表ID，如果该字段为空则填入content字段
-
+ public static final String ID = "id"; //
+ public static final String CONTENT = "content"; // 举报内容
+ public static final String CREATE_TIME = "create_time"; //
+ public static final String STATUS = "status"; // 状态
+ public static final String USER_ID = "user_id"; // 被举报人ID
+ public static final String FAIR_ID = "fair_id"; // 举报人ID
+ public static final String CONTENT_ID = "content_id"; // 数据字典表ID，如果该字段为空则填入content字段
@Override
public String tableName() {
diff --git a/src/main/java/com/tianpengtech/common/model/task/Task.java b/src/main/java/com/tianpengtech/common/model/task/Task.java
index 2522bc4..61e3656 100644
--- a/src/main/java/com/tianpengtech/common/model/task/Task.java
+++ b/src/main/java/com/tianpengtech/common/model/task/Task.java
@@ -59,11 +59,11 @@ public class Task extends AbstractBaseModel<Task> {
public static final int SUCCESS_YES=1;
- public static final int STATUS_APPROVING=1;
- public static final int STATUS_SUCCESS=2;
- public static final int STATUS_FAILURE=3;
- public static final int STATUS_WAIT=4;
- public static final int STATUS_START=5;
+ public static final int STATUS_APPROVING=1;//等待审核
+ public static final int STATUS_SUCCESS=2;//通过审核
+ public static final int STATUS_FAILURE=3;//拒绝通过审核
+ public static final int STATUS_WAIT=4;//未开始
+ public static final int STATUS_START=5;//进行中
public static final int STATUS_COMPLETED=6; //已完成
public static final int DELETE_STATUS_YES=1;
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 a7c50df..db2e27f 100644
--- a/src/main/java/com/tianpengtech/common/util/push/Jpush.java
+++ b/src/main/java/com/tianpengtech/common/util/push/Jpush.java
@@ -63,8 +63,8 @@ public class Jpush {
}
}
- public static void pushMessageInfoToAll(String ALERT,String type){
- PushResult result = jPushMessageInfoToAll(ALERT,type);
+ public static void pushMessageInfoToAll(String ALERT,String type,String taskId){
+ PushResult result = jPushMessageInfoToAll(ALERT,type,taskId);
if(result != null && result.isResultOK()){
log.info("信息推送成功！");
}else{
@@ -88,7 +88,7 @@ public class Jpush {
}
- private static PushPayload customMessageInfoPushToAll(String title,String type){
+ private static PushPayload customMessageInfoPushToAll(String title,String type,String taskId){
Map<String,String> param = new HashMap<String,String>();
param.put("type", type);
return PushPayload.newBuilder()
@@ -97,10 +97,12 @@ public class Jpush {
.setNotification(Notification.newBuilder()
.addPlatformNotification(AndroidNotification.newBuilder()
.addExtra("type",type)
+ .addExtra("taskId",taskId)
.setAlert(title)
.build())
.addPlatformNotification(IosNotification.newBuilder()
.addExtra("type",type)
+ .addExtra("taskId",taskId)
.setAlert(title)
.setBadge(0)
.build())
@@ -209,10 +211,10 @@ public class Jpush {
}
}
- private static PushResult jPushMessageInfoToAll(String title,String type){
+ private static PushResult jPushMessageInfoToAll(String title,String type,String taskId){
ClientConfig clientConfig = ClientConfig.getInstance();
JPushClient jpushClient = new JPushClient(masterSecret, appKey, null, clientConfig);
- PushPayload payload = customMessageInfoPushToAll(title,type);
+ PushPayload payload = customMessageInfoPushToAll(title,type,taskId);
try {
return jpushClient.sendPush(payload);
} catch (APIConnectionException e) {
@@ -232,7 +234,7 @@ public class Jpush {
// Jpush.pushCustomContentToAll("xxxxqqq！！",Jpush.PUSH_TASK);
// Jpush.pushCustomContentToSomeOne("13262535273","你的消息····来了123ddd!23223!!",Jpush.PUSH_MSG);
// Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息MSG 我来了！！！",Jpush.PUSH_MSG);
- Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_TASK);
-// Jpush.pushMessageInfoToAll("您的快递到了，请到楼下取",Jpush.PUSH_TASK);
+// Jpush.pushMessageInfoToSomeOne("13262535273","我是服务器通知信息 我来了！！！",Jpush.PUSH_TASK);
+ Jpush.pushMessageInfoToAll("您的快递到了，请到楼下取",Jpush.PUSH_TASK,"3128");
}
}
--
Gitee