魏超 5 år sedan
förälder
incheckning
14ec015e04

+ 10
- 0
src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java Visa fil

255
         sysTokenService.remove(sysTokenQueryWrapper);
255
         sysTokenService.remove(sysTokenQueryWrapper);
256
         return ResponseBean.success("成功退出");
256
         return ResponseBean.success("成功退出");
257
     }
257
     }
258
+
259
+    @RequestMapping(value="/center/logo",method= RequestMethod.GET)
260
+    public ResponseBean getLogoImg(HttpServletRequest request){
261
+        ResponseBean responseBean = new ResponseBean();
262
+        Integer channelId = getChannelId(request);
263
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
264
+        responseBean.addSuccess(taChannelProxy);
265
+        return responseBean;
266
+    }
267
+
258
 }
268
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Visa fil

249
 
249
 
250
     /**
250
     /**
251
      * 业务端  修改密码
251
      * 业务端  修改密码
252
-     * @return
252
+     * @return/
253
      */
253
      */
254
     @PutMapping(value = "/admin/update/password")
254
     @PutMapping(value = "/admin/update/password")
255
     public ResponseBean updatePassword( @RequestParam String originalPassword,
255
     public ResponseBean updatePassword( @RequestParam String originalPassword,
339
         }
339
         }
340
     
340
     
341
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
341
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
342
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
342
+            return ResponseBean.error("当前后台服务已到期,请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
343
         }
343
         }
344
 
344
 
345
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
345
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());

+ 26
- 0
src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java Visa fil

10
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
10
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
12
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
13
+import com.huiju.estateagents.center.taUser.entity.TaUser;
14
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
13
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
15
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
14
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
16
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
15
 import com.huiju.estateagents.common.CommConstant;
17
 import com.huiju.estateagents.common.CommConstant;
16
 import com.huiju.estateagents.common.JWTUtils;
18
 import com.huiju.estateagents.common.JWTUtils;
17
 import com.huiju.estateagents.common.MD5Utils;
19
 import com.huiju.estateagents.common.MD5Utils;
20
+import com.huiju.estateagents.entity.TaChannelAppRelation;
21
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
18
 import org.slf4j.Logger;
22
 import org.slf4j.Logger;
19
 import org.slf4j.LoggerFactory;
23
 import org.slf4j.LoggerFactory;
20
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.beans.factory.annotation.Autowired;
22
 
26
 
23
 import javax.servlet.http.HttpServletRequest;
27
 import javax.servlet.http.HttpServletRequest;
24
 import java.time.LocalDateTime;
28
 import java.time.LocalDateTime;
29
+import java.util.ArrayList;
25
 import java.util.HashMap;
30
 import java.util.HashMap;
31
+import java.util.List;
26
 import java.util.Map;
32
 import java.util.Map;
27
 
33
 
28
 /**
34
 /**
45
     @Autowired
51
     @Autowired
46
     private ISysTokenService sysTokenService;
52
     private ISysTokenService sysTokenService;
47
 
53
 
54
+    @Autowired
55
+    private ITaUserService iTaUserService;
56
+
48
     @Autowired
57
     @Autowired
49
     private ITaChannelProxyService iTaChannelProxyService;
58
     private ITaChannelProxyService iTaChannelProxyService;
50
 
59
 
60
+    @Autowired
61
+    private ITaChannelAppRelationService iTaChannelAppRelationService;
62
+
51
     /**
63
     /**
52
      * 修改对象
64
      * 修改对象
53
      * @param sysUser 实体对象
65
      * @param sysUser 实体对象
221
             return responseBean;
233
             return responseBean;
222
         }
234
         }
223
 
235
 
236
+        //更新业务层的登录账号为禁用
237
+        QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
238
+        taChannelAppRelationQueryWrapper.eq("channel_id", id);
239
+        List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
240
+        List<Integer> orgIdList = new ArrayList<>();
241
+        taChannelAppRelation.forEach(e->{
242
+            orgIdList.add(e.getOrgId());
243
+        });
244
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
245
+        taUserQueryWrapper.in("org_id", orgIdList);
246
+        TaUser taUser = new TaUser();
247
+        taUser.setStatus(taChannelProxy.getStatus());
248
+        iTaUserService.update(taUser, taUserQueryWrapper);
249
+
224
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
250
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
225
         taChannelProxyQueryWrapper.eq("channel_id", id);
251
         taChannelProxyQueryWrapper.eq("channel_id", id);
226
         iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);
252
         iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/MiniAppController.java Visa fil

244
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
244
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
245
                 sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
245
                 sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
246
                 if(from.equals("dynamic_share")){ // activity_share
246
                 if(from.equals("dynamic_share")){ // activity_share
247
-                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
247
+                    //产品不认了
248
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
248
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
249
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
249
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
250
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
250
                     sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
251
                     sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Visa fil

357
 
357
 
358
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
358
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
359
         taConsultantInfos.forEach(e ->{
359
         taConsultantInfos.forEach(e ->{
360
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
360
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType())  + "_share");
361
             switch (e.getEventType()){
361
             switch (e.getEventType()){
362
                 case CommConstant.FAVOR_ACTIVITY:
362
                 case CommConstant.FAVOR_ACTIVITY:
363
                     e.setActivityShareNum(shareNum);
363
                     e.setActivityShareNum(shareNum);

+ 1
- 1
src/main/resources/mapper/TaUserMapper.xml Visa fil

21
             m.token,
21
             m.token,
22
             m.NAME AS miniappName,
22
             m.NAME AS miniappName,
23
             m.qr_code AS qrCode,
23
             m.qr_code AS qrCode,
24
-            z.expire_date,
24
+            t.exp_date as expire_date,
25
             m.org_id
25
             m.org_id
26
         FROM
26
         FROM
27
             ta_user t
27
             ta_user t