新需求

whepi-doc/group.sql

@@ -54,4 +54,7 @@ ADD  user_create    bigint(20)      NOT NULL DEFAULT 0          COMMENT '新增
 ADD  time_create    datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
 ADD  user_update    bigint(20)      NOT NULL DEFAULT 0          COMMENT '修改人',
 ADD  time_update    datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间';
-ADD  role_type      int(11)         NOT NULL DEFAULT 0          COMMENT '角色类型  0 业委会角色 1 指挥部' AFTER tg_min_num;
+ADD  role_type      int(11)         NOT NULL DEFAULT 0          COMMENT '角色类型  0 业委会角色 1 指挥部' AFTER tg_min_num;
+
+ALTER TABLE jm_tuangou
+    ADD  tg_item_num      int(11)         NOT NULL DEFAULT 0          COMMENT '单人限额' after tg_max_num;

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -13,13 +13,15 @@
         <p class="weui-media-box__desc" style="margin-top: 1vh;">供应商：</p>
         <input id="tg_input_supplier" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">套餐：</p>
-        <input id="tg_input_goods" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+        <textarea id="tg_input_goods"  class="weui-textarea" autofocus="" type="text" placeholder="请输入" maxlength="500" rows="5" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px;"></textarea>
         <p class="weui-media-box__desc" style="margin-top: 1vh;">单价（元）：</p>
         <input id="tg_input_price" onkeyup="clearNoNum(this)" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">最低起送（份）：</p>
         <input id="tg_input_minnum" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">最大订量（份）：</p>
         <input id="tg_input_maxnum" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+        <p class="weui-media-box__desc" style="margin-top: 1vh;">单人限购（份）：</p>
+        <input id="tg_input_itemNum" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">截止时间：</p>
         <input id="tg_input_end_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
         <p class="weui-media-box__desc" style="margin-top: 1vh;">预计送货时间：</p>
@@ -96,6 +98,12 @@
             return;
         }
 
+        let itemNum = $("#tg_input_itemNum").val();
+        if (itemNum.length <= 0) {
+            $.alert("请输入单人限购");
+            return;
+        }
+
         let end_time = $("#tg_input_end_time").val();
         if (end_time.length <= 0) {
             $.alert("请选择截止时间");
@@ -141,6 +149,11 @@
             return;
         }
 
+        if (itemNum.length > 4) {
+            $.alert("单人限购最大为9999");
+            return;
+        }
+
         if (parseInt(minnum) <= 0) {
             $.alert("最低起送量应大于0");
             return;
@@ -151,6 +164,16 @@
             return;
         }
 
+        if (parseInt(itemNum) <= 0) {
+            $.alert("单人限购应大于0");
+            return;
+        }
+
+        if (parseInt(maxnum) < parseInt(itemNum)) {
+            $.alert("最大订量应大于或等于单人限购");
+            return;
+        }
+
         let curTimestamp =(new Date()).valueOf();
         let endTimestamp = end_time.replace(/-/g,'/');
         endTimestamp = Date.parse(endTimestamp);
@@ -196,6 +219,7 @@
             tgPrice: price,
             tgMinNum: minnum,
             tgMaxNum: maxnum,
+            tgItemNum: itemNum,
             endTime: end_time,
             deliverTime: deliver_time,
             tgPhoneNumber: phone_number,

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

@@ -61,6 +61,10 @@ public class JmTuangou implements Serializable {
      * 最大订量
      */
     private Integer tgMaxNum = 0;
+    /**
+     * 单人限额
+     */
+    private Integer tgItemNum = 0;
 
     @TableField(exist = false)
     private Integer currentNum;

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

@@ -125,6 +125,9 @@ public class JmTuangouService {
       if (jmTuangou.getTgMaxNum() == null) {
         jmTuangou.setTgMaxNum(0);
       }
+      if (jmTuangou.getTgItemNum() == null) {
+        jmTuangou.setTgItemNum(0);
+      }
       JmTuangou jmTuangou1 = new JmTuangou();
       BeanUtils.copyProperties(jmTuangou1, jmTuangou);
       tgList.add(jmTuangou1);

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

@@ -80,9 +80,9 @@
     </update>
 
     <insert id="insertJmTuangouList">
-        insert into jm_tuangou (jm_id, user_id, uptown_id, tg_title, tg_type, tg_supplier, tg_goods, tg_price, tg_min_num, tg_end_time, tg_deliver_time, tg_phone_number, role_type, remark, tg_status, tg_max_num, user_create, time_create, user_update, time_update) VALUES
+        insert into jm_tuangou (jm_id, user_id, uptown_id, tg_title, tg_type, tg_supplier, tg_goods, tg_price, tg_min_num, tg_end_time, tg_deliver_time, tg_phone_number, role_type, remark, tg_status, tg_max_num, tg_item_num, user_create, time_create, user_update, time_update) VALUES
         <foreach collection="tgList" item="tg" separator=",">
-            (#{tg.jmId}, #{tg.userId}, #{tg.uptownId}, #{tg.tgTitle}, #{tg.tgType}, #{tg.tgSupplier}, #{tg.tgGoods}, #{tg.tgPrice}, #{tg.tgMinNum}, #{tg.tgEndTime}, #{tg.tgDeliverTime}, #{tg.tgPhoneNumber}, #{tg.roleType}, #{tg.remark}, #{tg.tgStatus}, #{tg.tgMaxNum}, #{tg.userCreate}, now(), #{tg.userCreate}, now())
+            (#{tg.jmId}, #{tg.userId}, #{tg.uptownId}, #{tg.tgTitle}, #{tg.tgType}, #{tg.tgSupplier}, #{tg.tgGoods}, #{tg.tgPrice}, #{tg.tgMinNum}, #{tg.tgEndTime}, #{tg.tgDeliverTime}, #{tg.tgPhoneNumber}, #{tg.roleType}, #{tg.remark}, #{tg.tgStatus}, #{tg.tgMaxNum}, #{tg.tgItemNum}, #{tg.userCreate}, now(), #{tg.userCreate}, now())
         </foreach>
     </insert>