bug fix

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -388,6 +388,7 @@ public class TaUserController extends BaseController {
                                    @RequestParam(value ="phone",required = false) String phone,
                                    @RequestParam(value ="status",required = false) Integer status,
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
+                                   @RequestParam(value ="buildingId",required = false) String buildingId,
                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -398,6 +399,7 @@ public class TaUserController extends BaseController {
             taUser.setUserName(userName);
             taUser.setPhone(phone);
             taUser.setStatus(status);
+            taUser.setBuildingId(buildingId);
             if(null != isConsultant && isConsultant == 1){
                 taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){

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

@@ -174,7 +174,7 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
     public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingAdd(parameter, getOrgId(request));
+        return taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
     }
 
     /**

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

@@ -274,10 +274,7 @@ public class TaPointsRecordsController extends BaseController {
             queryWrapper.eq("person_id",id);
             queryWrapper.orderByDesc("create_date");
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
-            Integer totalPoints = 0;
-            for (int i = 0;i<result.getRecords().size();i++){
-                totalPoints += result.getRecords().get(i).getPointsAmount();
-            }
+            Integer totalPoints = iTaPointsRecordsService.sumPointByPersonId(id);
             Map<String,Object> data = new HashMap<>();
             data.put("totalPoints",totalPoints);
             data.put("result",result);

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

@@ -730,7 +730,7 @@ public class TaRaiseRecordController extends BaseController {
      */
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
     public ResponseBean wxGetRaiseRecordList(@RequestParam(value = "buildingId", required = false) String buildingId,
-                                             @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                             @RequestParam(value = "salesBatchId", required = false) Integer salesBatchId,
                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
@@ -742,7 +742,7 @@ public class TaRaiseRecordController extends BaseController {
             taRaiseRecordQueryWrapper.eq("org_id", getOrgId(request));
             taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
-            taRaiseRecordQueryWrapper.eq(null != salesBtchId, "sales_batch_id", salesBtchId);
+            taRaiseRecordQueryWrapper.eq(null != salesBatchId, "sales_batch_id", salesBatchId);
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
             taRaiseRecordQueryWrapper.orderByDesc("create_date");
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);

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

@@ -18,6 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
     IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
 
-
+    Integer sumPointByPersonId(@Param("personId") String personId);
 
 }

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

@@ -68,7 +68,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param parameter
      * @return
      */
-    ResponseBean buildingAdd(String parameter, Integer orgId);
+    ResponseBean buildingAdd(String parameter, Integer orgId, Integer userId);
 
     /**
      * 修改成已发布

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

@@ -69,4 +69,6 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param groupActivityId
 	 */
 	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
+
+	Integer sumPointByPersonId(String personId);
 }

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

@@ -63,6 +63,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     TaPersonMapper taPersonMapper;
 
+    @Autowired
+    TaUserMapper taUserMapper;
+
     @Autowired
     TdCityMapper tdCityMapper;
 
@@ -111,6 +114,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -488,7 +494,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAdd(String parameter, Integer orgId) {
+    public ResponseBean buildingAdd(String parameter, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject object = JSONObject.parseObject(parameter);
@@ -524,6 +530,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             tdCityMapper.updateById(city);
         }
 
+        //新建项目以后自动授权给当前用户
+        TaUser taUser = taUserMapper.selectById(userId);
+        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+        taPersonBuilding.setBuildingId(building.getBuildingId());
+        taPersonBuilding.setUserId(taUser.getUserId());
+        taPersonBuilding.setCreateDate(LocalDateTime.now());
+        taPersonBuildingMapper.insert(taPersonBuilding);
+
         // 项目主图
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);

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

@@ -427,4 +427,9 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
 		taPointsRecordsMapper.insert(taPointsRecords);
 	}
+
+	@Override
+	public Integer sumPointByPersonId(String personId) {
+		return taPointsRecordsMapper.sumPointByPersonId(personId);
+	}
 }

src/main/resources/mapper/TaPointsRecordsMapper.xml

@@ -4,5 +4,8 @@
     <select id="getCustomerPointsList" resultType="com.huiju.estateagents.entity.TaPointsRecords">
 
     </select>
+    <select id="sumPointByPersonId" resultType="java.lang.Integer">
+        select sum(points_amount) from ta_points_records t where t.person_id = #{personId}
+    </select>
 
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -83,6 +83,9 @@
             <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
                 and t.is_consultant = #{taUser.isConsultant}
             </if>
+            <if test="taUser.buildingId != null and taUser.buildingId != ''">
+                and b.building_id = #{taUser.buildingId}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND b.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">