From ff608d8c9e3e1d85088bc22f2070289d88b37fc3 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, 7 Sep 2017 00:16:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E5=92=8C=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../passport/MobilePassportController.java | 16 ++++++++++++++++
.../mobile/passport/MobilePassportService.java | 7 +++++++
.../front/mobile/region/RegionService.java | 6 ++++++
.../front/mobile/task/MobileTaskService.java | 10 +++++++---
4 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportController.java b/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportController.java
index 1411a70..d5d05b6 100644
--- a/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportController.java
+++ b/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportController.java
@@ -3,12 +3,15 @@ package com.tianpengtech.front.mobile.passport;
import com.jfinal.aop.Before;
import com.jfinal.kit.StrKit;
import com.jfinal.plugin.activerecord.tx.Tx;
+import com.jfinal.upload.UploadFile;
import com.tianpengtech.common.model.user.User;
+import com.tianpengtech.common.util.QiNiuUtil;
import com.tianpengtech.front.mobile.common.util.R;
import com.tianpengtech.front.mobile.common.util.U;
import com.tianpengtech.front.mobile.common.util.UserUtil;
import com.tianpengtech.front.web.common.controller.BaseController;
+import java.io.FileInputStream;
import java.util.HashMap;
import java.util.Map;
@@ -229,4 +232,17 @@ public class MobilePassportController extends BaseController{
r.p("isSetTransPwd",result);
renderJson(r);
}
+
+
+ public void uploadAvatar() throws Exception {
+ UploadFile upfile=getFile();
+ try {
+ String upload = QiNiuUtil.upload(new FileInputStream(upfile.getFile()));
+ upfile.getFile().delete();
+ R r = R.ok("成功");
+ r.p("savepath",upload);
+ } catch (Exception e) {
+ throw e;
+ }
+ }
}
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 7cc7e1e..a4d428f 100644
--- a/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/passport/MobilePassportService.java
@@ -19,6 +19,7 @@ import com.tianpengtech.front.mobile.bankno.MobileBanknoService;
import com.tianpengtech.front.mobile.common.util.R;
import com.tianpengtech.front.mobile.common.util.TokenUtil;
import com.tianpengtech.front.mobile.common.util.U;
+import com.tianpengtech.front.mobile.region.RegionService;
import com.tianpengtech.front.web.fair.FairService;
import java.util.*;
@@ -183,6 +184,12 @@ public class MobilePassportService {
r.p("fair","");
return r;
}
+
+ Record province = RegionService.me.findById(fair.getStr(Fair.PROVINCE));
+ Record city = RegionService.me.findById(fair.getStr(Fair.CITY));
+
+ fair.put("provinceStr",province.getStr("REGION_NAME"));
+ fair.put("cityStr",city.getStr("REGION_NAME"));
fair.remove(Fair.DELETETAG);
fair.remove(Fair.ID_CARD);
String tran=fair.get(Fair.TRAN_PWD);
diff --git a/src/main/java/com/tianpengtech/front/mobile/region/RegionService.java b/src/main/java/com/tianpengtech/front/mobile/region/RegionService.java
index 43cc284..ce24bd1 100644
--- a/src/main/java/com/tianpengtech/front/mobile/region/RegionService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/region/RegionService.java
@@ -28,4 +28,10 @@ public class RegionService {
r.p("city",list);
return r;
}
+
+
+ public Record findById(String id ){
+ String sql= "select * from region where REGION_ID=?";
+ return Db.findFirst(sql,id);
+ }
}
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 9b3ad1b..db63a74 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -38,15 +38,18 @@ public class MobileTaskService {
*/
public R taskIndex(int pageNum, int length,long uid){
String s=String.format("select %s,%s,%s,%s,%s,%s,%s ",Task.ID,Task.TASK_TITLE,Task.TASK_START_TIME,Task.TASK_END_TIME,Task.TASK_DESCRIPTION,Task.TASK_PRICE,Task.WH_NUMBER);
- String sql=String.format(" from %s task where (task.%s=? and task.%s>?) and task.%s=? and task.%s=? and task.%s not in(select %s from %s tw where tw.%s=?)",
- taskDao.tableName(),Task.STATUS,Task.TASK_START_TIME,Task.DELETETAG,Task.EXTENSION_TYPE,Task.ID,TaskWh.TASK_ID,TaskWh.dao.tableName(),TaskWh.WH_ID);
+ String sql=String.format(" from %s task where (task.%s=? and task.%s>=?) and task.%s=? and task.%s=? "
+ + "and task.%s not in(select %s from %s tw where tw.%s=?)",
+ taskDao.tableName(),Task.STATUS,Task.TASK_START_TIME,Task.DELETETAG,
+ Task.EXTENSION_TYPE,Task.ID,TaskWh.TASK_ID,TaskWh.dao.tableName(),TaskWh.WH_ID);
Page<Task> page=taskDao.paginate(pageNum,length,s,sql,new Object[]{Task.STATUS_SUCCESS,new Date(),Task.DELETE_STATUS_NO,Task.EXT_TYPE_RL,uid});
page.getList().forEach( t ->{
t.put("rece",t.getRece());
t.put("dateString",t.getDateString());
});
R r = R.ok();
- r.p("task",page);
+ r.p("pageNum",pageNum);
+ r.p("task",page.getList());
return r;
}
@@ -143,4 +146,5 @@ public class MobileTaskService {
return R.fail(ret.getStr("msg"));
}
}
+
}
--
Gitee
From 8030f781c09ea4f3d76c31129b75e488a5d55300 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, 7 Sep 2017 01:46:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=8E=A5?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=95=B0=E9=87=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mobile/task/MobileTaskController.java | 6 ++++++
.../front/mobile/task/MobileTaskService.java | 19 ++++++++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskController.java b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskController.java
index 19dd3d2..c023d49 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskController.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskController.java
@@ -69,4 +69,10 @@ public class MobileTaskController extends BaseController {
R r=service.acceptTask(id,user.getLong(User.ID));
renderJson(r);
}
+
+ public void canAcceptTaskNum(){
+// User user= UserUtil.getCurrentUser(getPara("token"),getHeader("source"));
+ R r = service.canAcceptTaskNum(46);
+ 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 db63a74..ee7d8f9 100644
--- a/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
+++ b/src/main/java/com/tianpengtech/front/mobile/task/MobileTaskService.java
@@ -9,6 +9,7 @@ import com.tianpengtech.common.model.task.Task;
import com.tianpengtech.common.model.task.TaskWh;
import com.tianpengtech.common.search.EqualCondition;
import com.tianpengtech.common.search.QueryConstructor;
+import com.tianpengtech.common.util.DateUtils;
import com.tianpengtech.front.mobile.common.util.R;
import com.tianpengtech.front.web.task.TaskService;
@@ -42,7 +43,9 @@ public class MobileTaskService {
+ "and task.%s not in(select %s from %s tw where tw.%s=?)",
taskDao.tableName(),Task.STATUS,Task.TASK_START_TIME,Task.DELETETAG,
Task.EXTENSION_TYPE,Task.ID,TaskWh.TASK_ID,TaskWh.dao.tableName(),TaskWh.WH_ID);
- Page<Task> page=taskDao.paginate(pageNum,length,s,sql,new Object[]{Task.STATUS_SUCCESS,new Date(),Task.DELETE_STATUS_NO,Task.EXT_TYPE_RL,uid});
+ String startDate = DateUtils.formateData(new Date(), DateUtils.YYMMdd_FORMAT);
+ startDate = startDate+" 00:00:00";
+ Page<Task> page=taskDao.paginate(pageNum,length,s,sql,new Object[]{Task.STATUS_SUCCESS,startDate,Task.DELETE_STATUS_NO,Task.EXT_TYPE_RL,uid});
page.getList().forEach( t ->{
t.put("rece",t.getRece());
t.put("dateString",t.getDateString());
@@ -50,10 +53,24 @@ public class MobileTaskService {
R r = R.ok();
r.p("pageNum",pageNum);
r.p("task",page.getList());
+ r.p("totalRow",page.getTotalRow());
return r;
}
+ public R canAcceptTaskNum(long uid){
+
+ String sql=String.format(" select count(id) as id from %s task where (task.%s=? and task.%s>=?) and task.%s=? and task.%s=? "
+ + "and task.%s not in(select %s from %s tw where tw.%s=?)",
+ taskDao.tableName(),Task.STATUS,Task.TASK_START_TIME,Task.DELETETAG,
+ Task.EXTENSION_TYPE,Task.ID,TaskWh.TASK_ID,TaskWh.dao.tableName(),TaskWh.WH_ID);
+ R r = R.ok();
+ String startDate = DateUtils.formateData(new Date(), DateUtils.YYMMdd_FORMAT);
+ startDate = startDate+" 00:00:00";
+ Task task = taskDao.dao().findFirst(sql,new Object[]{Task.STATUS_SUCCESS,startDate,Task.DELETE_STATUS_NO,Task.EXT_TYPE_RL,uid});
+ r.p("totalRow",task.getLong("id"));
+ return r;
+ }
--
Gitee
From 3fd2fda79efbddb8ad0b5c6e375604f4b3695c06 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, 7 Sep 2017 01:48:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fairadvertisement/FairAdvertisement.java | 32 -------------------
1 file changed, 32 deletions(-)
delete mode 100644 E:/project/fair/src/main/java/com/tianpengtech/common/model/fairadvertisement/FairAdvertisement.java
diff --git a/E:/project/fair/src/main/java/com/tianpengtech/common/model/fairadvertisement/FairAdvertisement.java b/E:/project/fair/src/main/java/com/tianpengtech/common/model/fairadvertisement/FairAdvertisement.java
deleted file mode 100644
index 1388c1d..0000000
--- a/E:/project/fair/src/main/java/com/tianpengtech/common/model/fairadvertisement/FairAdvertisement.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.tianpengtech.common.model.fairadvertisement;
-import com.tianpengtech.common.model.AbstractBaseModel;
-/**
- *实体类名-广告信息表
- * fair_advertisement
- *
- * @since Sat Sep 02 09:01:55 HKT 2017
- */
-public class FairAdvertisement extends AbstractBaseModel< FairAdvertisement > {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- public static final FairAdvertisement dao = new FairAdvertisement();
-
-
- public static final String ID ="id"; //
- public static final String PICTURE ="picture"; //广告图片
- public static final String URL ="url"; //点击url
- public static final String DELETETAG ="deletetag"; //
- public static final String CREATE_TIME ="create_time"; //添加时间
- public static final String SORT ="sort"; //
- public static final String NAME ="name"; //广告图片名称
-
-
- @Override
- public String tableName() {
- return "fair_advertisement";
- }
-
-}
\ No newline at end of file
--
Gitee