Merge remote-tracking branch 'origin/master'

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -18,17 +18,17 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">

whepi-ui/templates/groupBuying/groupBuyingJt.ftl

@@ -14,17 +14,17 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;20</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">

whepi-ui/templates/groupBuying/groupBuyingQx.ftl

@@ -14,17 +14,17 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;20</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -19,19 +19,19 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="p_deliverTime" style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">增补修订:&nbsp;&nbsp;${ tgItem.remark }</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
@@ -46,6 +46,21 @@
                 <p id="gb_ck" class="weui-btn weui-btn_primary">查看参团信息</p>
             </div>
         </#if>
+        <#if isMine=='mine' && tgItem.tgStatus==2>
+            <div class="weui-btn-area">
+                <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+                    <span class="weui-loadmore__tips">参团状态</span>
+                    <div class="weui-cells__title">发货</div>
+                </div>
+            </div>
+            <div class="weui-btn-area">
+                <p id="gb_wc2" class="weui-btn weui-btn_primary">完成团购</p>
+                <p id="gb_ck2" class="weui-btn weui-btn_primary">查看参团信息</p>
+            </div>
+            <div style="height: 10vh;">
+
+            </div>
+        </#if>
         <#if isMine!='mine' && tgItem.tgStatus==1>
             <div class="weui-btn-area">
                 <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
@@ -54,7 +69,7 @@
                 </div>
             </div>
         </#if>
-        <#if tgItem.tgStatus==2>
+        <#if isMine!='mine' && tgItem.tgStatus==2>
             <div class="weui-btn-area">
                 <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
                     <span class="weui-loadmore__tips">参团状态</span>
@@ -100,6 +115,26 @@
     });
 
     $('#gb_wc').on('click', function () {
+        finish();
+    });
+
+    $('#gb_wc2').on('click', function () {
+        finish();
+    });
+
+    $('#gb_ck').on('click', function () {
+        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    $('#gb_ck2').on('click', function () {
+        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    function goback() {
+        window.location.href = "/yeweihui/home.html?show=tuangou&userId=" + userId;
+    }
+
+    function finish() {
         let sendData = {
             jmId: tgItem.jmId,
             status: 3
@@ -121,13 +156,5 @@
                 $.alert("网络异常");
             }
         });
-    });
-
-    $('#gb_ck').on('click', function () {
-        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
-    });
-
-    function goback() {
-        window.location.href = "/yeweihui/home.html?show=tuangou&userId=" + userId;
     }
 </script>

whepi-ui/templates/yeweihui/home.ftl

@@ -13,9 +13,9 @@
         </div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
-        <#--<div id="tab3" class="weui-tab__bd-item">-->
-            <#--<#include "/yeweihui/tuangou.ftl" />-->
-        <#--</div>-->
+        <div id="tab3" class="weui-tab__bd-item">
+            <#include "/yeweihui/tuangou.ftl" />
+        </div>
     <#--<div id="tab3" class="weui-tab__bd-item">-->
     <#--<h1>页面三</h1> </div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->
@@ -30,10 +30,10 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">求助</p>
         </a>
-        <#--<a id="tab3a" href="#tab3" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>-->
-            <#--<p class="weui-tabbar__label">团购</p>-->
-        <#--</a>-->
+        <a id="tab3a" href="#tab3" class="weui-tabbar__item">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
+            <p class="weui-tabbar__label">团购</p>
+        </a>
     <#--<a href="#tab3" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">发现</p>-->

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -95,6 +95,26 @@
             return;
         }
 
+        let curTimestamp =(new Date()).valueOf();
+        let endTimestamp = end_time.replace(/-/g,'/');
+        endTimestamp = Date.parse(endTimestamp);
+        let deliverTimestamp = deliver_time.replace(/-/g,'/');
+        deliverTimestamp = Date.parse(deliverTimestamp);
+        if (endTimestamp < curTimestamp) {
+            $.alert("团购截止时间不能早于当前时间");
+            return;
+        }
+
+        if (deliverTimestamp < curTimestamp) {
+            $.alert("送货时间不能早于当前时间");
+            return;
+        }
+
+        if (endTimestamp > deliverTimestamp) {
+            $.alert("团购截止时间不能大于送货时间");
+            return;
+        }
+
         console.log(
             "发布",
             title + "---" +

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

@@ -2,12 +2,12 @@ package com.bofeng.controller;
 
 import com.bofeng.dao.UserRoleMapper;
 import com.bofeng.entity.OwnerLinkman;
+import com.bofeng.entity.UptownHome;
 import com.bofeng.entity.UserOpen;
 import com.bofeng.entity.UserRole;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.WxUserOpenService;
 import com.yvan.Model;
-import com.yvan.mvc.JsonBody;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.StringUtils;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class WxUserOpenController {
@@ -31,8 +32,8 @@ public class WxUserOpenController {
 
     @ApiOperation("用户注册页面点登录")
     @PostMapping("/userOpen/login")
-    public Model<Long> login(HttpServletRequest request) {
-        String code = request.getParameter("code").trim();
+    public Model<UserOpen> login(JsonWapper jsonWapper) {
+        String code = jsonWapper.asObject(String.class, "code");
         if (StringUtils.isNullOrEmpty(code)) {
             return Model.newFail("code为空");
         }
@@ -40,9 +41,12 @@ public class WxUserOpenController {
         if (userOpen == null) {
             return Model.newFail("微信登录失败");
         }
-
         //成功返回用户Id
-        return Model.newSuccess(userOpen.getUserId());
+        try {
+            return Model.newSuccess(userOpen);
+        } catch (Exception e) {
+            return Model.newFail(e.getMessage());
+        }
     }
 
     @ApiOperation("身份录入之创建角色(家庭用户或业委会成员)")
@@ -57,19 +61,18 @@ public class WxUserOpenController {
         return Model.newSuccess(wxUserOpenService.createRole(isFamily, isYWH));
     }
 
-    @ApiOperation("完善基础数据之获取创建的角色")
+    @ApiOperation("获取创建的角色")
     @PostMapping("/userOpen/queryUserRoles")
-    public Model<List<UserRole>> queryUserRoles() {
-        UserOpen userOpen = homeService.getUserOpen();
-        List<UserRole> list = new ArrayList<>();
-        if (userOpen.getUserId() > 0L) {
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+    public Model<List<UserRole>> queryUserRoles(JsonWapper jsonWapper) throws Exception {
+        Long userId = jsonWapper.asObject(Long.class, "userId");
+        if (userId == null || userId == 0L) {
+            return Model.newFail("用户不存在");
         }
-        if (list.size() == 0) {
-            return Model.newFail("尚未创建任何角色");
+        try {
+            return Model.newSuccess(wxUserOpenService.queryUserRoles(userId));
+        } catch (Exception e) {
+            return Model.newFail(e.getMessage());
         }
-        //成功返回用户角色
-        return Model.newSuccess(list);
     }
 
     @ApiOperation("创建家庭角色，完善家庭及住宅信息")
@@ -100,21 +103,53 @@ public class WxUserOpenController {
             return Model.newFail("请填写家庭联系电话");
         }
         //成功返回用户Id
-        return Model.newSuccess(wxUserOpenService.createFamily(userId, unitId, doorPlate, linkMan, helpNum, phone));
+        try {
+            return Model.newSuccess(wxUserOpenService.createFamily(userId, unitId, doorPlate, linkMan, helpNum, phone));
+        } catch (Exception e) {
+            return Model.newFail(e.getMessage());
+        }
+    }
+
+    @ApiOperation("获取家庭及住宅信息")
+    @PostMapping("/userOpen/queryFamily")
+    public Model<List<UptownHome>> queryFamily(JsonWapper jsonWapper) throws Exception {
+        Long userId = jsonWapper.asObject(Long.class, "userId");
+        if (userId == null || userId == 0L) {
+            return Model.newFail("用户不存在");
+        }
+        //成功返回用户Id
+        return Model.newSuccess(wxUserOpenService.queryFamily(userId));
     }
 
+
     @ApiOperation("创建业委会角色、成员信息")
     @PostMapping("/userOpen/createYWH")
-    public Model<Long> createYWH(HttpServletRequest request, @JsonBody List<OwnerLinkman> lstOwner) throws Exception {
-        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+    public Model<Long> createYWH(JsonWapper jsonWapper) throws Exception {
+        Long uptownId = jsonWapper.asObject(Long.class, "uptownId");
+        Long userId = jsonWapper.asObject(Long.class, "userId");
+        List<OwnerLinkman> lstOwnerMan = new ArrayList<>();
+        OwnerLinkman ownerLinkman;
         if (uptownId == null || uptownId == 0L) {
             return Model.newFail("请选择所在小区");
         }
-        if (lstOwner == null || lstOwner.size() == 0) {
+        for (int i = 0; i < jsonWapper.asList("lstOwner").size(); i++) {
+            Map<String, Object> mm = (Map) jsonWapper.asList("lstOwner").get(i);
+            ownerLinkman = new OwnerLinkman();
+            ownerLinkman.setLinkman(mm.get("linkman").toString());
+            ownerLinkman.setPhone(mm.get("phone").toString());
+            ownerLinkman.setType(Long.parseLong(mm.get("type").toString()));
+            lstOwnerMan.add(ownerLinkman);
+        }
+        if (lstOwnerMan == null || lstOwnerMan.size() == 0) {
             return Model.newFail("请增加业委会成员");
         }
         //成功返回用户Id
-        return Model.newSuccess(wxUserOpenService.createYWH(lstOwner, uptownId));
+        try {
+            return Model.newSuccess(wxUserOpenService.createYWH(userId, uptownId, lstOwnerMan));
+        } catch (Exception e) {
+            return Model.newFail(e.getMessage());
+        }
     }
 
+
 }

whepi-web/src/main/java/com/bofeng/dao/SysUptownUnitMapper.java

@@ -0,0 +1,13 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.sysUptownUnit;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface SysUptownUnitMapper extends BaseMapper<sysUptownUnit> {
+
+
+}

whepi-web/src/main/java/com/bofeng/entity/Owner.java

@@ -3,10 +3,14 @@ package com.bofeng.entity;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
 
+import java.util.List;
+import java.util.Map;
+
 @Getter
 @Setter
 @TableName("sys_owner")
@@ -35,4 +39,11 @@ public class Owner {
 
     @TableField(exist = false)
     private DateTime timeUpdate;
+
+    @TableField(exist = false)
+    private List<OwnerLinkman> lstOwnerLinkman;
+
+    @ApiModelProperty("定位所在省市区小区")
+    @TableField(exist = false)
+    private Map location;
 }

whepi-web/src/main/java/com/bofeng/entity/SysUptownHome.java

@@ -0,0 +1,57 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+@Getter
+@Setter
+@TableName("SYS_UPTOWN_HOME")
+public class SysUptownHome {
+
+    @ApiModelProperty("门牌ID")
+    @TableId("HOUSE_ID")
+    private Long houseId;
+
+    @ApiModelProperty("联系人名称")
+    @TableField("LINKMAN")
+    private String linkman;
+
+    @ApiModelProperty("联系人电话")
+    @TableField("PHONE")
+    private String phone;
+
+    @ApiModelProperty("家庭年前人数")
+    @TableField("YOUNG")
+    private int young;
+
+    @ApiModelProperty("家庭中年人数")
+    @TableField("MIDDLE")
+    private int middle;
+
+    @ApiModelProperty("家庭老年人数")
+    @TableField("OLD")
+    private int old;
+
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty("状态:1正常,0草稿,-1删除")
+    @TableField("STATUS")
+    private int status;
+
+    @ApiModelProperty("新增时间")
+    @TableField("TIME_CREATE")
+    private DateTime timeCreate;
+
+    @ApiModelProperty("修改时间")
+    @TableField("TIME_UPDATE")
+    private DateTime timeUpdate;
+
+
+}

whepi-web/src/main/java/com/bofeng/entity/UptownHome.java

@@ -1,12 +1,14 @@
 package com.bofeng.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
 
-import java.util.Date;
+import java.util.Map;
 
 /**
  * 小区家庭表
@@ -16,36 +18,52 @@ import java.util.Date;
 @TableName("sys_uptown_home")
 public class UptownHome {
 
-    @TableField("house_id")
+    @ApiModelProperty("门牌ID")
+    @TableId("HOUSE_ID")
     private Long houseId;
 
-    @TableField("linkman")
+    @ApiModelProperty("联系人名称")
+    @TableField("LINKMAN")
     private String linkman;
 
-    @TableField("phone")
+    @ApiModelProperty("联系人电话")
+    @TableField("PHONE")
     private String phone;
 
-    @TableField("young")
+    @ApiModelProperty("家庭年前人数")
+    @TableField("YOUNG")
     private Integer young;
 
-    @TableField("middle")
+    @ApiModelProperty("家庭中年人数")
+    @TableField("MIDDLE")
     private Integer middle;
 
-    @TableField("old")
+    @ApiModelProperty("家庭老年人数")
+    @TableField("OLD")
     private Integer old;
 
-    @TableField("remark")
+    @ApiModelProperty("备注")
+    @TableField("REMARK")
     private String remark;
 
-    /**
-     * 状态:1正常,0草稿,-1删除
-     */
-    @TableField("status")
-    private Integer status;
+    @ApiModelProperty("状态:1正常,0草稿,-1删除")
+    @TableField("STATUS")
+    private int status;
 
-    @TableField(exist = false)
+    @ApiModelProperty("新增时间")
+    @TableField("TIME_CREATE")
     private DateTime timeCreate;
 
-    @TableField(exist = false)
+    @ApiModelProperty("修改时间")
+    @TableField("TIME_UPDATE")
     private DateTime timeUpdate;
+
+    @ApiModelProperty("定位所在省市区小区栋单元等")
+    @TableField(exist = false)
+    private Map location;
+
+    @ApiModelProperty("门牌号")
+    @TableField(exist = false)
+    private String doorplate;
+
 }

whepi-web/src/main/java/com/bofeng/entity/UserRole.java

@@ -17,6 +17,7 @@ public class UserRole {
     @TableField("user_id")
     private Long userId;
 
+    /* 1.家庭；2.业委会 */
     @TableField("role_id")
     private Integer roleId;
 
@@ -34,4 +35,10 @@ public class UserRole {
 
     @TableField(exist = false)
     private DateTime timeUpdate;
+
+    @TableField(exist = false)
+    private UptownHome uptownHome;
+
+    @TableField(exist = false)
+    private Owner owner;
 }

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

@@ -20,6 +20,9 @@ import java.util.List;
 public class JmTuangouService {
 
     @Autowired
+    private BuyService buyService;
+
+    @Autowired
     private JmTuangouDao jmTuangouDao;
 
     @Autowired
@@ -57,8 +60,11 @@ public class JmTuangouService {
         return jmTuangouDao.insert(jmTuangou);
     }
 
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public List<JmTuangou> queryTuangouListByTitle(Long userId, String title) {
 
+        buyService.updateStatus();
+
         Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
         Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
 
@@ -68,15 +74,22 @@ public class JmTuangouService {
         return jmTuangouDao.queryTuangouListByUptownIdAndTitle(uptownId, title);
     }
 
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public List<JmTuangou> queryTuangouMyListByTitle(Long userId, String title) {
 
+        buyService.updateStatus();
+
         if (title.equals("")) {
             return jmTuangouDao.queryTuangouListByUserId(userId);
         }
         return jmTuangouDao.queryTuangouListByUserIdAndTitle(userId, title);
     }
 
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public JmTuangou queryByJmId(Long jmId) {
+
+        buyService.updateStatus();
+
         return jmTuangouDao.selectJmTuangouByJmId(jmId);
     }
 

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

@@ -32,6 +32,8 @@ public class MsReportService {
     private MsReportMapper msReportMapper;
     @Autowired
     private MsReportService msReportService;
+    @Autowired
+    private MsSuspectedService msSuspectedService;
 
     public List<MsSuspected> getByReportId(Long reportId) {
         return msSuspectedMapper.selectByReportId(reportId);

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

@@ -83,7 +83,7 @@ public class MsSuspectedService {
         if (singleRoom == 1)
             suspectedStatus = 1;
         //体温
-        if (Conv.NFloat(temperature) < Conv.NFloat(36) || Conv.NFloat(temperature) > Conv.NFloat(37.3))
+        if (Conv.NFloat(temperature) < Conv.NFloat(35) || Conv.NFloat(temperature) > Conv.NFloat(37.3))
             suspectedStatus = 1;
         //咳嗽
         if (cough > 0)
@@ -102,9 +102,20 @@ public class MsSuspectedService {
             suspectedStatus = 1;
         if (suspectedId == 0L) {
             //判断家人是否同名
-            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName,reportDate);
+            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName, reportDate);
             if (list != null && list.size() > 0)
                 return 2L;
+            //判断是否评估
+            if (scoreRezult == 0) {
+                MsSuspected msSuspected1 = getScore(0L, userName, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+                if (msSuspected1 != null) {
+                    scoreRezult = msSuspected1.getScoreRezult();
+                    score = msSuspected1.getScore();
+                    temperatureScore = msSuspected1.getTemperatureScore();
+                    scoreHistroy = msSuspected1.getScoreHistroy();
+                }
+            }
+
             MsSuspected msSuspected = new MsSuspected();
             msSuspected.setSuspectedId(IdWorker.getId());
             msSuspected.setReportId(reportId);
@@ -134,7 +145,7 @@ public class MsSuspectedService {
             msSuspectedMapper.insert(msSuspected);
         } else {
             //判断家人是否同名
-            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName,reportDate);
+            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName, reportDate);
             if (list != null && list.size() > 0) {
                 if (list.size() > 1)
                     return 2L;
@@ -143,6 +154,14 @@ public class MsSuspectedService {
                         return 2L;
                 }
             }
+            MsSuspected msSuspected2 = getScore(suspectedId, userName, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+            if (msSuspected2 != null) {
+                scoreRezult = msSuspected2.getScoreRezult();
+                score = msSuspected2.getScore();
+                temperatureScore = msSuspected2.getTemperatureScore();
+                scoreHistroy = msSuspected2.getScoreHistroy();
+            }
+
             MsSuspected msSuspected1 = msSuspectedMapper.selectById(suspectedId);
             if (msSuspected1 != null) {
                 msSuspected1.setUserName(userName);
@@ -293,9 +312,9 @@ public class MsSuspectedService {
             if (score - scoreHistory >= 3)
                 return 4;
             else {
-                if (score <= 1)
+                if (score < 1)
                     scoreRezult = 1;
-                if (score >= 2 && score <= 3)
+                if (score >= 1 && score <= 3)
                     scoreRezult = 2;
                 if (score == 4)
                     scoreRezult = 3;

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

@@ -9,7 +9,9 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional(readOnly = true)
@@ -27,6 +29,12 @@ public class WxUserOpenService {
     private OwnerMapper ownerMapper;
     @Autowired
     private OwnerLinkmanMapper ownerLinkmanMapper;
+    @Autowired
+    private SysUptownUnitMapper sysUptownUnitMapper;
+    @Autowired
+    private SysAreaMapper sysAreaMapper;
+    @Autowired
+    private UptownMapper uptownMapper;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long createRole(Long isFamily, Long isYWH) throws Exception {
@@ -64,16 +72,7 @@ public class WxUserOpenService {
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long createFamily(Long userId, Long unitId, String doorPlate, String linkMan, Integer helpNum, String phone) throws Exception {
-        Long sysUserId = 0L;
-        if (userId == null || userId == 0L) {
-            UserOpen userOpen = homeService.getUserOpen();
-            if (userOpen == null) {
-                throw new Exception("微信登录失败");
-            }
-            sysUserId = userOpen.getUserId();
-        } else {
-            sysUserId = userId;
-        }
+        Long sysUserId = queryUser(userId);
 
         //判断该用户是否已经创建了家庭用户角色
         List<UserRole> lstUserRole = new ArrayList<>();
@@ -131,15 +130,13 @@ public class WxUserOpenService {
         return 1L;
     }
 
-    public Long createYWH(List<OwnerLinkman> lstOwnerMan, Long uptownId) throws Exception {
-        UserOpen userOpen = homeService.getUserOpen();
-        if (userOpen == null) {
-            throw new Exception("微信登录失败");
-        }
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public Long createYWH(Long userId, Long uptownId, List<OwnerLinkman> lstOwnerMan) throws Exception {
+        Long sysUserId = queryUser(userId);
         //判断该用户是否已经创建了业委会角色
         List<UserRole> lstUserRole = new ArrayList<>();
-        if (userOpen.getUserId() > 0L) {
-            lstUserRole = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+        if (sysUserId > 0L) {
+            lstUserRole = userRoleMapper.getUserRoleByUserId(sysUserId);
         }
         if (lstUserRole.size() > 0) {
             //判断该用户是否创建了业委会的角色
@@ -152,9 +149,9 @@ public class WxUserOpenService {
         //创建业委会用户角色
         UserRole userRole = new UserRole();
         userRole.setUrId(IdWorker.getId());
-        userRole.setUserId(userOpen.getUserId());
-        userRole.setUserCreate(userOpen.getUserId());
-        userRole.setUserUpdate(userOpen.getUserId());
+        userRole.setUserId(sysUserId);
+        userRole.setUserCreate(sysUserId);
+        userRole.setUserUpdate(sysUserId);
         userRole.setRoleId(2);  //业委会
 
         //判断业委会是否已经建立
@@ -174,25 +171,25 @@ public class WxUserOpenService {
         owner = new Owner();
         owner.setOwnerId(IdWorker.getId());
         owner.setUptownId(uptownId);
-        owner.setUserCreate(userOpen.getUserId());
-        owner.setUserUpdate(userOpen.getUserId());
+        owner.setUserCreate(sysUserId);
+        owner.setUserUpdate(sysUserId);
 
-        userRole.setPropertyId(owner.getOwnerId());
+        userRole.setPropertyId(owner.getOwnerId()); //设置业委会id给角色
         userRoleMapper.insert(userRole);
 
         //建立业委会成员
         if (lstOwnerMan == null) {
             throw new Exception("请新增业委会成员");
         }
-        int masterNum = 0;
-        for (OwnerLinkman item : lstOwnerMan) {
-            if (item.getType() == 1L) {
-                masterNum++;
-            }
-        }
-        if (masterNum != 1L) {
-            throw new Exception("业委会负责人只允许有一个");
-        }
+//        int masterNum = 0;
+//        for (OwnerLinkman item : lstOwnerMan) {
+//            if (item.getType() == 1L) {
+//                masterNum++;
+//            }
+//        }
+//        if (masterNum != 1) {
+//            throw new Exception("业委会负责人只允许有一个");
+//        }
         for (OwnerLinkman item : lstOwnerMan) {
             if (item.getType() == 1L) {
                 owner.setLinkman(item.getLinkman());
@@ -206,4 +203,119 @@ public class WxUserOpenService {
         return 1L;
     }
 
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public List<UserRole> queryUserRoles(Long userId) throws Exception {
+        //获取角色信息
+        Long sysUserId = queryUser(userId);
+        List<UserRole> lstUserRole = new ArrayList<>();
+        if (sysUserId > 0L) {
+            lstUserRole = userRoleMapper.getUserRoleByUserId(sysUserId);
+        }
+        for (int i = 0; i < lstUserRole.size(); i++) {
+            //获取家庭角色的家庭信息
+            if (lstUserRole.get(i).getRoleId() == 1L) {
+                if (lstUserRole.get(i).getPropertyId() > 0L) {
+                    UptownHome uptownHome = uptownHomeMapper.selectById(lstUserRole.get(i).getPropertyId());
+                    if (uptownHome != null) {
+                        UptownHouse uptownHouse = uptownHouseMapper.selectById(lstUserRole.get(i).getPropertyId());
+                        if (uptownHouse == null) {
+                            throw new Exception("门牌信息丢失");
+                        }
+                        uptownHome.setDoorplate(uptownHouse.getDoorplate());
+                        Map<String, Long> map = new HashMap<>();
+                        map.put("unitId", uptownHouse.getUnitId());     //栋单元
+                        sysUptownUnit uptownUnit = sysUptownUnitMapper.selectById(uptownHouse.getUnitId());
+                        if (uptownUnit == null || uptownUnit.getUptownId() == 0L) {
+                            throw new Exception("单元中小区信息丢失");
+                        }
+                        map.put("uptownId", uptownUnit.getUptownId()); //小区
+                        Uptown uptown = uptownMapper.selectById(uptownUnit.getUptownId());
+                        if (uptown == null || uptown.getUptownId() == 0L) {
+                            throw new Exception("小区信息丢失");
+                        }
+                        SysArea sysArea = sysAreaMapper.selectById(uptown.getArea());
+                        map.put("areaId", sysArea.getAreaId());         //县区
+                        SysArea sysCity = sysAreaMapper.selectById(sysArea.getAreaUp());
+                        map.put("cityId", sysCity.getAreaId());         //城市
+                        SysArea sysProvince = sysAreaMapper.selectById(sysCity.getAreaUp());
+                        map.put("provinceId", sysProvince.getAreaId()); //省份
+                        uptownHome.setLocation(map);
+                        lstUserRole.get(i).setUptownHome(uptownHome);
+                    }
+                }
+            }
+            //获取业委会角色的业委会及其成员信息
+            if (lstUserRole.get(i).getRoleId() == 2L) {
+                if (lstUserRole.get(i).getPropertyId() > 0L) {
+                    Owner owner = ownerMapper.selectById(lstUserRole.get(i).getPropertyId());
+                    if (owner != null && owner.getOwnerId() > 0L) {
+                        List<OwnerLinkman> lstOwnerLinkman = ownerLinkmanMapper.getOwnerLinkmanByOwnerId(owner.getOwnerId());
+                        if (lstOwnerLinkman != null && lstOwnerLinkman.size() > 0) {
+                            owner.setLstOwnerLinkman(lstOwnerLinkman);
+                        }
+                        lstUserRole.get(i).setOwner(owner);
+                        Map<String, Long> map = new HashMap<>();
+                        map.put("uptownId", owner.getUptownId());       //小区
+                        Uptown uptown = uptownMapper.selectById(owner.getUptownId());
+                        SysArea sysArea = sysAreaMapper.selectById(uptown.getArea());
+                        map.put("areaId", sysArea.getAreaId());         //县区
+                        SysArea sysCity = sysAreaMapper.selectById(sysArea.getAreaUp());
+                        map.put("cityId", sysCity.getAreaId());         //城市
+                        SysArea sysProvince = sysAreaMapper.selectById(sysCity.getAreaUp());
+                        map.put("provinceId", sysProvince.getAreaId()); //省份
+                        owner.setLocation(map);
+                    }
+                }
+            }
+        }
+        return lstUserRole;
+    }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public List<UptownHome> queryFamily(Long userId) throws Exception {
+        Long sysUserId = queryUser(userId);
+        Long userHouseId = 0L;
+        int roleFamilyNum = 0;
+        List<UserRole> lstUserRole = new ArrayList<>();
+        if (sysUserId > 0L) {
+            lstUserRole = userRoleMapper.getUserRoleByUserId(sysUserId);
+        }
+        if (lstUserRole.size() > 0) {
+            for (UserRole item : lstUserRole) {
+                if (item.getRoleId() == 1L) {
+                    roleFamilyNum++;
+                    userHouseId = item.getPropertyId();
+                }
+            }
+        }
+        if (roleFamilyNum == 0) {
+            throw new Exception("尚未创建家庭角色");
+        }
+        if (roleFamilyNum > 1) {
+            throw new Exception("该用户创建的家庭角色大于1个");
+        }
+        List<UptownHome> lstUptownHome = new ArrayList<>();
+        if (userHouseId > 0L) {
+            lstUptownHome = uptownHomeMapper.getUptownHomeBy(userHouseId);
+        }
+        return lstUptownHome;
+    }
+
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public Long queryUser(Long userId) throws Exception {
+        //这里是为了调试方便，userId由前端传过来
+        Long sysUserId = 0L;
+        if (userId == null || userId == 0L) {
+            UserOpen userOpen = homeService.getUserOpen();
+            if (userOpen == null) {
+                throw new Exception("微信登录失败");
+            }
+            sysUserId = userOpen.getUserId();
+        } else {
+            sysUserId = userId;
+        }
+        return sysUserId;
+    }
+
 }

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

@@ -64,10 +64,10 @@ public class UserOpenController {
                              @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);
+//            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() + "\"");

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

@@ -18,7 +18,6 @@ import com.yvan.platform.YvanUtil;
 import com.yvan.springmvc.HttpParameterParser;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -284,9 +283,6 @@ public class YeWeiHuiController {
     public ModelAndView groupBuyingCx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, @Pd(name = "operation") String operation, ModelMap model) throws JsonProcessingException {
 
         JmTuangou item = jmTuangouService.queryByJmId(jmId);
-        if (item.getTgEndTime().getTime() < new DateTime().getMillis() && item.getTgStatus() == 1) {
-            item.setTgStatus(4);
-        }
 
         model.put("tgItemJson", new JsonWapper(item));
         model.put("tgItem", item);
@@ -303,10 +299,6 @@ public class YeWeiHuiController {
 
         JmTuangou item = jmTuangouService.queryByJmId(jmId);
 
-        if (item.getTgEndTime().getTime() < new DateTime().getMillis() && item.getTgStatus() == 1) {
-            item.setTgStatus(4);
-        }
-
         if (item.getUserId().equals(userId)) {
             model.put("isMine", "mine");
         }
@@ -326,10 +318,6 @@ public class YeWeiHuiController {
 
         JmTuangou item = jmTuangouService.queryByJmId(jmId);
 
-        if (item.getTgEndTime().getTime() < new DateTime().getMillis() && item.getTgStatus() == 1) {
-            item.setTgStatus(4);
-        }
-
         List<JmTuangouMember> members = jmTuangouMemberService.querMemberListByJmId(jmId);
 
         model.put("tgItemJson", new JsonWapper(item));
@@ -385,13 +373,6 @@ public class YeWeiHuiController {
 
         List<JmTuangou> list = jmTuangouService.queryTuangouListByTitle(userId, title);
 
-        for (int i = 0; i < list.size(); i++) {
-            JmTuangou item = list.get(i);
-            if (item.getTgEndTime().getTime() < new DateTime().getMillis() && item.getTgStatus() == 1) {
-                item.setTgStatus(4);
-            }
-        }
-
         return Model.newSuccess(list);
     }
 
@@ -400,13 +381,6 @@ public class YeWeiHuiController {
 
         List<JmTuangou> myList = jmTuangouService.queryTuangouMyListByTitle(userId, title);
 
-        for (int i = 0; i < myList.size(); i++) {
-            JmTuangou item = myList.get(i);
-            if (item.getTgEndTime().getTime() < new DateTime().getMillis() && item.getTgStatus() == 1) {
-                item.setTgStatus(4);
-            }
-        }
-
         return Model.newSuccess(myList);
     }
 

whepi-web/src/main/resources/mapper/Owner.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bofeng.dao.OwnerMapper">
+
+</mapper>