bug fix

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -31,4 +31,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
+
+    TaUser getAdminByAppID(@Param("appid") String appID);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -38,6 +38,8 @@ public interface ITaUserService extends IService<TaUser> {
     
     TaUser updateAdminUser(TaUser taUser) throws Exception;
 
+    TaUser getAdminByAppID(String appid);
+
     /**
      * 查询所有城市
      * @return

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,6 +20,7 @@ import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
@@ -99,6 +101,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private TaChannelProxyMapper taChannelProxyMapper;
 
+	@Autowired
+	private WxUtils wxUtils;
+
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
@@ -282,11 +287,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setDefaultCityId(taOrg.getDefaultCityId());
 		}
 
-		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
-		wrapper.eq("org_id", taOrg.getOrgId());
-		wrapper.last("limit 1");
-
-		TaMiniapp taMiniapp = taMiniappMapper.selectOne(wrapper);
+		TaMiniapp taMiniapp = getMiniappByOrg(taOrg);
 		if (null != taMiniapp) {
 			QueryWrapper<TaMiniappTemplate> query = new QueryWrapper<>();
 			query.eq("miniapp_id", taMiniapp.getMiniappId());
@@ -323,6 +324,27 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (taUserMapper.updateById(taUser) < 1) {
 			throw new Exception("更新用户信息失败");
 		}
+
+		// 如果服务未启动, 则启动服务
+		TaMiniapp miniapp = getMiniappByOrg(taOrg);
+		if (miniapp != null) {
+			WxMaService maService = wxUtils.getMiniApp(miniapp.getMiniappId());
+			if (null == maService) {
+				TaUser admin = taUserMapper.getAdminByAppID(miniapp.getMiniappId());
+
+				if (null != admin && CommConstant.STATUS_NORMAL == admin.getStatus() && LocalDateTime.now().isBefore(admin.getExpDate())) {
+					wxUtils.newService(miniapp, true);
+				}
+			}
+		}
+	}
+
+	private TaMiniapp getMiniappByOrg(TaOrg taOrg) {
+		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
+		wrapper.eq("org_id", taOrg.getOrgId());
+		wrapper.last("limit 1");
+
+		return taMiniappMapper.selectOne(wrapper);
 	}
 
 	@Override
@@ -536,7 +558,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return taUser;
 	}
 
-    @Override
+	@Override
+	public TaUser getAdminByAppID(String appid) {
+		return taUserMapper.getAdminByAppID(appid);
+	}
+
+	@Override
     public ResponseBean cityTree() {
 	   ResponseBean responseBean = new ResponseBean<>();
 	    // 省份

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

@@ -182,6 +182,12 @@ public class MiniAppController extends BaseController {
             return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        // 校验服务过期日期等
+        ResponseBean checkResp = checkMiniappStatus(appid);
+        if (checkResp != null) {
+            return checkResp;
+        }
+
         try {
             TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
@@ -329,6 +335,24 @@ public class MiniAppController extends BaseController {
         }
     }
 
+    private ResponseBean checkMiniappStatus(String appid) {
+        TaUser taUser = userService.getAdminByAppID(appid);
+
+        if (null == taUser) {
+            return ResponseBean.error("系统尚未添加管理员, 请联系相关人员", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (null == taUser.getExpDate() || LocalDateTime.now().isAfter(taUser.getExpDate())) {
+            return ResponseBean.error("系统服务已到期或者尚未设置到期日期", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (null == taUser.getStatus() || CommConstant.STATUS_NORMAL != taUser.getStatus()) {
+            return ResponseBean.error("系统服务被停止或者出现异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return null;
+    }
+
     private boolean checkSharePersonFrom(String from, String personId, String targetId, Integer orgId) {
         QueryWrapper<TaSharePersonFrom> queryWrapper =  new QueryWrapper<>();
         queryWrapper.eq("target_type",from);

src/main/resources/mapper/TaUserMapper.xml

@@ -111,4 +111,15 @@
       </if>
     </select>
 
+    <select id="getAdminByAppID" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+        m.*
+        FROM
+        ta_miniapp t
+        JOIN ta_user m USING (org_id)
+        WHERE
+        t.miniapp_id = #{appid}
+        AND m.is_admin = 1
+    </select>
+
 </mapper>