Selaa lähdekoodia

业主购买2月10号

guojing 5 vuotta sitten
vanhempi
commit
b1d12af414

+ 10 - 6
whepi-ui/templates/home/buy.ftl

@@ -22,7 +22,9 @@
                         <div style="width: 33%; text-align: center;color: #0a001f">订单状态</div>
                     </div>
                 </div>
-                <div id="MyBuyAll">
+                <div class="container">
+                    <div id="MyBuyAll">
+                    </div>
                 </div>
             </div>
         </div>
@@ -35,8 +37,9 @@
                 <div style="width: 15%; text-align: center;color: #0a001f">状态</div>
             </div>
         </div>
-        <div id="buyAll" class="weui-panel__bd">
-        <#--   <a href="javascript:void(0);" style="color: grey;font-size: large">
+        <div class="container">
+            <div id="buyAll" class="weui-panel__bd">
+            <#--   <a href="javascript:void(0);" style="color: grey;font-size: large">
                 <div style="display: flex; flex-direction: row; text-align: center; font-size: x-small; line-height: 5vh;"
                      onclick=" myBuyClick()">
                     <div style="width: 40%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size: 12px">
@@ -53,6 +56,7 @@
                     </div>
                 </div>
             </a>-->
+            </div>
         </div>
     </div>
 
@@ -138,13 +142,13 @@
             if (v.buyStatus != 1) {
                 return $.alert("该订单已经取消");
             }
-            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 2 + "&tgStatus=" + v.tgStatus+"&buyId="+v.buyId;
+            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 2 + "&tgStatus=" + v.tgStatus + "&buyId=" + v.buyId;
         }
 
 
         /*居民求助信息*/
         function myBuyClick(v) {
-            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 1 + "&tgStatus=" + v.tgStatus+"&buyId="+1;
+            window.location.href = "/home/buytc.html?userId=" + $('#userId').val() + "&jmId=" + v.jmId + "&type=" + 1 + "&tgStatus=" + v.tgStatus + "&buyId=" + 1;
         }
 
 
@@ -179,6 +183,6 @@
             var h = (date.getHours() < 10) ? ('0' + date.getHours() + ':') : (date.getHours() + ':');
             var m = (date.getMinutes() < 10) ? ('0' + date.getMinutes() + ':') : (date.getMinutes() + ':');
             var s = (date.getSeconds() < 10) ? ('0' + date.getSeconds()) : (date.getSeconds());
-            return  M + D + h + m + s;
+            return M + D + h + m + s;
         }
     </script>

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

@@ -12,19 +12,23 @@ import java.util.List;
 @Repository
 public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
-    List<JmTuangou> queryTuangouListByUptownId (@Param("uptownId") Long uptownId);
+  List<JmTuangou> queryTuangouListByUptownId(@Param("uptownId") Long uptownId);
 
-    List<JmTuangou> queryTuangouListByUptownIdAndTitle (@Param("uptownId") Long uptownId, @Param("title") String title);
+  List<JmTuangou> queryTuangouListByUptownIdAndTitle(@Param("uptownId") Long uptownId, @Param("title") String title);
 
-    List<JmTuangou> queryTuangouListByUserId (@Param("userId") Long userId);
+  List<JmTuangou> queryTuangouListByUserId(@Param("userId") Long userId);
 
-    List<JmTuangou> queryTuangouListByUserIdAndTitle (@Param("userId") Long userId, @Param("title") String title);
+  List<JmTuangou> queryTuangouListByUserIdAndTitle(@Param("userId") Long userId, @Param("title") String title);
 
-    JmTuangou selectJmTuangouByJmId(@Param("JmId") Long JmId);
+  JmTuangou selectJmTuangouByJmId(@Param("JmId") Long JmId);
 
-    Integer updateRemarkByJmId(@Param("JmId") Long JmId, @Param("remark") String remark);
+  Integer updateRemarkByJmId(@Param("JmId") Long JmId, @Param("remark") String remark);
 
-    Integer updateStatusByJmId(@Param("JmId") Long JmId, @Param("status") Long status);
+  Integer updateStatusByJmId(@Param("JmId") Long JmId, @Param("status") Long status);
 
-    Integer updateStatusRemarkByJmId(@Param("JmId") Long JmId, @Param("status") Long status, @Param("remark") String remark);
+  Integer updateStatusRemarkByJmId(@Param("JmId") Long JmId, @Param("status") Long status, @Param("remark") String remark);
+
+  List<JmTuangou> selectAll();
+
+  int updateAll(@Param("tg") List<JmTuangou> tg);
 }

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

@@ -2,6 +2,7 @@ package com.bofeng.service;
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.BuyMapper;
+import com.bofeng.dao.JmTuangouDao;
 import com.bofeng.entity.Buy;
 import com.bofeng.entity.JmTuangou;
 import org.joda.time.DateTime;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -19,6 +21,9 @@ public class BuyService {
   @Autowired
   private BuyMapper buyMapper;
 
+  @Autowired
+  private JmTuangouDao jmTuangouDao;
+
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public int buyGroup(Buy buy) {
     Buy buy1 = buyMapper.selectBuyOne(buy.getUserId(), buy.getJmId());
@@ -33,11 +38,15 @@ public class BuyService {
     return buyMapper.insert(buy);
   }
 
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public List<JmTuangou> group(Long userId) {
+    updateStatus();
     return buyMapper.group(userId);
   }
 
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public List<Buy> MyGroup(Long userId) {
+    updateStatus();
     return buyMapper.MyGroup(userId);
   }
 
@@ -67,4 +76,22 @@ public class BuyService {
   public Buy status(Buy buy) {
     return buyMapper.status(buy.getJmId());
   }
+
+  //截止日期状态的更改
+  @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+  public int updateStatus() {
+    List<JmTuangou> jmTuangous = jmTuangouDao.selectAll();
+    if (jmTuangous != null && jmTuangous.size() > 0) {
+      for (JmTuangou list : jmTuangous) {
+        if (list.getTgEndTime().getTime() >= new DateTime().getMillis()) {
+          JmTuangou jmTuangou = new JmTuangou();
+          jmTuangou.setJmId(list.getJmId());
+          jmTuangou.setTgStatus(2);//截止时间已到 发货
+          jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);
+        }
+      }
+    }
+    return 1;
+  }
+
 }

+ 10 - 0
whepi-web/src/main/resources/mapper/JmTuangouMapper.xml

@@ -43,4 +43,14 @@
     <update id="updateStatusRemarkByJmId">
         update jm_tuangou set tg_status=#{status},remark=#{remark} where jm_id=#{JmId}
     </update>
+
+    <select id="selectAll" resultType="com.bofeng.entity.JmTuangou">
+        select * from jm_tuangou where tg_status=1
+    </select>
+
+    <update id="updateAll">
+        <foreach collection="tg" item="item" index="index" separator=";">
+            update jm_tuangou set tg_status=#{item.tgStatus} where jm_id=#{item.jmId}
+        </foreach>
+    </update>
 </mapper>