Merge remote-tracking branch 'origin/sit' into dev

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentVo.java

@@ -62,4 +62,7 @@ public class StoreCommentVo extends StoreComment {
 
     private String storeUserName;
     private String storeUserImg;
+
+    @ApiModelProperty(value = "门店名称")
+    private String  storeName;
 }

alien-store/src/main/java/shop/alien/store/controller/StoreMenuController.java

@@ -5,7 +5,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.LifeLikeRecord;
 import shop.alien.entity.store.StoreMenu;
 import shop.alien.entity.store.vo.StoreMenuVo;
 import shop.alien.store.service.StoreMenuService;
@@ -55,13 +54,7 @@ public class StoreMenuController {
     @GetMapping("/delete")
     public R<String> delete(@RequestParam(value = "ids") List<Integer> ids, @RequestParam(value = "dishType") int dishType) {
         log.info("StoreRecommendController.delete?ids={}", ids);
-        boolean flag = false;
-        flag = storeMenuService.deleteMenu(ids, dishType);
-        if (flag) {
-            return R.success("删除成功");
-        } else {
-            return R.fail("删除失败");
-        }
+        return storeMenuService.deleteMenu(ids, dishType);
     }
 
     @ApiOperation("获取菜品详情")

alien-store/src/main/java/shop/alien/store/service/StoreMenuService.java

@@ -62,7 +62,7 @@ public interface StoreMenuService extends IService<StoreMenu> {
      *
      * 删除门店菜单
      */
-    Boolean deleteMenu(List<Integer> ids, int dishType);
+    R deleteMenu(List<Integer> ids, int dishType);
 
 
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -20,6 +20,7 @@ import shop.alien.mapper.*;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.LifeCouponService;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
+import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 import shop.alien.util.common.constant.OrderStatusEnum;
 
@@ -450,6 +451,25 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
     public R<String> orderVerify(String orderCode) {
         OrderCouponMiddle orderCouponMiddle = orderCouponMiddleMapper.selectOne(new LambdaQueryWrapper<OrderCouponMiddle>().eq(OrderCouponMiddle::getCouponCode, orderCode));
         if (!StringUtils.isEmpty(orderCouponMiddle) && orderCouponMiddle.getStatus() == 1) {
+            LifeCoupon lifeCoupon = lifeCouponMapper.selectOne(new LambdaQueryWrapper<LifeCoupon>().eq(LifeCoupon::getId, orderCouponMiddle.getCouponId()));
+            //有效期到
+            Date date = DateUtils.calcDays(orderCouponMiddle.getCreatedTime(), lifeCoupon.getExpirationDate());
+            //开始时间段
+            int beginUseTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
+            //结束时间段
+            int endUseTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());
+            if (new Date().after(date)) {
+                return R.fail("该劵已过期");
+            }
+            if (endUseTime < beginUseTime) {
+                if (!(LocalDateTime.now().getHour() >= beginUseTime || LocalDateTime.now().getHour() < endUseTime)) {
+                    return R.fail("该劵未到使用时间");
+                }
+            } else if (endUseTime > beginUseTime) {
+                if (LocalDateTime.now().getHour() < beginUseTime || LocalDateTime.now().getHour() >= endUseTime) {
+                    return R.fail("该劵未到使用时间");
+                }
+            }
             LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserOrder>().eq(LifeUserOrder::getId, orderCouponMiddle.getOrderId()));
             //类型为:1 代金券订单
             if (lifeUserOrder.getCouponType() == 1) {
@@ -459,7 +479,6 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
             }
         }
         return R.fail("该劵不是待使用状态");
-
     }
 
     public static boolean isCurrentDateInAnyRange(String[] dateRanges) {

alien-store/src/main/java/shop/alien/store/service/impl/StoreCommentServiceImpl.java

@@ -206,6 +206,8 @@ public class StoreCommentServiceImpl extends ServiceImpl<StoreCommentMapper, Sto
                     storeCommentVo.setStoreUserFlag(1);
                 }
             }
+            StoreInfo storeInfo = storeInfoMapper.selectById(records.get(i).getStoreId());
+            storeCommentVo.setStoreName(storeInfo.getStoreName());
             storeCommentVoList.add(storeCommentVo);
         }
 

alien-store/src/main/java/shop/alien/store/service/impl/StoreMenuServiceImpl.java

@@ -9,20 +9,22 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.LifeClassManage;
+import shop.alien.entity.store.LifeGroupBuyThali;
 import shop.alien.entity.store.LifeLikeRecord;
 import shop.alien.entity.store.StoreImg;
 import shop.alien.entity.store.StoreMenu;
 import shop.alien.entity.store.vo.StoreMenuVo;
+import shop.alien.mapper.LifeGroupBuyThaliMapper;
 import shop.alien.mapper.LifeLikeRecordMapper;
 import shop.alien.mapper.StoreMenuMapper;
 import shop.alien.store.service.StoreImgService;
 import shop.alien.store.service.StoreMenuService;
 
-import java.util.*;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -41,6 +43,8 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
 
     private final StoreImgService storeImgService;
 
+    private final LifeGroupBuyThaliMapper lifeGroupBuyThaliMapper;
+
 
     /**
      * 获取门店菜单
@@ -219,10 +223,14 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
      * @return
      */
     @Override
-    public Boolean deleteMenu(List<Integer> ids, int dishType) {
+    public R deleteMenu(List<Integer> ids, int dishType) {
         QueryWrapper<StoreMenu> queryWrapperMenu = new QueryWrapper<>();
         boolean flag = false;
         if (dishType == 0) {
+            List<LifeGroupBuyThali> lifeGroupBuyThaliList = lifeGroupBuyThaliMapper.selectList(new LambdaQueryWrapper<LifeGroupBuyThali>().in(LifeGroupBuyThali::getDetailId, ids));
+            if (CollectionUtil.isNotEmpty(lifeGroupBuyThaliList)) {
+                return R.fail("该菜品已被团购套餐引用，不能删除");
+            }
             flag = this.removeByIds(ids);
         } else {
             queryWrapperMenu.in("id", ids);
@@ -233,9 +241,11 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
             });
             flag = true;
         }
-        return flag;
+        if (!flag) {
+            return R.fail("删除失败");
+        }
+        return R.success("删除成功");
     }
-
     @Override
     public StoreMenuVo getMenuCountByStoreId(int storeId) {
         StoreMenuVo storeMenuVo = new StoreMenuVo();