门店菜品管理

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

@@ -51,8 +51,8 @@ public class StoreMenuController {
 
     @ApiOperation(value = "删除门店菜单")
     @ApiOperationSupport(order = 3)
-    @PostMapping("/delete")
-    public R<String> delete(@RequestBody @RequestParam(value = "ids") List<Integer> ids, @RequestParam(value = "dishType") int dishType) {
+    @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);

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

@@ -45,29 +45,10 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
     public List<StoreMenuVo> getStoreMenu(Integer storeId, Integer dishType, String phoneId) {
         if(dishType == 0){
             List<StoreMenuVo> collect = storeMenuMapper.getStoreMenuList(storeId, null);
-            collect.forEach(item -> {
-                LambdaQueryWrapper<LifeLikeRecord> likeRecordQueryWrapper = new LambdaQueryWrapper<>();
-                likeRecordQueryWrapper.eq(LifeLikeRecord::getDianzanId, phoneId).eq(LifeLikeRecord::getType, 4).eq(LifeLikeRecord::getHuifuId, item.getId());
-                item.setLikeCount(lifeLikeRecordMapper.selectCount(likeRecordQueryWrapper));
-                if (StringUtils.isNotEmpty(phoneId)) {
-                    LambdaQueryWrapper<LifeLikeRecord> query = new LambdaQueryWrapper<>();
-                    query.eq(LifeLikeRecord::getDianzanId, phoneId).eq(LifeLikeRecord::getHuifuId, item.getId());
-                    Integer i = lifeLikeRecordMapper.selectCount(query);
-                    if (i > 0) {
-                        item.setIsLike(1);
-                    } else {
-                        item.setIsLike(0);
-                    }
-                }
-
-            });
-            return collect.stream().sorted(Comparator.comparing(StoreMenuVo::getImgSort)).collect(Collectors.toList());
+            return collect.stream().sorted(Comparator.comparing(StoreMenuVo::getSort)).collect(Collectors.toList());
         }else {
             List<StoreMenuVo> collect = storeMenuMapper.getStoreMenuList(storeId, dishType);
             collect.forEach(item -> {
-                LambdaQueryWrapper<LifeLikeRecord> likeRecordQueryWrapper = new LambdaQueryWrapper<>();
-                likeRecordQueryWrapper.eq(LifeLikeRecord::getDianzanId, phoneId).eq(LifeLikeRecord::getType, 4).eq(LifeLikeRecord::getHuifuId, item.getId());
-                item.setLikeCount(lifeLikeRecordMapper.selectCount(likeRecordQueryWrapper));
                 if (StringUtils.isNotEmpty(phoneId)) {
                     LambdaQueryWrapper<LifeLikeRecord> query = new LambdaQueryWrapper<>();
                     query.eq(LifeLikeRecord::getDianzanId, phoneId).eq(LifeLikeRecord::getHuifuId, item.getId());
@@ -78,9 +59,8 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
                         item.setIsLike(0);
                     }
                 }
-
             });
-            return collect.stream().sorted(Comparator.comparing(StoreMenuVo::getSort)).collect(Collectors.toList());
+            return collect.stream().sorted(Comparator.comparing(StoreMenuVo::getImgSort)).collect(Collectors.toList());
         }
     }
 
@@ -167,10 +147,12 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
             flag = this.removeByIds(ids);
         }else{
             queryWrapperMenu.in("id",ids);
-            StoreMenu storeMenu = new StoreMenu();
-            storeMenu.setDishType(0);
-            queryWrapperMenu.setEntity(storeMenu);
-            flag = this.update(storeMenu,queryWrapperMenu);
+            List<StoreMenu> storeMenuList = baseMapper.selectList(queryWrapperMenu);
+            storeMenuList.forEach(item->{
+                item.setDishType(0);
+                this.updateById(item);
+            });
+            flag = true;
         }
         return flag;
     }

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

@@ -708,8 +708,10 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
             // 发送通知
             LifeNotice lifeMessage = new LifeNotice();
             lifeMessage.setReceiverId("store_" + storeUser.getPhone());
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String storeDate = simpleDateFormat.format(storeUser.getCreatedTime());
             String text = "处理结果：已撤回注销申请" +
-                    "处理时间：" + storeUser.getCreatedTime() +
+                    "处理时间：" + storeDate +
                     "当前账号状态已恢复正常. 您可以继续使用该账号登录并享受各项服务, 所有个人数据及账户信息" +
                     "均已妥善保留. 若您后续仍有注销需求, 可随时通过账号信息页面重新提交申请. 感谢您的理解与支持!";
             lifeMessage.setContext(text);