张延森 hace 5 años
padre
commit
f86e814451

+ 1
- 1
src/main/java/com/huiju/estateagents/base/ResponseBean.java Ver fichero

@@ -49,7 +49,7 @@ public class ResponseBean<T> implements Serializable {
49 49
     }
50 50
     
51 51
     public void addError(String message) {
52
-        this.code = ResponseBean.ERROR_AUTH_FAIL;
52
+        this.code = ResponseBean.ERROR_UNAVAILABLE;
53 53
         this.message = message;
54 54
     }
55 55
     

+ 5
- 0
src/main/java/com/huiju/estateagents/common/DateUtils.java Ver fichero

@@ -23,6 +23,11 @@ public class DateUtils {
23 23
         return dt.format(formatter);
24 24
     }
25 25
 
26
+    public static String today() {
27
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
28
+        return LocalDateTime.now().format(formatter);
29
+    }
30
+
26 31
     public static LocalDateTime day2LocalDateime(String day) {
27 32
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
28 33
         return LocalDateTime.parse(day + " 00:00:00",df);

+ 35
- 14
src/main/java/com/huiju/estateagents/controller/TaCheckinController.java Ver fichero

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7
 import com.huiju.estateagents.base.BaseController;
8 8
 import com.huiju.estateagents.base.ResponseBean;
9
+import com.huiju.estateagents.common.DateUtils;
9 10
 import com.huiju.estateagents.common.JWTUtils;
10 11
 import com.huiju.estateagents.entity.TaCheckin;
11 12
 import com.huiju.estateagents.entity.TaPerson;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
17 18
 import org.springframework.web.bind.annotation.*;
18 19
 
19 20
 import javax.servlet.http.HttpServletRequest;
21
+import javax.servlet.http.HttpServletResponse;
20 22
 import java.time.LocalDateTime;
21 23
 import java.util.List;
22 24
 
@@ -50,22 +52,42 @@ public class TaCheckinController extends BaseController {
50 52
     @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.GET)
51 53
     public ResponseBean taCheckinList(@PathVariable String activity,
52 54
                                       @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
53
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
54
-        ResponseBean responseBean = new ResponseBean();
55
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
56
+                                      @RequestParam(value ="today",defaultValue = "false") Boolean today,
57
+                                      @RequestParam(value = "newRecord", defaultValue = "false") Boolean newRecord,
58
+                                      HttpServletResponse response){
59
+
60
+        // 此接口允許跨域
61
+        response.setHeader("Access-Control-Allow-Origin", "*");
62
+
55 63
         try {
64
+            Integer status = !newRecord ? 1 : 0;
65
+            LocalDateTime dayBegin = null;
66
+            if (today) {
67
+                String theDay = DateUtils.today();
68
+                dayBegin = DateUtils.day2LocalDateime(theDay);
69
+            }
70
+
56 71
             //使用分页插件
57 72
 		    IPage<TaCheckin> pg = new Page<>(pageNum, pageSize);
58
-            IPage<TaCheckin> result = iTaCheckinService.getUndisplayedCustomerList(pg,activity);
59
-            for (int i = 0;i<result.getRecords().size();i++){
60
-                result.getRecords().get(i).setStatus(1);
73
+            IPage<TaCheckin> result = iTaCheckinService.getCheckinCustomerList(pg,activity, status, dayBegin);
74
+
75
+            if (newRecord) {
76
+                for (int i = 0;i<result.getRecords().size();i++){
77
+                    result.getRecords().get(i).setStatus(1);
78
+                }
79
+
80
+                if (result.getRecords().size() > 0) {
81
+                    iTaCheckinService.updateBatchById(result.getRecords());
82
+                }
61 83
             }
62
-            iTaCheckinService.updateBatchById(result.getRecords());
63
-            responseBean.success(result);
84
+
85
+            return ResponseBean.success(result);
64 86
         }catch (Exception e){
87
+            e.printStackTrace();
65 88
             logger.error("taCheckinList -=- {}",e.toString());
66
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
89
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
67 90
         }
68
-        return responseBean;
69 91
     }
70 92
 
71 93
     /**
@@ -86,7 +108,7 @@ public class TaCheckinController extends BaseController {
86 108
 
87 109
         try {
88 110
             if(iTaCheckinService.isCustomerChecked(activity,person.getPersonId())>0){
89
-                ResponseBean.success("您已签到过此活动");
111
+                return ResponseBean.success("您已签到过此活动");
90 112
             }else {
91 113
                 TaCheckin taCheckin = new TaCheckin();
92 114
                 taCheckin.setStatus(0);
@@ -96,17 +118,16 @@ public class TaCheckinController extends BaseController {
96 118
                 taCheckin.setAvatar(person.getAvatarurl());
97 119
                 taCheckin.setCheckinTime(LocalDateTime.now());
98 120
                 if (iTaCheckinService.save(taCheckin)){
99
-                    responseBean.success(taCheckin);
121
+                    return ResponseBean.success(taCheckin);
100 122
                 }else {
101
-                    responseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
123
+                    return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
102 124
                 }
103 125
             }
104 126
 
105 127
         }catch (Exception e){
106 128
             logger.error("taCheckinAdd -=- {}",e.toString());
107
-            responseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
129
+            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
108 130
         }
109
-        return responseBean;
110 131
     }
111 132
 
112 133
     @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")

+ 13
- 22
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Ver fichero

@@ -50,7 +50,6 @@ public class TaPersonVisitRecordController extends BaseController {
50 50
     @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.GET)
51 51
     public ResponseBean taPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 52
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
53
-        ResponseBean responseBean = new ResponseBean();
54 53
         try {
55 54
             //使用分页插件
56 55
 		    IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
@@ -58,12 +57,11 @@ public class TaPersonVisitRecordController extends BaseController {
58 57
             queryWrapper.orderByDesc("create_date");
59 58
 
60 59
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.page(pg, queryWrapper);
61
-            responseBean.success(result);
60
+            return ResponseBean.success(result);
62 61
         }catch (Exception e){
63 62
             logger.error("taPersonVisitRecordList -=- {}",e.toString());
64
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
63
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
65 64
         }
66
-        return responseBean;
67 65
     }
68 66
 
69 67
     /**
@@ -73,7 +71,6 @@ public class TaPersonVisitRecordController extends BaseController {
73 71
      */
74 72
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
75 73
     public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
76
-        ResponseBean responseBean = new ResponseBean();
77 74
         String openid = JWTUtils.getSubject(request);
78 75
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
79 76
         if (null == taPersons || taPersons.size() != 1) {
@@ -84,15 +81,14 @@ public class TaPersonVisitRecordController extends BaseController {
84 81
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
85 82
         try {
86 83
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
87
-                responseBean.success(taPersonVisitRecord);
84
+                return ResponseBean.success(taPersonVisitRecord);
88 85
             }else {
89
-                responseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
86
+                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
90 87
             }
91 88
         }catch (Exception e){
92 89
             logger.error("taPersonVisitRecordAdd -=- {}",e.toString());
93
-            responseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
90
+            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
94 91
         }
95
-        return responseBean;
96 92
     }
97 93
 
98 94
     /**
@@ -102,18 +98,16 @@ public class TaPersonVisitRecordController extends BaseController {
102 98
     @ResponseBody
103 99
     @RequestMapping(value="/taPersonVisitRecord/{id}", method= RequestMethod.DELETE)
104 100
     public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id){
105
-        ResponseBean responseBean = new ResponseBean();
106 101
         try {
107 102
             if(iTaPersonVisitRecordService.removeById(id)){
108
-                responseBean.success("success");
103
+                return ResponseBean.success("success");
109 104
             }else {
110
-                responseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
105
+                return ResponseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
111 106
             }
112 107
         }catch (Exception e){
113 108
             logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
114
-            responseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
109
+            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
115 110
         }
116
-        return responseBean;
117 111
     }
118 112
 
119 113
     /**
@@ -132,15 +126,14 @@ public class TaPersonVisitRecordController extends BaseController {
132 126
         taPersonVisitRecord.setVisitDuration(duation.intValue());
133 127
         try {
134 128
             if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
135
-                responseBean.success(taPersonVisitRecord);
129
+                return ResponseBean.success(taPersonVisitRecord);
136 130
             }else {
137
-                responseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
131
+                return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
138 132
             }
139 133
         }catch (Exception e){
140 134
             logger.error("taPersonVisitRecordUpdate -=- {}",e.toString());
141
-            responseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
135
+            return ResponseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
142 136
         }
143
-        return responseBean;
144 137
     }
145 138
 
146 139
     /**
@@ -149,13 +142,11 @@ public class TaPersonVisitRecordController extends BaseController {
149 142
      */
150 143
     @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.GET)
151 144
     public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id){
152
-        ResponseBean responseBean = new ResponseBean();
153 145
         try {
154
-            responseBean.success(iTaPersonVisitRecordService.getById(id));
146
+            return ResponseBean.success(iTaPersonVisitRecordService.getById(id));
155 147
         }catch (Exception e){
156 148
             logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
157
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
149
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
158 150
         }
159
-        return responseBean;
160 151
     }
161 152
 }

+ 6
- 12
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Ver fichero

@@ -88,7 +88,6 @@ public class TaRecommendCustomerController extends BaseController {
88 88
 
89 89
     @PostMapping("/wx/customer/recommend")
90 90
     public ResponseBean getUnSignedCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
91
-        ResponseBean responseBean = new ResponseBean();
92 91
         String openid = JWTUtils.getSubject(request);
93 92
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
94 93
         if (null == taPersons || taPersons.size() != 1) {
@@ -97,38 +96,33 @@ public class TaRecommendCustomerController extends BaseController {
97 96
         TaPerson person = taPersons.get(0);
98 97
         String buildingId = "";
99 98
         try{
100
-            responseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
99
+            return ResponseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
101 100
         }catch (Exception e){
102 101
             e.printStackTrace();
103
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
102
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
104 103
         }
105
-        return responseBean;
106 104
     }
107 105
 
108 106
     @PostMapping("/customer/recommend")
109 107
     public ResponseBean getCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize){
110
-        ResponseBean responseBean = new ResponseBean();
111 108
         try{
112 109
             String buildingId="";
113
-            responseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
110
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
114 111
         }catch (Exception e){
115 112
             e.printStackTrace();
116
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
113
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
117 114
         }
118
-        return responseBean;
119 115
     }
120 116
 
121 117
     @PostMapping("/customer/recommend/{customerId}")
122 118
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,String customerId){
123
-        ResponseBean responseBean = new ResponseBean();
124 119
         String buildingId="";
125 120
         try{
126
-            responseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
121
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
127 122
         }catch (Exception e){
128 123
             e.printStackTrace();
129
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
124
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
130 125
         }
131
-        return responseBean;
132 126
     }
133 127
 
134 128
         /**

+ 3
- 1
src/main/java/com/huiju/estateagents/mapper/TaCheckinMapper.java Ver fichero

@@ -7,6 +7,8 @@ import com.huiju.estateagents.entity.TaCheckin;
7 7
 import org.apache.ibatis.annotations.Mapper;
8 8
 import org.apache.ibatis.annotations.Param;
9 9
 
10
+import java.time.LocalDateTime;
11
+
10 12
 /**
11 13
  * <p>
12 14
  *   Mapper 接口
@@ -17,7 +19,7 @@ import org.apache.ibatis.annotations.Param;
17 19
  */
18 20
 @Mapper
19 21
 public interface TaCheckinMapper extends BaseMapper<TaCheckin> {
20
-    IPage<TaCheckin>getUndisplayedCustomerList(IPage<TaCheckin> pg, @Param("activity")String activity);
22
+    IPage<TaCheckin> getCheckinCustomerList(IPage<TaCheckin> pg, @Param("activity")String activity, @Param("status") Integer status, @Param("checkinTime") LocalDateTime checkinTime);
21 23
     Integer isCustomerChecked(@Param("activity")String activity,@Param("personId")String personId);
22 24
 
23 25
 }

+ 3
- 1
src/main/java/com/huiju/estateagents/service/ITaCheckinService.java Ver fichero

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.service.IService;
6 6
 import com.huiju.estateagents.entity.TaCheckin;
7 7
 
8
+import java.time.LocalDateTime;
9
+
8 10
 /**
9 11
  * <p>
10 12
  *   服务类
@@ -14,7 +16,7 @@ import com.huiju.estateagents.entity.TaCheckin;
14 16
  * @since 2019-07-24
15 17
  */
16 18
 public interface ITaCheckinService extends IService<TaCheckin> {
17
-    IPage<TaCheckin> getUndisplayedCustomerList(IPage<TaCheckin> pg,String activity);
19
+    IPage<TaCheckin> getCheckinCustomerList(IPage<TaCheckin> pg, String activity, Integer status, LocalDateTime dayBegin);
18 20
     Integer isCustomerChecked(String activity,String personId);
19 21
 
20 22
 }

+ 4
- 2
src/main/java/com/huiju/estateagents/service/impl/TaCheckinServiceImpl.java Ver fichero

@@ -8,6 +8,8 @@ import com.huiju.estateagents.service.ITaCheckinService;
8 8
 import org.springframework.beans.factory.annotation.Autowired;
9 9
 import org.springframework.stereotype.Service;
10 10
 
11
+import java.time.LocalDateTime;
12
+
11 13
 /**
12 14
  * <p>
13 15
  *   服务实现类
@@ -22,8 +24,8 @@ public class TaCheckinServiceImpl extends ServiceImpl<TaCheckinMapper, TaCheckin
22 24
     TaCheckinMapper taCheckinMapper;
23 25
 
24 26
     @Override
25
-    public IPage<TaCheckin> getUndisplayedCustomerList(IPage<TaCheckin> pg,String activity){
26
-        return taCheckinMapper.getUndisplayedCustomerList(pg,activity);
27
+    public IPage<TaCheckin> getCheckinCustomerList(IPage<TaCheckin> pg, String activity, Integer status, LocalDateTime dayBegin){
28
+        return taCheckinMapper.getCheckinCustomerList(pg, activity, status, dayBegin);
27 29
     }
28 30
 
29 31
     @Override

+ 8
- 0
src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java Ver fichero

@@ -54,7 +54,15 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
54 54
 	public String exchangeGoods(Integer id, String openid) {
55 55
 		//插入积分消耗流水,要查看积分是否足够兑换
56 56
 		TaPerson taPerson = taPersonMapper.getPersonByOpenId(openid).get(0);
57
+		if (null == taPerson.getPoints()) {
58
+			taPerson.setPoints(0);
59
+		}
60
+
57 61
 		TaGoods taGoods = taGoodsMapper.selectById(id);
62
+		if (null == taGoods.getPointPrice()) {
63
+			taGoods.setPointPrice(0);
64
+		}
65
+
58 66
 		//判断积分是否足够
59 67
 		if (taPerson.getPoints() < taGoods.getPointPrice()){
60 68
 			return "积分不足,请先获取积分";

+ 4
- 4
src/main/resources/application-test.yml Ver fichero

@@ -1,12 +1,12 @@
1 1
 server:
2
-  port: 8080
2
+  port: 8566
3 3
 spring:
4 4
   application:
5 5
     name: estateagents
6 6
   datasource:
7 7
     username: estateagents
8 8
     password: DQ@0lW##kBb2+-jPZ
9
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
9
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_t?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10 10
     driver-class-name: com.mysql.cj.jdbc.Driver
11 11
     initial-size: 10 # 初始化连接数
12 12
     max-active: 20 # 最大连接数
@@ -25,8 +25,8 @@ mybatis-plus:
25 25
   mapper-locations: classpath:mapper/*.xml
26 26
 wx:
27 27
   miniapp:
28
-    appid: wxd6f47a9bb3052175
29
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
28
+    appid: wxc56decdcbc64d8de
29
+    secret: 80864fa371a8db79e719c07df52d59d0
30 30
     token:
31 31
     aesKey:
32 32
     msgDataFormat: JSON

+ 5
- 2
src/main/resources/mapper/TaCheckinMapper.xml Ver fichero

@@ -1,14 +1,17 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 <mapper namespace="com.huiju.estateagents.mapper.TaCheckinMapper">
4
-    <select id="getUndisplayedCustomerList" resultType="com.huiju.estateagents.entity.TaCheckin">
4
+    <select id="getCheckinCustomerList" resultType="com.huiju.estateagents.entity.TaCheckin">
5 5
         SELECT
6 6
         *
7 7
         FROM
8 8
         ta_checkin
9 9
         WHERE
10
-        STATUS &lt; 1
10
+        STATUS = #{status}
11 11
         AND activity = #{activity}
12
+        <if test="checkinTime != null">
13
+            AND checkin_time &gt;= #{checkinTime}
14
+        </if>
12 15
     </select>
13 16
 
14 17
     <select id="isCustomerChecked" resultType="int">