修改测试bug

whepi-ui/templates/yeweihui/home.ftl

@@ -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

@@ -49,49 +49,49 @@
 
         let title = $("#tg_input_title").val();
         if (title.length <= 0) {
-            alert("请输入组团标题");
+            $.alert("请输入组团标题");
             return;
         }
 
         let supplier = $("#tg_input_supplier").val();
         if (supplier.length <= 0) {
-            alert("请输入供应商名称");
+            $.alert("请输入供应商名称");
             return;
         }
 
         let goods = $("#tg_input_goods").val();
         if (goods.length <= 0) {
-            alert("请输入套餐内容");
+            $.alert("请输入套餐内容");
             return;
         }
 
         let price = $("#tg_input_price").val();
         if (price.length <= 0) {
-            alert("请输入套餐单价");
+            $.alert("请输入套餐单价");
             return;
         }
 
         let mixnum = $("#tg_input_mixnum").val();
         if (mixnum.length <= 0) {
-            alert("请输入最小起订量");
+            $.alert("请输入最小起订量");
             return;
         }
 
         let end_time = $("#tg_input_end_time").val();
         if (end_time.length <= 0) {
-            alert("请选择截止时间");
+            $.alert("请选择截止时间");
             return;
         }
 
         let deliver_time = $("#tg_input_deliver_time").val();
         if (deliver_time.length <= 0) {
-            alert("请选择送货时间");
+            $.alert("请选择送货时间");
             return;
         }
 
         let phone_number = $("#tg_input_phone_number").val();
         if (phone_number.length <= 0) {
-            alert("请输入服务电话");
+            $.alert("请输入服务电话");
             return;
         }
 

whepi-ui/templates/yeweihui/tuangouMemberList.ftl

@@ -9,7 +9,7 @@
 
     <div class="weui-btn-area">
         <div style="display: flex; flex-direction: row; justify-content: space-around;">
-            <div id="tg_member_xiaoqu">敬业小区</div>
+            <div id="tg_member_xiaoqu"></div>
             <div id="tg_member_num">当前已团: </div>
         </div>
 

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

@@ -7,32 +7,64 @@ import lombok.Data;
 public class JmTuangouMember {
 
     /**
+     * 团购标题
+     */
+    @ExcelProperty(value = "团购标题", index = 0)
+    private String tgTitle;
+
+    /**
+     * 团购供应商
+     */
+    @ExcelProperty(value = "团购供应商", index = 1)
+    private String tgSupplier;
+
+    /**
+     * 团购物资（套餐）
+     */
+    @ExcelProperty(value = "团购物资（套餐）", index = 2)
+    private String tgGoods;
+
+    /**
+     * 价格
+     */
+    @ExcelProperty(value = "价格", index = 3)
+    private String tgPrice;
+
+    /**
+     * 最小起订量
+     */
+    @ExcelProperty(value = "最小起订量", index = 4)
+    private Integer tgMinNum;
+    /**
+     * 小区名称
+     */
+    @ExcelProperty(value = "小区名称", index = 5)
+    private String uptownName;
+    /**
      * 栋
      */
-    @ExcelProperty(value = "楼栋", index = 0)
+    @ExcelProperty(value = "楼栋", index = 6)
     private String ridgepole;
     /**
      * 单元
      */
-    @ExcelProperty(value = "单元", index = 1)
+    @ExcelProperty(value = "单元", index = 7)
     private String unit;
     /**
      * 门牌号
      */
-    @ExcelProperty(value = "门牌号", index = 2)
+    @ExcelProperty(value = "门牌号", index = 8)
     private String houseNumber;
     /**
      * 参团数量
      */
-    @ExcelProperty(value = "参团数量", index = 3)
+    @ExcelProperty(value = "参团数量", index = 9)
     private Integer buyCount;
     /**
      * 联系方式
      */
-    @ExcelProperty(value = "联系方式", index = 4)
+    @ExcelProperty(value = "联系方式", index = 10)
     private String phone;
 
     private Integer uptownId;
-
-    private String uptownName;
 }

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

@@ -3,18 +3,23 @@
 <mapper namespace="com.bofeng.dao.JmTuangouMemberDao">
 
     <select id="querMemberListByJmId" resultType="com.bofeng.entity.JmTuangouMember">
-        select a.user_id,a.buy_count,a.phone, y.houseNumber, y.ridgepole, y.unit, y.uptown_id, y.uptown_name from jm_buy a
-        LEFT JOIN
-          (
-              select a.user_id, b.house_id, b.doorplate as houseNumber, c.uptown_id, c.ridgepole, c.unit, u.uptown_name
-              FROM sys_user_role a
-                       INNER JOIN sys_uptown_house b on a.property_id=b.house_id
-                       INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
-                       INNER JOIN sys_uptown u on u.uptown_id = c.uptown_id
-              where a.user_id in (select user_id from jm_buy where jm_id=#{JmId})
-          ) y
-          on a.user_id=y.user_id
-        where a.jm_id=#{JmId}
+        select a.user_id,a.buy_count,a.phone, y.houseNumber, y.ridgepole, y.unit, y.uptown_id, y.uptown_name, z.tg_title, z.tg_supplier, z.tg_goods, z.tg_price, z.tg_min_num from jm_buy a
+           LEFT JOIN
+       (
+           select a.user_id, b.house_id, b.doorplate as houseNumber, c.uptown_id, c.ridgepole, c.unit, u.uptown_name
+           FROM sys_user_role a
+                    INNER JOIN sys_uptown_house b on a.property_id=b.house_id
+                    INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
+                    INNER JOIN sys_uptown u on u.uptown_id = c.uptown_id
+           where a.user_id in (select user_id from jm_buy where jm_id=#{JmId})
+       ) y
+       on a.user_id=y.user_id
+           LEFT JOIN
+       (
+           SELECT * FROM jm_tuangou
+       ) z
+       on a.jm_id=z.jm_id
+        where a.jm_id=#{JmId} and a.buy_status=1
     </select>
 
 </mapper>