Merge branch 'ww' into test

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java

@@ -40,6 +40,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.LocalTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
@@ -774,9 +775,9 @@ public class TbProductServiceImpl implements TbProductService {
                 .eq("shop_id", shopId)
                 .eq("status", 1)
                 .eq("is_del", 0)
-                .like("days", DateUtil.dayOfWeekEnum(new Date()).getValue())
-                .gt("end_time", System.currentTimeMillis())
-                .lt("start_time", System.currentTimeMillis())
+                .like("days", "%"+DateUtil.dayOfWeekEnum(new Date()).name()+"%")
+                .gt("end_time", new LocalTime())
+                .lt("start_time", new LocalTime())
                 .eq("is_pause_sale", 0);
 
         // 查询skuResult
@@ -875,10 +876,4 @@ public class TbProductServiceImpl implements TbProductService {
             current.remove(current.size() - 1); // 回溯
         }
     }
-
-    public static void main(String[] args) {
-        String str="[{\"label\":\"温度\",\"value\":\"热,冰,少冰\"}]";
-        str=str.replace("label", "name");
-        System.out.println(str);
-    }
 }