feats

pom.xml

@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.huiju</groupId>
-	<artifactId>zcloud</artifactId>
-	<version>1.0.0</version>
-	<name>香颂</name>
+	<artifactId>xiangsong</artifactId>
+	<version>1.0.1</version>
+	<name>xiangsong</name>
 	<description>香颂</description>
 
 	<properties>

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

@@ -798,4 +798,25 @@ public class TaPersonController extends BaseController {
         }
         return taPersonService.updateUserPhoto(imgUrl, openId);
     }
+
+    @GetMapping("/admin/person-list")
+    public ResponseBean getPersonList(@RequestParam(defaultValue = "1") int pageNumber,
+                                      @RequestParam(defaultValue = "10") int pageSize,
+                                      @RequestParam(value = "name", required = false) String name,
+                                      @RequestParam(value = "phone", required = false) String phone,
+                                      HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.like(!StringUtils.isEmpty(name),"nickname", "%"+name+"%");
+        queryWrapper.eq(!StringUtils.isEmpty(phone),"phone", phone);
+        queryWrapper.isNotNull("avatarurl");
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+
+        return ResponseBean.success(taPersonService.page(page, queryWrapper));
+    }
+
 }

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

@@ -944,39 +944,42 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
         updateById(person);
 
-        // 关联推荐客户
-        fixCustomerPersonId(person);
+        // 发放积分
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
-        // 客户来源
-        customerFrom.setPersonId(person.getPersonId());
-        customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-        customerFrom.setCreateDate(now);
+//        // 关联推荐客户
+//        fixCustomerPersonId(person);
+//
+//        // 客户来源
+//        customerFrom.setPersonId(person.getPersonId());
+//        customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+//        customerFrom.setCreateDate(now);
 
         // 推广人
-        TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
-        // 推荐楼盘
-        TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
-        // 置业顾问
-        boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
-        TaPerson consultant = null != consultantPersonId ? getById(consultantPersonId) : (isConsultant ? recPerson : null);
-
-        try {
-            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
-            if (customerList.size() > 0) {
-                // 发放积分
-                applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
-
-                //授权手机给推广人加积分
-                String sharePersonId = getSharePersonFrom(person);
-                // 2020年5月29日 不清楚加场景限制的原因, 与芳芳讨论 先取消这个限制
-//                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
-                if (!StringUtils.isEmpty(promoter) || !StringUtils.isEmpty(sharePersonId)){
-                    applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
-                }
-            }
-        } catch (Exception e) {
-            throw e;
-        }
+//        TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
+//        // 推荐楼盘
+//        TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
+//        // 置业顾问
+//        boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+//        TaPerson consultant = null != consultantPersonId ? getById(consultantPersonId) : (isConsultant ? recPerson : null);
+//
+//        try {
+//            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
+//            if (customerList.size() > 0) {
+//                // 发放积分
+//                applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
+//
+//                //授权手机给推广人加积分
+//                String sharePersonId = getSharePersonFrom(person);
+//                // 2020年5月29日 不清楚加场景限制的原因, 与芳芳讨论 先取消这个限制
+////                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
+//                if (!StringUtils.isEmpty(promoter) || !StringUtils.isEmpty(sharePersonId)){
+//                    applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
+//                }
+//            }
+//        } catch (Exception e) {
+//            throw e;
+//        }
     }
 
     private TaRecommendCustomer newOrFixCustomerBy(TaPerson person, String promoter, String buildingId) {

src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 80
+  port: 8090
 spring:
   application:
     name: zhiyun