把商品团购拉出来

whepi-ui/templates/tuangou/home.ftl

@@ -0,0 +1,24 @@
+<#assign title="商品团购"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="weui-tab">
+    <div class="weui-tab__bd">
+
+
+    </div>
+</div>
+</div>
+</body>
+<#include "/home/frag.foot.ftl" />
+<script>
+
+    $(document).ready(function () {
+    }
+
+</script>
+
+
+
+
+
+

whepi-ui/templates/user/changeRole.ftl

@@ -72,6 +72,8 @@
             $.alert("请选择用户角色！")
             return false;
         }
-        window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;
+        <#if (type?? )&&(type ="1") >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
+        <#if (type?? )&&(type ="2") >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
+
     }
 </script>

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -112,15 +112,37 @@ public class WxController {
     public ModelOps createMenu() throws WxErrorException {
         val menu = new WxMenu();
 
-        //推介客户
+//        //推介客户
+//        val btn1 = new WxMenuButton();
+//        btn1.setName("健康日报");
+//        btn1.setType(WxConsts.MenuButtonType.VIEW);
+//        btn1.setUrl(
+//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+//                                "/user/home.html",
+//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+//        );
+
         val btn1 = new WxMenuButton();
-        btn1.setName("健康日报");
-        btn1.setType(WxConsts.MenuButtonType.VIEW);
-        btn1.setUrl(
+        btn1.setName("我的");
+        val btn11 = new WxMenuButton();
+        btn11.setName("健康日报");
+        btn11.setType(WxConsts.MenuButtonType.VIEW);
+        btn11.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
                                 "/user/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
+        val btn12 = new WxMenuButton();
+        btn12.setName("商品团购");
+        btn12.setType(WxConsts.MenuButtonType.VIEW);
+        btn12.setUrl(
+                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+                                "/tuangou/home.html",
+                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+        );
+        btn1.getSubButtons().add(btn11);
+        btn1.getSubButtons().add(btn12);
+
         val btnDesc = new WxMenuButton();
         btnDesc.setName("平台简介");
         btnDesc.setType(WxConsts.MenuButtonType.VIEW);

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -57,8 +57,7 @@ public class ScanController {
     @GetMapping("/user/scan.html")
     public ModelAndView scan(HttpServletRequest request, ModelMap model, @RequestParam(value = "doorId", required = false, defaultValue = "0") Long doorId,
                              @RequestParam(value = "inType", required = false, defaultValue = "0") Integer inType) {
-//        String code = request.getParameter("code");
-        UserOpen userOpen = homeService.getUserOpen();
+        UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
         List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
 //        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
 //        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
@@ -71,7 +70,7 @@ public class ScanController {
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
             model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
-            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate());
+            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
             model.put("name", uptownHomes.get(0).getLinkman());
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             model.put("now", format.format(new Date()));
@@ -112,8 +111,7 @@ public class ScanController {
     @ApiOperation("巡检人员检查扫码信息")
     @GetMapping("/user/scanEstate.html")
     public ModelAndView scanEstate(HttpServletRequest request, ModelMap model) {
-        String code = request.getParameter("code");
-        UserOpen userOpen = homeService.getUserOpen();
+        UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
         List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
 //        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
 //        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
@@ -124,7 +122,7 @@ public class ScanController {
         } else {
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
-            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate());
+            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
             model.put("name", uptownHomes.get(0).getLinkman());
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             model.put("now", format.format(new Date()));

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -90,6 +90,7 @@ public class UserOpenController {
                 return new ModelAndView("/home/home.ftl", model);
             }
             if (list.size() == 2) {
+                model.put("type", 1);
                 return new ModelAndView("/user/changeRole.ftl", model);
             }
         } else {
@@ -100,6 +101,47 @@ public class UserOpenController {
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             } else if (userType == 2) {
+                model.put("type", 1);
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        }
+        return null;
+    }
+
+
+    @ApiOperation("商品团购")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
+            @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
+    })
+    @GetMapping("/tuangou/home.html")
+    public ModelAndView tuangouHome(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
+        List<UserRole> list = new ArrayList<>();
+        if (userId == 0) {
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            userId = userOpen.getUserId();
+            model.put("user", userOpen);
+            model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+            if (list.size() == 0) {
+                return new ModelAndView("/user/home.ftl", model);
+            }
+            if (list.size() == 1) {
+                return new ModelAndView("/tuangou/home.html", model);
+            }
+            if (list.size() == 2) {
+                model.put("type", 2);
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        } else {
+            model.put("user", userOpenMapper.selectByUserId(userId));
+            model.put("user_id", "\"" + userId + "\"");
+            if (userType == 1) {
+                return new ModelAndView("/tuangou/home.html", model);
+            } else if (userType == 2) {
+                model.put("type", 2);
                 return new ModelAndView("/user/changeRole.ftl", model);
             }
         }