diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index e3c2a3e..0f40a39 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -910,7 +910,7 @@ public class MeituanServiceImpl implements IMeituanService { target.setId(null); target.setCreateTime(Date.from(date.atZone(ZoneId.systemDefault()).toInstant())); addList.add(target); - }else{ + }else if(list2.size() == 1){ BusStoreDayHistoryInfo target = new BusStoreDayHistoryInfo(); BeanUtils.copyProperties(busStoreDayInfo, target); target.setCreateTime(Date.from(date.atZone(ZoneId.systemDefault()).toInstant())); @@ -1073,8 +1073,15 @@ public class MeituanServiceImpl implements IMeituanService { // 解析Cookie private String valueFromCookie(String key, String text) { + if("".equals(text)){ + return ""; + } + int index = text.indexOf(key); + if(index == -1){ + return ""; + } key = key+"="; - String s = text.substring(text.indexOf(key), text.length()); + String s = text.substring(index, text.length()); String value = s.substring(s.indexOf("=") + 1, s.indexOf(";")); return value; } diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml index 405ecc2..1ab13bf 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -25,12 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, store_code, store_name, content1, content2, content3, content4, min_order_num, max_order_num, start_time, end_time, is_splice_order, self_delivery_duration, quota, quota_status, remark,sale_bind_id from bus_store_config_info + select id, store_id, store_code, store_name, content1, content2, content3, content4, min_order_num, max_order_num, start_time, end_time, is_splice_order, self_delivery_duration, quota, quota_status, remark,sale_bind_id from bus_store_config_info