test

whepi-web/src/main/java/com/bofeng/controller/WxUserOpenController.java

@@ -5,7 +5,6 @@ import com.bofeng.entity.*;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.WxUserOpenService;
 import com.yvan.Model;
-import com.yvan.platform.Conv;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.StringUtils;
 import com.yvan.springmvc.HttpParameterParser;
@@ -15,7 +14,6 @@ import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -54,15 +52,15 @@ public class WxUserOpenController {
     }
 
     @ApiOperation("用户注册页面点登录")
-    @PostMapping("/userOpen/login")
-    public Model<Long> login(@RequestBody String body) {
-//        val parser = HttpParameterParser.newInstance(HttpUtils.currentRequest());
-//        String openId = parser.getString("openId");
-//        String code = parser.getString("code");
-        JsonWapper jsonWapper = new JsonWapper(body);
-        Map map = jsonWapper.getInnerMap();
-        String openId = Conv.NS(map.get("openId"));
-        String code = Conv.NS(map.get("code"));
+    @GetMapping("/userOpen/login")
+    public Model<Long> login() {
+        val parser = HttpParameterParser.newInstance(HttpUtils.currentRequest());
+        String openId = parser.getString("openId");
+        String code = parser.getString("code");
+//        JsonWapper jsonWapper = new JsonWapper(body);
+//        Map map = jsonWapper.getInnerMap();
+//        String openId = Conv.NS(map.get("openId"));
+//        String code = Conv.NS(map.get("code"));
 
         if (StringUtils.isNullOrEmpty(code)) {
             return Model.newFail("code为空");

whepi-web/src/main/java/com/bofeng/service/WxUserOpenService.java

@@ -219,30 +219,18 @@ public class WxUserOpenService {
         }
         //判断业委会是否已经建立
         List<Owner> lstSysOwner = ownerMapper.getOwnerByUptownId(myUptownId);
-        boolean hasOwner = false;
         if (lstSysOwner != null && lstSysOwner.size() > 0) {
             for (Owner item : lstSysOwner) {
                 if (item.getUserId() == sysUserId && item.getType() == 1) {
                     //业委会负责人的绑定用户是自己
-                    hasOwner = true;
-                    break;
+                    return 1L;  //该小区已成立业委会，且业委会负责人的绑定用户是自己，可以进入编辑
+//                    break;
                 }
             }
-            if (!hasOwner) {
-                throw new Exception("该小区已建立业委会");
-            }
-        }
-        List<OwnerLinkman> lstOwnerLinkman = ownerLinkmanMapper.getOwnerLinkmanByOwnerId(sysUserId);
-        if (lstOwnerLinkman == null) {
-            return 1L;
-            //throw new Exception("不是业委会成员！");
-        }
-        for (OwnerLinkman item : lstOwnerLinkman) {
-            if (item.getType() == 1) {
-                return 1L;  //业委会负责人可以编辑完善业委会信息
-            }
+            throw new Exception("小区业委会已建立，非业委会负责人不能编辑！");
+        } else {
+            return 1L;  //该小区没有成立业委会，可以进入新增
         }
-        return 0L;
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)