Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/business/cmsOrder/service/impl/CmsOrderServiceImpl.java

@@ -1809,7 +1809,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
         orderInfo.setGoodsId(0);
         orderInfo.setUserId(Integer.valueOf(userId));
         orderInfo.setAccount(CyUserUtil.getAuthenUsername());
-        orderInfo.setNum(orderInfo.getNum());
+        orderInfo.setNum(cmsOrder.getNum());
         //计算价格 -开始
         if (cmsOrder.getPrice() != null && cmsOrder.getPrice().compareTo(BigDecimal.ZERO) > 0) {
             BigDecimal price = cmsOrder.getPrice().setScale(2, BigDecimal.ROUND_DOWN);

src/main/java/org/rcisoft/business/memTraffic/service/impl/MemTrafficServiceImpl.java

@@ -66,7 +66,6 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT
         BigInteger memberId = memTraffic.getMemberId();
         Object isFirst = cyRedisServiceImpl.get(MemTrafficRedisBean.USER_MEMTRAFFIC + memberId);
 
-        this.redisTemplate.opsForValue().increment(MemTrafficRedisBean.USER_MEMTRAFFIC + memberId, 1L);
         if (isFirst == null){
             // 获取当前日期
             LocalDate today = LocalDate.now();
@@ -79,8 +78,12 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT
             memTraffic.setBeginTime(createDate);
 
             baseMapper.insertMemTraffic(memTraffic);
-        }
 
+            cyRedisServiceImpl.set(MemberInfoRedisBean.USER_LIKE_ALL + memberId,1L, Long.valueOf(48 * 60 * 60));
+        } else {
+
+            this.redisTemplate.opsForValue().increment(MemTrafficRedisBean.USER_MEMTRAFFIC + memberId, 1L);
+        }
         return new CyPersistModel(1);
     }
 
@@ -133,19 +136,6 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT
         log.info("用户访问数据定时任务结束---");
     }
 
-    /**
-     * 定时删除redis中的访问量
-     */
-    public void memTrafficDelSchedule() {
-        //将redis中存储的点赞数同步到opm_user_like表中
-        Set<String> keys = redisTemplate.keys(MemTrafficRedisBean.USER_MEMTRAFFIC + "*");
-        if (keys != null && !keys.isEmpty()) {
-            for (String key : keys) {
-                redisTemplate.delete(key);
-            }
-        }
-    }
-
     /**
     * 删除 访问量表
     * @param memTraffic

src/main/java/org/rcisoft/core/schedule/ScheduleTasks.java

@@ -107,17 +107,10 @@ public class ScheduleTasks {
     /**
      * 定时更新访问量表
      */
-    @Scheduled(cron = "0 * * * * ?")
+    @Scheduled(cron = "0 0/20 * * * ?")
     public void memTrafficSchedule() {
         memTrafficService.memTrafficSchedule();
     }
 
-    /**
-     * 定时删除redis中的访问量
-     */
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void memTrafficDelSchedule() {
-        memTrafficService.memTrafficDelSchedule();
-    }
 
 }