bug fix

src/main/java/com/huiju/estateagents/base/ResponseBean.java

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

src/main/java/com/huiju/estateagents/common/DateUtils.java

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

src/main/java/com/huiju/estateagents/controller/TaCheckinController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaCheckin;
 import com.huiju.estateagents.entity.TaPerson;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -50,22 +52,42 @@ public class TaCheckinController extends BaseController {
     @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.GET)
     public ResponseBean taCheckinList(@PathVariable String activity,
                                       @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = new ResponseBean();
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @RequestParam(value ="today",defaultValue = "false") Boolean today,
+                                      @RequestParam(value = "newRecord", defaultValue = "false") Boolean newRecord,
+                                      HttpServletResponse response){
+
+        // 此接口允許跨域
+        response.setHeader("Access-Control-Allow-Origin", "*");
+
         try {
+            Integer status = !newRecord ? 1 : 0;
+            LocalDateTime dayBegin = null;
+            if (today) {
+                String theDay = DateUtils.today();
+                dayBegin = DateUtils.day2LocalDateime(theDay);
+            }
+
             //使用分页插件
 		    IPage<TaCheckin> pg = new Page<>(pageNum, pageSize);
-            IPage<TaCheckin> result = iTaCheckinService.getUndisplayedCustomerList(pg,activity);
-            for (int i = 0;i<result.getRecords().size();i++){
-                result.getRecords().get(i).setStatus(1);
+            IPage<TaCheckin> result = iTaCheckinService.getCheckinCustomerList(pg,activity, status, dayBegin);
+
+            if (newRecord) {
+                for (int i = 0;i<result.getRecords().size();i++){
+                    result.getRecords().get(i).setStatus(1);
+                }
+
+                if (result.getRecords().size() > 0) {
+                    iTaCheckinService.updateBatchById(result.getRecords());
+                }
             }
-            iTaCheckinService.updateBatchById(result.getRecords());
-            responseBean.success(result);
+
+            return ResponseBean.success(result);
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("taCheckinList -=- {}",e.toString());
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     /**
@@ -86,7 +108,7 @@ public class TaCheckinController extends BaseController {
 
         try {
             if(iTaCheckinService.isCustomerChecked(activity,person.getPersonId())>0){
-                ResponseBean.success("您已签到过此活动");
+                return ResponseBean.success("您已签到过此活动");
             }else {
                 TaCheckin taCheckin = new TaCheckin();
                 taCheckin.setStatus(0);
@@ -96,17 +118,16 @@ public class TaCheckinController extends BaseController {
                 taCheckin.setAvatar(person.getAvatarurl());
                 taCheckin.setCheckinTime(LocalDateTime.now());
                 if (iTaCheckinService.save(taCheckin)){
-                    responseBean.success(taCheckin);
+                    return ResponseBean.success(taCheckin);
                 }else {
-                    responseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+                    return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
                 }
             }
 
         }catch (Exception e){
             logger.error("taCheckinAdd -=- {}",e.toString());
-            responseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -50,7 +50,6 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.GET)
     public ResponseBean taPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
@@ -58,12 +57,11 @@ public class TaPersonVisitRecordController extends BaseController {
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.page(pg, queryWrapper);
-            responseBean.success(result);
+            return ResponseBean.success(result);
         }catch (Exception e){
             logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     /**
@@ -73,7 +71,6 @@ public class TaPersonVisitRecordController extends BaseController {
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
     public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -84,15 +81,14 @@ public class TaPersonVisitRecordController extends BaseController {
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
         try {
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
-                responseBean.success(taPersonVisitRecord);
+                return ResponseBean.success(taPersonVisitRecord);
             }else {
-                responseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
             }
         }catch (Exception e){
             logger.error("taPersonVisitRecordAdd -=- {}",e.toString());
-            responseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     /**
@@ -102,18 +98,16 @@ public class TaPersonVisitRecordController extends BaseController {
     @ResponseBody
     @RequestMapping(value="/taPersonVisitRecord/{id}", method= RequestMethod.DELETE)
     public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
         try {
             if(iTaPersonVisitRecordService.removeById(id)){
-                responseBean.success("success");
+                return ResponseBean.success("success");
             }else {
-                responseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
+                return ResponseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
             }
         }catch (Exception e){
             logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
-            responseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     /**
@@ -132,15 +126,14 @@ public class TaPersonVisitRecordController extends BaseController {
         taPersonVisitRecord.setVisitDuration(duation.intValue());
         try {
             if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
-                responseBean.success(taPersonVisitRecord);
+                return ResponseBean.success(taPersonVisitRecord);
             }else {
-                responseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+                return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
             }
         }catch (Exception e){
             logger.error("taPersonVisitRecordUpdate -=- {}",e.toString());
-            responseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     /**
@@ -149,13 +142,11 @@ public class TaPersonVisitRecordController extends BaseController {
      */
     @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.GET)
     public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.success(iTaPersonVisitRecordService.getById(id));
+            return ResponseBean.success(iTaPersonVisitRecordService.getById(id));
         }catch (Exception e){
             logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -88,7 +88,6 @@ public class TaRecommendCustomerController extends BaseController {
 
     @PostMapping("/wx/customer/recommend")
     public ResponseBean getUnSignedCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -97,38 +96,33 @@ public class TaRecommendCustomerController extends BaseController {
         TaPerson person = taPersons.get(0);
         String buildingId = "";
         try{
-            responseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
+            return ResponseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
         }catch (Exception e){
             e.printStackTrace();
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     @PostMapping("/customer/recommend")
     public ResponseBean getCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize){
-        ResponseBean responseBean = new ResponseBean();
         try{
             String buildingId="";
-            responseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
         }catch (Exception e){
             e.printStackTrace();
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
     @PostMapping("/customer/recommend/{customerId}")
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,String customerId){
-        ResponseBean responseBean = new ResponseBean();
         String buildingId="";
         try{
-            responseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
         }catch (Exception e){
             e.printStackTrace();
-            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return responseBean;
     }
 
         /**

src/main/java/com/huiju/estateagents/mapper/TaCheckinMapper.java

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

src/main/java/com/huiju/estateagents/service/ITaCheckinService.java

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

src/main/java/com/huiju/estateagents/service/impl/TaCheckinServiceImpl.java

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

src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java

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

src/main/resources/application-test.yml

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

src/main/resources/mapper/TaCheckinMapper.xml

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