Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5

@@ -372,7 +372,7 @@ public class SecurityInterceptor implements HandlerInterceptor, ApplicationEvent
                 return null;
                 return null;
             }
             }
             //特殊处理（有可能与有货不共用redis）：如果获取到缓存，把缓存再一次保存到ufo的redis中
             //特殊处理（有可能与有货不共用redis）：如果获取到缓存，把缓存再一次保存到ufo的redis中
-            valueOperations.set(cacheKey,result.getSessionKey(),result.getSessionKeyTimeOut(), TimeUnit.SECONDS);
+            valueOperations.set(cacheKey, uid, result.getSessionKeyTimeOut(), TimeUnit.SECONDS);
             logger.debug("SecurityInterceptor: set session to redis uid {},session key {},result {}",uid,result.getSessionKey(),result);
             logger.debug("SecurityInterceptor: set session to redis uid {},session key {},result {}",uid,result.getSessionKey(),result);
             return String.valueOf(result.getUid());
             return String.valueOf(result.getUid());
         }catch(Exception e){
         }catch(Exception e){

@@ -22,5 +22,9 @@
     </if>
     </if>
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
+    <if test="sizeId = null or sizeId =''">
+      GROUP BY product_id, create_time
+    </if>
+    ORDER BY create_time ASC
   </select>
   </select>
 </mapper>
 </mapper>

@@ -23,5 +23,9 @@
     </if>
     </if>
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
+    <if test="sizeId = null or sizeId =''">
+      GROUP BY product_id, create_time
+    </if>
+    ORDER BY create_time ASC
   </select>
   </select>
 </mapper>
 </mapper>

@@ -23,5 +23,9 @@
     </if>
     </if>
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
+    <if test="sizeId = null or sizeId =''">
+      GROUP BY product_id, create_time
+    </if>
+    ORDER BY create_time ASC
   </select>
   </select>
 </mapper>
 </mapper>

@@ -23,5 +23,9 @@
     </if>
     </if>
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &gt;= #{startTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
     AND create_time &lt;  #{endTime, jdbcType=INTEGER}
+    <if test="sizeId = null or sizeId =''">
+      GROUP BY product_id, create_time
+    </if>
+    ORDER BY create_time ASC
   </select>
   </select>
 </mapper>
 </mapper>