diff --git a/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryMapper.java b/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryMapper.java index 56e1f33..23b9d23 100644 --- a/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryMapper.java @@ -8,6 +8,7 @@ import com.yxt.yythmall.api.cannotreservedictionary.CannotReserveDictionary; import com.yxt.yythmall.api.cannotreservedictionary.CannotReserveDictionaryVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -21,4 +22,8 @@ public interface CannotReserveDictionaryMapper extends BaseMapper pageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getNotices (@Param("now") String now); + + @Select("select unavailableTime from cannot_reserve_dictionary") + List getAllTime (); + } diff --git a/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryService.java b/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryService.java index 9a58420..8573ff8 100644 --- a/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryService.java +++ b/src/main/java/com/yxt/yythmall/biz/cannotreservedictionary/CannotReserveDictionaryService.java @@ -71,5 +71,9 @@ public class CannotReserveDictionaryService extends MybatisBaseService noticeVos= baseMapper.getNotices(sdf.format(new Date())); return rb.success().setData(noticeVos); } - + public ResultBean> getAllTime() { + ResultBean rb = ResultBean.fireFail(); + List noticeVos= baseMapper.getAllTime(); + return rb.success().setData(noticeVos); + } } diff --git a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java index 0d932fc..2d4a1ee 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java +++ b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreRest.java @@ -31,4 +31,5 @@ public class CustomerStoreRest { public ResultBean isSaturAndSun() { return customerStoreService.isSaturAndSun(); } + } diff --git a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java index 90fdd92..5cbc1dc 100644 --- a/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java +++ b/src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; +import com.yxt.yythmall.api.cannotreservedictionary.CannotReserveDictionary; import com.yxt.yythmall.api.customerstore.CustomerStore; import com.yxt.yythmall.api.customerstore.CustomerStoreDto; import com.yxt.yythmall.api.customerstore.CustomerStoreVo; @@ -14,6 +15,7 @@ import com.yxt.yythmall.api.lpkstore.LpkStore; import com.yxt.yythmall.api.lpkstore.LpkStoreQuery; import com.yxt.yythmall.api.lpkstore.LpkStoreVo; import com.yxt.yythmall.api.lpkstore.StoreSelect; +import com.yxt.yythmall.biz.cannotreservedictionary.CannotReserveDictionaryService; import com.yxt.yythmall.biz.lpkstore.LpkStoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +23,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.time.*; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -33,6 +36,8 @@ import java.util.stream.Collectors; public class CustomerStoreService extends MybatisBaseService { @Autowired LpkStoreService lpkStoreService; + @Autowired + CannotReserveDictionaryService cannotReserveDictionaryService; public ResultBean getStoreBySid(String customerSid) { ResultBean rb=new ResultBean().fail(); @@ -66,57 +71,63 @@ public class CustomerStoreService extends MybatisBaseService isSaturAndSun() { +// ResultBean rb = new ResultBean().fail(); +// +// Date date =new Date(); +// SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// String nowDate =sdf1.format(date); +// String endDate= sdf1.format(DateUtil.offsetMonth(date,12)); +// LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate(); +// LocalDate endD = DateUtil.parse(endDate).toSqlDate().toLocalDate(); +// List weekMap = new ArrayList<>(); +// // 第一个星期六 +// LocalDate saturday = now.with(DayOfWeek.SATURDAY); +// do { +// if (CollectionUtils.isEmpty(weekMap)) { +// weekMap.add(saturday.toString()); +// } else { +// weekMap.add(saturday.toString()); +// } +// // 迭代一个星期 +// saturday = saturday.plus(Period.ofDays(7)); +// } while (saturday.compareTo(endD) < 1); +// // 第一个星期天 +// LocalDate sunday = now.with(DayOfWeek.SUNDAY); +// do { +// if (CollectionUtils.isEmpty(weekMap)) { +// weekMap.add(sunday.toString()); +// } else { +// weekMap.add(sunday.toString()); +// } +// // 迭代一个星期 +// sunday = sunday.plus(Period.ofDays(7)); +// } while (sunday.compareTo(endD) < 1); +// String nextYear = DateUtil.offsetMonth(new Date(), 12).toString(); +// int y = DateUtil.year(DateUtil.parse(nextYear)); +// weekMap.add(String.valueOf(y) + "-01-01"); +// +// weekMap.add("2024-02-05"); +// weekMap.add("2024-02-06"); +// weekMap.add("2024-02-07"); +// weekMap.add("2024-02-08"); +// weekMap.add("2024-02-09"); +// +// weekMap.add("2024-02-12"); +// weekMap.add("2024-02-13"); +// weekMap.add("2024-02-14"); +// weekMap.add("2024-02-15"); +// weekMap.add("2024-02-16"); +// +// +// weekMap=weekMap.stream().filter(e->!e.equals("2024-02-04")).collect(Collectors.toList()); +// Object[] array = weekMap.stream().sorted().toArray(); +// return rb.success().setData(array); +// } public ResultBean isSaturAndSun() { ResultBean rb = new ResultBean().fail(); - - Date date =new Date(); - SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowDate =sdf1.format(date); - String endDate= sdf1.format(DateUtil.offsetMonth(date,12)); - LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate(); - LocalDate endD = DateUtil.parse(endDate).toSqlDate().toLocalDate(); - List weekMap = new ArrayList<>(); - // 第一个星期六 - LocalDate saturday = now.with(DayOfWeek.SATURDAY); - do { - if (CollectionUtils.isEmpty(weekMap)) { - weekMap.add(saturday.toString()); - } else { - weekMap.add(saturday.toString()); - } - // 迭代一个星期 - saturday = saturday.plus(Period.ofDays(7)); - } while (saturday.compareTo(endD) < 1); - // 第一个星期天 - LocalDate sunday = now.with(DayOfWeek.SUNDAY); - do { - if (CollectionUtils.isEmpty(weekMap)) { - weekMap.add(sunday.toString()); - } else { - weekMap.add(sunday.toString()); - } - // 迭代一个星期 - sunday = sunday.plus(Period.ofDays(7)); - } while (sunday.compareTo(endD) < 1); - String nextYear = DateUtil.offsetMonth(new Date(), 12).toString(); - int y = DateUtil.year(DateUtil.parse(nextYear)); - weekMap.add(String.valueOf(y) + "-01-01"); - - weekMap.add("2024-02-05"); - weekMap.add("2024-02-06"); - weekMap.add("2024-02-07"); - weekMap.add("2024-02-08"); - weekMap.add("2024-02-09"); - - weekMap.add("2024-02-12"); - weekMap.add("2024-02-13"); - weekMap.add("2024-02-14"); - weekMap.add("2024-02-15"); - weekMap.add("2024-02-16"); - - - weekMap=weekMap.stream().filter(e->!e.equals("2024-02-04")).collect(Collectors.toList()); - Object[] array = weekMap.stream().sorted().toArray(); + List s=cannotReserveDictionaryService.getAllTime().getData(); + Object[] array = s.stream().sorted().toArray(); return rb.success().setData(array); } public CustomerStoreVo getStart(CustomerStoreVo vo) { diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java index 6f7fe5f..63d8b7e 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java @@ -81,6 +81,9 @@ public class NewcomerRecoRecordService extends MybatisBaseService().eq("sid",dto.getOrderSid())); + if(null==newcomerRecoRecord){ + return rb.success(); + } newcomerRecoRecord.setRecommendedSid(dto.getCustomerSid()); newcomerRecoRecord.setAssistanceDate(new Date()); Listlist=recommendNewUserBagDetailsService.list(new QueryWrapper().eq("giftbagSid",newcomerRecoRecord.getGiftBagSid())); diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java index 6d5f4df..9e352ed 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java +++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java @@ -52,9 +52,9 @@ public class VegeCellarReserveOrderService extends MybatisBaseService l = cannotReserveDictionaryService.list(new QueryWrapper().eq("unavailableTime", date)); if (l.size() > 0) { return false; diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index 5086b6f..d770877 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java @@ -74,6 +74,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/appletgiftbag/recommendRecord/**") //2024-01-17 .excludePathPatterns("/lpkgiftcard/getAllGoodsType/**") + .excludePathPatterns("/appletnotice/getNotice") .excludePathPatterns("/lpkgoods/getAllGoodsType/**") .excludePathPatterns("/transferrecords/submission") .excludePathPatterns("/vegetablecellar/receiveTransferGoods")