Merge remote-tracking branch 'origin/master'

pom.xml

@@ -166,6 +166,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
+					<include>mapper/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

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

@@ -63,6 +63,21 @@ public class CommConstant {
      * 兑换商品
      */
     public final static String POINTS_CHANGE_GOODS = "goods";
+    
+    /**
+     * 签到
+     */
+    public final static String POINTS_CHECKIN = "checkin";
+    
+    /**
+     * 分享
+     */
+    public final static String POINTS_SHARE = "share";
+    
+    /**
+     * 授权
+     */
+    public final static String POINTS_AUTHORIZE = "authorize";
 
 
     /**

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

@@ -45,10 +45,10 @@ public class TaNewsController extends BaseController {
     @RequestMapping(value="/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value = "buildingId") Integer buildingId,
-                                   @RequestParam(value = "orgId") Integer orgId,
-                                   @RequestParam(value = "newsTypeId") Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus") Integer newsStatus){
+                                   @RequestParam(value = "buildingId", required = false) String buildingId,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
         ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
         return responseBean;
     }

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

@@ -45,7 +45,7 @@ public class TaNewsTypeController extends BaseController {
     @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value = "buildingId", required = false) Integer buildingId,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "orgId", required = false) Integer orgId){
         ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
         return responseBean;

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

@@ -5,7 +5,11 @@ 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.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPointsRecords;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaPointsRecordsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 积分消费流水表  前端控制器
@@ -34,6 +41,9 @@ public class TaPointsRecordsController extends BaseController {
 
     @Autowired
     public ITaPointsRecordsService iTaPointsRecordsService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
 
     /**
@@ -146,4 +156,33 @@ public class TaPointsRecordsController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
+            //使用分页插件
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+            queryWrapper.like("change_params","%\""+taPerson.getPersonId()+"\"%");
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -24,7 +24,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
 
     /**
      * 根据Id查询资讯数据

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

@@ -22,7 +22,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
 
     /**
      * 根据Id查询资讯类型数据

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

@@ -52,7 +52,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -101,7 +101,8 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         check(taNews);
 
         BeanTools.copyProperties(taNews, oldNews);
-        responseBean.addSuccess(this.updateById(oldNews));
+        this.updateById(oldNews);
+        responseBean.addSuccess(oldNews);
         return responseBean;
     }
 
@@ -176,7 +177,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
             responseBean.addError("数据不存!");
         }
 
-        taNewsMapper.setFieldNum(id + "", "pv_num", 1);
+        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
 
         responseBean.addSuccess((Object)"");
         return responseBean;

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

@@ -33,7 +33,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -75,6 +75,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
         BeanTools.copyProperties(taNewsType, oldTaNewsType);
         this.updateById(oldTaNewsType);
+        responseBean.addSuccess(oldTaNewsType);
         return responseBean;
     }
 
@@ -86,6 +87,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         check(taNewsType);
 
         taNewsType.setCreateDate(LocalDateTime.now());
+        taNewsType.setStatus(1);
         this.save(taNewsType);
         responseBean.addSuccess(taNewsType);
         return responseBean;

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

@@ -56,6 +56,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     TaChatMapper taChatMapper;
+    
+    @Autowired
+    private TdPointsRulesMapper tdPointsRulesMapper;
+    
+    @Autowired
+    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Override
     public TaPerson mergePersonWxInfo(WxMaUserInfo userInfo) {
@@ -125,6 +131,34 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         if (null == tel || "".equals(tel)){
             person.setTel(phone);
         }
+    
+        //查看是否领取过授权积分
+        QueryWrapper<TaPointsRecords> taPointsRecordsQueryWrapper = new QueryWrapper<>();
+        taPointsRecordsQueryWrapper.eq("change_type",CommConstant.POINTS_AUTHORIZE);
+        taPointsRecordsQueryWrapper.like("change_params","%\""+person.getPersonId()+"\"%");
+        List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
+        if (taPointsRecordsList.size() < 0){
+            //发放积分
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
+            //插入积分消费流水表
+            TaPointsRecords taPointsRecords = new TaPointsRecords();
+            taPointsRecords.setPersonId(person.getPersonId());
+            taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
+            taPointsRecords.setPersonType(person.getPersonType());
+            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+            taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("person_id",person.getPersonId());
+            taPointsRecords.setChangeParams(jsonObject.toJSONString());
+            taPointsRecords.setCreateDate(LocalDateTime.now());
+            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+            taPointsRecordsMapper.insert(taPointsRecords);
+            //添加积分
+            UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
+            wrapper.eq("person_id", person.getPersonId());
+            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+            taPersonMapper.update(new TaPerson(), taPersonwrapper);
+        }
 
         return person;
     }
@@ -313,11 +347,28 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 增加积分
         // 1-7 天积分 1-7, 超过7天按 7 个积分算
         int points = durationDays >= 7 ? 7 : durationDays;
+        //签到获取积分
+        //TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(1);
+        //int points = tdPointsRules.getPointsAmount();
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.eq("person_id", taPerson.getPersonId());
         wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(points));
 //        wrapper.set("points", "points + " + String.valueOf(points));
         taPersonMapper.update(new TaPerson(), wrapper);
+        
+        //插入积分消费流水表
+        TaPointsRecords taPointsRecords = new TaPointsRecords();
+        taPointsRecords.setPersonId(taPerson.getPersonId());
+        taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+        taPointsRecords.setPersonType(taPerson.getPersonType());
+        taPointsRecords.setPointsAmount(points);
+        taPointsRecords.setChangeType(CommConstant.POINTS_CHECKIN);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("person_id",taPerson.getPersonId());
+        taPointsRecords.setChangeParams(jsonObject.toJSONString());
+        taPointsRecords.setCreateDate(LocalDateTime.now());
+        taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+        taPointsRecordsMapper.insert(taPointsRecords);
 
         Map<String, Object> result = new HashMap<>();
 

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

@@ -1,15 +1,22 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPointsRecords;
 import com.huiju.estateagents.entity.TaShare;
+import com.huiju.estateagents.entity.TdPointsRules;
 import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
 import com.huiju.estateagents.mapper.TaShareMapper;
+import com.huiju.estateagents.mapper.TdPointsRulesMapper;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +39,12 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
 
     @Autowired
     TaShareMapper taShareMapper;
+    
+    @Autowired
+    private TdPointsRulesMapper tdPointsRulesMapper;
+    
+    @Autowired
+    private TaPointsRecordsMapper taPointsRecordsMapper;
 
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
@@ -68,6 +81,28 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         if (typeOf == CommConstant.FAVOR_CONSULTANT) {
             taPersonMapper.setFieldIncrement(id,"share_num", 1);
         }
+        //发放分享积分
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
+            //插入积分消费流水表
+            TaPointsRecords taPointsRecords = new TaPointsRecords();
+            taPointsRecords.setPersonId(taPerson.getPersonId());
+            taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+            taPointsRecords.setPersonType(taPerson.getPersonType());
+            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+            taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("person_id",taPerson.getPersonId());
+            taPointsRecords.setChangeParams(jsonObject.toJSONString());
+            taPointsRecords.setCreateDate(LocalDateTime.now());
+            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+            taPointsRecordsMapper.insert(taPointsRecords);
+            //添加积分
+            UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+            wrapper.eq("person_id", taPerson.getPersonId());
+            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+            taPersonMapper.update(new TaPerson(), wrapper);
+        }
 
         return ResponseBean.success("");
     }