Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/yeweihui/tuangouMemberList.ftl

@@ -10,7 +10,11 @@
     <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_num">当前已团: </div>
+        </div>
+        <div style="display: flex; flex-direction: row; justify-content: space-around;">
+            <div id="tg_member_count">家庭用户: </div>
+            <div id="tg_member_num">已参团份数: </div>
+            <div id="tg_member_totoalPrice">合计金额: </div>
         </div>
 
         <div class="msgInfoTabHeaderDiv">
@@ -65,10 +69,11 @@
 
     $('#member_list').empty();
     let totalNum = 0;
+    let totalPrice = 0;
     for (let i = 0; i < members.length; i++) {
         let member = members[i];
         totalNum += member.buyCount;
-
+        totalPrice += member.buyCount * parseFloat(member.tgPrice);
         $('#member_list').append($('<div class="msgInfoTabHeaderDiv">\n' +
             '                <div class="msgInfoTabColumn1">' + member.ridgepole + '-' + member.unit + '-' + member.houseNumber + '</div>\n' +
             '                <div class="msgInfoTabColumn2" style="text-align: center;">' + member.buyCount + '</div>\n' +
@@ -78,6 +83,9 @@
 
     $('#tg_member_xiaoqu').html(members[0].uptownName);
     $('#tg_member_num').append(totalNum);
+    $('#tg_member_count').append(members.length);
+    $('#tg_member_totoalPrice').append(totalPrice);
+
     $("#tg_member_export").attr('href', '/yeweihui/tuangou/member/list/export?jmId=' + tgItem.jmId);
     $('#tg_member_export_url_detail').val(window.location.hostname + '/yeweihui/tuangou/member/list/export?jmId=' + tgItem.jmId);
 </script>

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

@@ -65,6 +65,11 @@ public class JmTuangouMember {
      */
     @ExcelProperty(value = "联系方式", index = 10)
     private String phone;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注", index = 11)
+    private String myRemark;
 
     private Integer uptownId;
 }

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

@@ -3,7 +3,7 @@
 <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, z.tg_title, z.tg_supplier, z.tg_goods, z.tg_price, z.tg_min_num from jm_buy a
+        select a.user_id,a.buy_count,a.phone, a.my_remark, 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