瀏覽代碼

新需求

魏超 5 年之前
父節點
當前提交
a51bdabcea

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/MiniAppController.java 查看文件

463
         String sessionKey = params.getString("sessionKey");
463
         String sessionKey = params.getString("sessionKey");
464
         String encryptedData = params.getString("encryptedData");
464
         String encryptedData = params.getString("encryptedData");
465
         String iv = params.getString("iv");
465
         String iv = params.getString("iv");
466
+        String buildingId = params.getString("buildingId");
466
 
467
 
467
         // 解密
468
         // 解密
468
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
469
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
470
         // 更新用户绑定手机
471
         // 更新用户绑定手机
471
         String openid = getOpenId(request);
472
         String openid = getOpenId(request);
472
         Integer orgId = getOrgId(request);
473
         Integer orgId = getOrgId(request);
473
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), orgId);
474
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), buildingId, orgId);
474
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
475
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
475
         if (null == taPersons || taPersons.size() != 1) {
476
         if (null == taPersons || taPersons.size() != 1) {
476
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
477
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

+ 7
- 0
src/main/java/com/huiju/estateagents/excel/PublicCustomerExport.java 查看文件

65
     @ColumnWidth(15)
65
     @ColumnWidth(15)
66
     @ExcelProperty(value = "意向度", index = 7)
66
     @ExcelProperty(value = "意向度", index = 7)
67
     private String intention;
67
     private String intention;
68
+
69
+    /**
70
+     * 项目名称
71
+     */
72
+    @ColumnWidth(15)
73
+    @ExcelProperty(value = "项目名称", index = 8)
74
+    private String buildingName;
68
 }
75
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaPersonService.java 查看文件

23
 public interface ITaPersonService extends IService<TaPerson> {
23
 public interface ITaPersonService extends IService<TaPerson> {
24
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
24
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
25
 
25
 
26
-    TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
26
+    TaPerson updatePersonPhone(String miniOpenid, String phone, String buildingId, Integer orgId);
27
 
27
 
28
     IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person);
28
     IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId, TaPerson person);
29
 
29
 

+ 4
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java 查看文件

157
     }
157
     }
158
 
158
 
159
     @Override
159
     @Override
160
-    public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
160
+    public TaPerson updatePersonPhone(String miniOpenid, String phone, String buildingId, Integer orgId) {
161
         // 先查询是否存在用户
161
         // 先查询是否存在用户
162
         TaPerson person = null;
162
         TaPerson person = null;
163
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
163
         List<TaPerson> taPersons = getPersonsByOpenId(miniOpenid);
180
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
180
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
181
         wrapper.set("phone", phone);
181
         wrapper.set("phone", phone);
182
         wrapper.set("auth_phone_time", LocalDateTime.now());
182
         wrapper.set("auth_phone_time", LocalDateTime.now());
183
+        if (!StringUtils.isEmpty(buildingId)){
184
+            wrapper.set("building_id", buildingId);
185
+        }
183
 
186
 
184
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
187
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
185
             wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);
188
             wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);

+ 3
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

551
           b.country,
551
           b.country,
552
           b.province,
552
           b.province,
553
           z.intention,
553
           z.intention,
554
-          d.scene_alias as sceneType
554
+          d.scene_alias as sceneType,
555
+          t.building_name
555
         FROM
556
         FROM
556
         ta_person b
557
         ta_person b
557
         LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
558
         LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
559
+        left join ta_building t on b.building_id = t.building_id
558
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
560
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
559
         left join td_wx_dict d on r.scene_id = d.scene_id
561
         left join td_wx_dict d on r.scene_id = d.scene_id
560
         <where>
562
         <where>