bug fix

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -255,4 +255,14 @@ public class SysUserController extends BaseController {
         sysTokenService.remove(sysTokenQueryWrapper);
         return ResponseBean.success("成功退出");
     }
+
+    @RequestMapping(value="/center/logo",method= RequestMethod.GET)
+    public ResponseBean getLogoImg(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
 }

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

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

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -10,11 +10,15 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +26,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,9 +51,15 @@ public class SysUserChannelController extends BaseController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaUserService iTaUserService;
+
     @Autowired
     private ITaChannelProxyService iTaChannelProxyService;
 
+    @Autowired
+    private ITaChannelAppRelationService iTaChannelAppRelationService;
+
     /**
      * 修改对象
      * @param sysUser 实体对象
@@ -221,6 +233,20 @@ public class SysUserChannelController extends BaseController {
             return responseBean;
         }
 
+        //更新业务层的登录账号为禁用
+        QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+        taChannelAppRelationQueryWrapper.eq("channel_id", id);
+        List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
+        List<Integer> orgIdList = new ArrayList<>();
+        taChannelAppRelation.forEach(e->{
+            orgIdList.add(e.getOrgId());
+        });
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.in("org_id", orgIdList);
+        TaUser taUser = new TaUser();
+        taUser.setStatus(taChannelProxy.getStatus());
+        iTaUserService.update(taUser, taUserQueryWrapper);
+
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
         taChannelProxyQueryWrapper.eq("channel_id", id);
         iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);

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

@@ -244,7 +244,8 @@ public class MiniAppController extends BaseController {
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
                 sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
                 if(from.equals("dynamic_share")){ // activity_share
-                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    //产品不认了
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
                     sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());

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

@@ -357,7 +357,7 @@ public class TaPersonVisitRecordController extends BaseController {
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
+            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");
             switch (e.getEventType()){
                 case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);

src/main/resources/mapper/TaUserMapper.xml

@@ -21,7 +21,7 @@
             m.token,
             m.NAME AS miniappName,
             m.qr_code AS qrCode,
-            z.expire_date,
+            t.exp_date as expire_date,
             m.org_id
         FROM
             ta_user t