通过手机号获取用户信息

alien-entity/src/main/java/shop/alien/entity/store/StoreMenu.java

@@ -40,7 +40,7 @@ public class StoreMenu {
 
     @ApiModelProperty(value = "菜品价格")
     @TableField("dish_price")
-    private Integer dishPrice;
+    private BigDecimal dishPrice;
 
     @ApiModelProperty(value = "菜品类型, 0:菜单, 1:推荐")
     @TableField("dish_type")

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

@@ -58,6 +58,5 @@ public class StoreMainInfoVo extends StoreInfo {
     @ApiModelProperty(value = "注销状态用户")
     private Integer logoutFlagUser;
 
-    @ApiModelProperty(value = "今日订单量")
-    private Integer orderQuantity;
+
 }

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

@@ -74,8 +74,8 @@ public class StoreMenuController {
 
     @ApiOperation("菜品排序")
     @ApiOperationSupport(order = 5)
-    @GetMapping("/getSortMenuInfo")
-    public R<Boolean> getSortMenuInfo(StoreMenuVo storeMenuVo) {
+    @PostMapping("/getSortMenuInfo")
+    public R<Boolean> getSortMenuInfo(@RequestBody StoreMenuVo storeMenuVo) {
         log.info("StoreRecommendController.getSortMenuInfo?storeMenuVo={}", storeMenuVo);
         Boolean flag = false;
         flag = storeMenuService.getSortMenuInfo(storeMenuVo);

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

@@ -404,7 +404,7 @@ public class StoreUserController {
      * 商家端撤销注销用户
      */
     @ApiOperation("手动删除商家账号及店铺")
-    @DeleteMapping("/deleteStoreAccountInfo")
+    @PostMapping("/deleteStoreAccountInfo")
     public R<StoreUserVo> deleteStoreAccountInfo(@RequestBody StoreUserVo storeUserVo) {
         log.info("StoreUserController.deleteStoreAccountInfo?storeUserVo={}", storeUserVo);
         storeUserService.deleteStoreAccountInfo(storeUserVo);

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

@@ -43,24 +43,45 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
      */
     @Override
     public List<StoreMenuVo> getStoreMenu(Integer storeId, Integer dishType, String phoneId) {
-        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());
-                Integer i = lifeLikeRecordMapper.selectCount(query);
-                if (i > 0) {
-                    item.setIsLike(1);
-                } else {
-                    item.setIsLike(0);
+        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::getImgSort)).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());
+                    Integer i = lifeLikeRecordMapper.selectCount(query);
+                    if (i > 0) {
+                        item.setIsLike(1);
+                    } else {
+                        item.setIsLike(0);
+                    }
+                }
+
+            });
+            return collect.stream().sorted(Comparator.comparing(StoreMenuVo::getSort)).collect(Collectors.toList());
+        }
     }
 
     /**
@@ -90,6 +111,7 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
                 log.error("菜单修改失败");
                 return R.fail("菜单修改失败");
             }
+            return R.success("菜单修改成功");
         }else{//新增菜品
            if(StringUtils.isEmpty(storeMenu.getDishName())){
                return R.fail("请输入菜品名称");
@@ -105,7 +127,7 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
             //保存菜品
             flag = this.save(storeMenu);
            if(!flag){
-               return R.fail("菜单修改失败");
+               return R.fail("菜品新增失败");
            }
         }
         return R.success("新增菜品成功");
@@ -122,7 +144,7 @@ public class StoreMenuServiceImpl extends ServiceImpl<StoreMenuMapper, StoreMenu
         if(CollectionUtil.isNotEmpty(storeMenuVo.getSortList())){
             for(int i = 0; i<storeMenuVo.getSortList().size(); i++ ){
                 LambdaQueryWrapper<StoreMenu> lambdaQueryWrapper = new LambdaQueryWrapper();
-                lambdaQueryWrapper.eq(StoreMenu::getId,storeMenuVo.getId());
+                lambdaQueryWrapper.eq(StoreMenu::getId,storeMenuVo.getSortList().get(i).getId());
                 StoreMenu storeMenu = this.getOne(lambdaQueryWrapper);
                 storeMenu.setSort(i+1);
                 flag = this.updateById(storeMenu);

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

@@ -104,10 +104,6 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         }
 
         if (null == user) return new StoreUserVo();
-        LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StoreInfo::getId, user.getStoreId());
-        StoreInfo info = storeInfoMapper.selectOne(wrapper);
-        if (null != info) user.setName(info.getStoreName());
         BeanUtils.copyProperties(user, storeUserVo);
         return storeUserVo;
     }
@@ -677,6 +673,7 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
                             "[账号信息]撤回申请. 冷静期结束后, 系统将正式开始注销操作. 账号内所有数据(包括但不限于个人信息、 资产等) 将被永久清除, 且无法恢复." +
                             "如有疑问, 可联系【客服】咨询. 感谢您使用我们的服务.";
                     lifeMessage.setContext(text);
+                    lifeMessage.setTitle("注销通知");
                     lifeMessage.setSenderId("system");
                     lifeMessage.setIsRead(0);
                     lifeMessage.setNoticeType(1);
@@ -716,6 +713,7 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
                     "当前账号状态已恢复正常. 您可以继续使用该账号登录并享受各项服务, 所有个人数据及账户信息" +
                     "均已妥善保留. 若您后续仍有注销需求, 可随时通过账号信息页面重新提交申请. 感谢您的理解与支持!";
             lifeMessage.setContext(text);
+            lifeMessage.setTitle("撤销注销通知");
             lifeMessage.setSenderId("system");
             lifeMessage.setIsRead(0);
             lifeMessage.setNoticeType(1);