魏超 5 gadus atpakaļ
vecāks
revīzija
5a1f5766fd

+ 2
- 0
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Parādīt failu

388
                                    @RequestParam(value ="phone",required = false) String phone,
388
                                    @RequestParam(value ="phone",required = false) String phone,
389
                                    @RequestParam(value ="status",required = false) Integer status,
389
                                    @RequestParam(value ="status",required = false) Integer status,
390
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
390
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
391
+                                   @RequestParam(value ="buildingId",required = false) String buildingId,
391
                                    HttpServletRequest request){
392
                                    HttpServletRequest request){
392
         ResponseBean responseBean = new ResponseBean();
393
         ResponseBean responseBean = new ResponseBean();
393
         try {
394
         try {
398
             taUser.setUserName(userName);
399
             taUser.setUserName(userName);
399
             taUser.setPhone(phone);
400
             taUser.setPhone(phone);
400
             taUser.setStatus(status);
401
             taUser.setStatus(status);
402
+            taUser.setBuildingId(buildingId);
401
             if(null != isConsultant && isConsultant == 1){
403
             if(null != isConsultant && isConsultant == 1){
402
                 taUser.setIsConsultant(true);
404
                 taUser.setIsConsultant(true);
403
             }else if (null != isConsultant && isConsultant == 0){
405
             }else if (null != isConsultant && isConsultant == 0){

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Parādīt failu

174
     })
174
     })
175
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
175
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
176
     public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
176
     public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
177
-        return taBuildingService.buildingAdd(parameter, getOrgId(request));
177
+        return taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
178
     }
178
     }
179
 
179
 
180
     /**
180
     /**

+ 1
- 4
src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java Parādīt failu

274
             queryWrapper.eq("person_id",id);
274
             queryWrapper.eq("person_id",id);
275
             queryWrapper.orderByDesc("create_date");
275
             queryWrapper.orderByDesc("create_date");
276
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
276
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
277
-            Integer totalPoints = 0;
278
-            for (int i = 0;i<result.getRecords().size();i++){
279
-                totalPoints += result.getRecords().get(i).getPointsAmount();
280
-            }
277
+            Integer totalPoints = iTaPointsRecordsService.sumPointByPersonId(id);
281
             Map<String,Object> data = new HashMap<>();
278
             Map<String,Object> data = new HashMap<>();
282
             data.put("totalPoints",totalPoints);
279
             data.put("totalPoints",totalPoints);
283
             data.put("result",result);
280
             data.put("result",result);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Parādīt failu

730
      */
730
      */
731
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
731
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
732
     public ResponseBean wxGetRaiseRecordList(@RequestParam(value = "buildingId", required = false) String buildingId,
732
     public ResponseBean wxGetRaiseRecordList(@RequestParam(value = "buildingId", required = false) String buildingId,
733
-                                             @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
733
+                                             @RequestParam(value = "salesBatchId", required = false) Integer salesBatchId,
734
                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
734
                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
735
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
735
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
736
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
736
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
742
             taRaiseRecordQueryWrapper.eq("org_id", getOrgId(request));
742
             taRaiseRecordQueryWrapper.eq("org_id", getOrgId(request));
743
             taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
743
             taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
744
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
744
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
745
-            taRaiseRecordQueryWrapper.eq(null != salesBtchId, "sales_batch_id", salesBtchId);
745
+            taRaiseRecordQueryWrapper.eq(null != salesBatchId, "sales_batch_id", salesBatchId);
746
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
746
             taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
747
             taRaiseRecordQueryWrapper.orderByDesc("create_date");
747
             taRaiseRecordQueryWrapper.orderByDesc("create_date");
748
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
748
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPointsRecordsMapper.java Parādīt failu

18
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
18
 public interface TaPointsRecordsMapper extends BaseMapper<TaPointsRecords> {
19
     IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
19
     IPage<TaPointsRecords> getCustomerPointsList(IPage<TaPointsRecords> page, @Param("personId") String personId);
20
 
20
 
21
-
21
+    Integer sumPointByPersonId(@Param("personId") String personId);
22
 
22
 
23
 }
23
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java Parādīt failu

68
      * @param parameter
68
      * @param parameter
69
      * @return
69
      * @return
70
      */
70
      */
71
-    ResponseBean buildingAdd(String parameter, Integer orgId);
71
+    ResponseBean buildingAdd(String parameter, Integer orgId, Integer userId);
72
 
72
 
73
     /**
73
     /**
74
      * 修改成已发布
74
      * 修改成已发布

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java Parādīt failu

69
 	 * @param groupActivityId
69
 	 * @param groupActivityId
70
 	 */
70
 	 */
71
 	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
71
 	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
72
+
73
+	Integer sumPointByPersonId(String personId);
72
 }
74
 }

+ 15
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Parādīt failu

63
     @Autowired
63
     @Autowired
64
     TaPersonMapper taPersonMapper;
64
     TaPersonMapper taPersonMapper;
65
 
65
 
66
+    @Autowired
67
+    TaUserMapper taUserMapper;
68
+
66
     @Autowired
69
     @Autowired
67
     TdCityMapper tdCityMapper;
70
     TdCityMapper tdCityMapper;
68
 
71
 
111
     @Autowired
114
     @Autowired
112
     private ITaSalesBatchService iTaSalesBatchService;
115
     private ITaSalesBatchService iTaSalesBatchService;
113
 
116
 
117
+    @Autowired
118
+    private TaPersonBuildingMapper taPersonBuildingMapper;
119
+
114
     @Override
120
     @Override
115
     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) {
121
     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) {
116
         Page<TaBuilding> page = new Page<>();
122
         Page<TaBuilding> page = new Page<>();
488
     }
494
     }
489
 
495
 
490
     @Override
496
     @Override
491
-    public ResponseBean buildingAdd(String parameter, Integer orgId) {
497
+    public ResponseBean buildingAdd(String parameter, Integer orgId, Integer userId) {
492
         ResponseBean responseBean = new ResponseBean();
498
         ResponseBean responseBean = new ResponseBean();
493
 
499
 
494
         JSONObject object = JSONObject.parseObject(parameter);
500
         JSONObject object = JSONObject.parseObject(parameter);
524
             tdCityMapper.updateById(city);
530
             tdCityMapper.updateById(city);
525
         }
531
         }
526
 
532
 
533
+        //新建项目以后自动授权给当前用户
534
+        TaUser taUser = taUserMapper.selectById(userId);
535
+        TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
536
+        taPersonBuilding.setBuildingId(building.getBuildingId());
537
+        taPersonBuilding.setUserId(taUser.getUserId());
538
+        taPersonBuilding.setCreateDate(LocalDateTime.now());
539
+        taPersonBuildingMapper.insert(taPersonBuilding);
540
+
527
         // 项目主图
541
         // 项目主图
528
         String imgStr = object.getString("img");
542
         String imgStr = object.getString("img");
529
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
543
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);

+ 5
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java Parādīt failu

427
 		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
427
 		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
428
 		taPointsRecordsMapper.insert(taPointsRecords);
428
 		taPointsRecordsMapper.insert(taPointsRecords);
429
 	}
429
 	}
430
+
431
+	@Override
432
+	public Integer sumPointByPersonId(String personId) {
433
+		return taPointsRecordsMapper.sumPointByPersonId(personId);
434
+	}
430
 }
435
 }

+ 3
- 0
src/main/resources/mapper/TaPointsRecordsMapper.xml Parādīt failu

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

+ 3
- 0
src/main/resources/mapper/TaUserMapper.xml Parādīt failu

83
             <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
83
             <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
84
                 and t.is_consultant = #{taUser.isConsultant}
84
                 and t.is_consultant = #{taUser.isConsultant}
85
             </if>
85
             </if>
86
+            <if test="taUser.buildingId != null and taUser.buildingId != ''">
87
+                and b.building_id = #{taUser.buildingId}
88
+            </if>
86
             <if test="personBuildingList != null and personBuildingList.size > 0">
89
             <if test="personBuildingList != null and personBuildingList.size > 0">
87
                 AND b.building_id in
90
                 AND b.building_id in
88
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
91
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">