admin 2月15号

whepi-ui/templates/home/buyClient.ftl

@@ -80,7 +80,11 @@
                 $("#Buycount").html(data.data.count);
                 $("#myStatus").html(getStatus(data.data.tgStatus));
                 $("#myPhone").val(data.data.phone);
-                $("#tc").html(data.data.tgMaxNum - data.data.count);
+                if (data.data.roleType == 1) {
+                    $("#tc")[0].style.display = 'none';
+                }else {
+                    $("#tc").html(data.data.tgMaxNum - data.data.count);
+                }
                 if (data.data.myRemark != null)
                     $('#Myremarks').text(data.data.myRemark);
                 if (data.data.buyMoney != null)

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

@@ -39,4 +39,6 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
   JmTuangou getSelectOne(@Param("jmId") Long jmId);
 
+  JmTuangou getSelectOneRoleId(@Param("jmId") Long jmId);
+
 }

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

@@ -56,5 +56,7 @@ public class Buy {
   private Integer tgMaxNum;
   @TableField(exist = false)
   private String tgSupplier;
+  @TableField(exist = false)
+  private Integer roleType;
 
 }

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

@@ -89,6 +89,9 @@ public class JmTuangou implements Serializable {
     @TableField(exist = false)
     private String deliverTime;
 
+    @TableField(exist = false)
+    private Integer roleType;
+
     /**
      * 联系人电话
      */

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

@@ -27,22 +27,31 @@ public class BuyService {
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public int buyGroup(Buy buy) {
     Buy buy1 = buyMapper.selectBuyOne(buy.getUserId(), buy.getJmId());
-
+    JmTuangou roleType = jmTuangouDao.getSelectOneRoleId(buy.getJmId());
     if (buy1 != null) {
       JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy1.getJmId());
       Buy buy2 = buyMapper.selectById(buy1.getBuyId());
-      if (jmTuangou.getTgMaxNum().intValue() >= jmTuangou.getCurrentNum().intValue() - buy2.getBuyCount().intValue() + buy.getBuyCount().intValue()) {
+      if (roleType.getRoleType() != 1) {
+        if (jmTuangou.getTgMaxNum().intValue() >= jmTuangou.getCurrentNum().intValue() - buy2.getBuyCount().intValue() + buy.getBuyCount().intValue()) {
+          buy.setBuyId(buy1.getBuyId());
+          return buyMapper.updateById(buy);
+        } else {
+          return 3;//不允许更改团购数量
+        }
+      } else {
         buy.setBuyId(buy1.getBuyId());
         return buyMapper.updateById(buy);
-      } else {
-        return 3;//不允许更改团购数量
       }
     }
-    //第一次购买团购数量大于最大上限数量不允许
-    JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());
-    if (jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
-      return 3;
+    //1 是指挥部
+    if (roleType.getRoleType() != 1) {
+      //第一次购买团购数量大于最大上限数量不允许
+      JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());
+      if (jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
+        return 3;
+      }
     }
+
     buy.setBuyId(IdWorker.getId());
     buy.setUserCreate(buy.getUserId());
     buy.setTimeCreate(new DateTime());
@@ -96,7 +105,7 @@ public class BuyService {
     if (jmTuangous != null && jmTuangous.size() > 0) {
       for (JmTuangou list : jmTuangous) {
         //判断是指挥部还是管理员
-        if (list.getTgSupplier().equals("指挥部")) {
+        if (list.getRoleType()==1) {
           if (list.getTgEndTime().getTime() < new DateTime().getMillis()) {
             jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);//发货
           }

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

@@ -32,7 +32,7 @@
     </select>
 
     <select id="status" resultType="com.bofeng.entity.Buy">
-       SELECT a.tg_status, a.tg_price,a.tg_max_num,b.buy_count,b.buy_money,b.my_remark,
+       SELECT a.tg_status, a.tg_price,a.tg_max_num,b.buy_count,b.buy_money,b.my_remark,a.role_type,
        IFNULL(( SELECT SUM(b.buy_count)
        FROM jm_buy b WHERE a.jm_id = b.jm_id AND buy_status = 1 ), 0 ) AS count,
        ( SELECT phone FROM sys_user_role aa

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

@@ -87,5 +87,9 @@
         select *,uptown_id as uptownIds from jm_tuangou where jm_id=#{jmId}
     </select>
 
+    <select id="getSelectOneRoleId" resultType="com.bofeng.entity.JmTuangou">
+        select * from jm_tuangou where jm_id=#{jmId}
+    </select>
+
 
 </mapper>