Longlin %!s(int64=5) %!d(string=hai) anos
pai
achega
e9ad7cb221

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

@@ -36,9 +36,9 @@ public class JmTuangouMember {
     @ExcelProperty(value = "最低起送", index = 4)
     private Integer tgMinNum;
     /**
-     * 最大订量
+     * 配送上限
      */
-    @ExcelProperty(value = "最大订量", index = 5)
+    @ExcelProperty(value = "配送上限", index = 5)
     private Integer tgMaxNum;
     /**
      * 小区名称
@@ -66,14 +66,24 @@ public class JmTuangouMember {
     @ExcelProperty(value = "参团数量", index = 10)
     private Integer buyCount;
     /**
+     * 应付款
+     */
+    @ExcelProperty(value = "应付款", index = 11)
+    private Integer buyMoney;
+    /**
+     * 已付款
+     */
+    @ExcelProperty(value = "已付款", index = 12)
+    private Integer payMoney;
+    /**
      * 联系方式
      */
-    @ExcelProperty(value = "联系方式", index = 11)
+    @ExcelProperty(value = "联系方式", index = 13)
     private String phone;
     /**
      * 备注
      */
-    @ExcelProperty(value = "备注", index = 12)
+    @ExcelProperty(value = "备注", index = 14)
     private String myRemark;
 
     private Integer uptownId;

+ 1 - 1
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, 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, z.tg_max_num from jm_buy a
+        select a.user_id,a.buy_count, a.buy_money, 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, z.tg_max_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