czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-07 11:46:41 +08:00
parent e679054486 562fbf1695
commit f7f96434f3
11 changed files with 152 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
View File

@@ -61,6 +61,15 @@ public class AuthorizationController {
return CzgResult.success(authorizationService.login(loginDTO));
}
/**
* 退出登录
*/
@PostMapping("logout")
public CzgResult<?> logout() {
StpKit.USER.logout();
return CzgResult.success();
}
@GetMapping("/permission")
public CzgResult<?> getPermission() {
return CzgResult.success();

17
cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java
View File

@@ -1,8 +1,11 @@
package com.czg.controller.user;
import com.alibaba.fastjson2.JSONObject;
import com.czg.account.vo.home.HomePageVO;
import com.czg.product.service.HomePageService;
import com.czg.product.vo.RecommendProVO;
import com.czg.resp.CzgResult;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,8 +22,12 @@ public class HomeController {
@Resource
private HomePageService homePageService;
/**
* 主页上部分
* 快捷菜单区域 今日上新 飙升热榜 免单信息
*/
@GetMapping("/homePageUp")
public CzgResult<?> homePageUp() {
public CzgResult<HomePageVO> homePageUp() {
return CzgResult.success(homePageService.getHomeInfo());
}
@@ -29,13 +36,13 @@ public class HomeController {
* @param lng 纬度
* @param lat 经度
* @param address 城市
* @param classify 分类 0双人餐 1饮品明细 2咖啡饮品
* @param categoryId 分类 0双人餐 1饮品明细 2咖啡饮品
* @param orderType 排序规则 0离我最近 1销量优先 2价格优先
* @param distanceType 1一千米
* @param distanceType 1000m 2000m
* @return 商品列表
*/
@GetMapping("/product")
public CzgResult<?> home(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType) {
return CzgResult.success(homePageService.getProd(lng, lat, address, classify, orderType, distanceType));
public CzgResult<Page<RecommendProVO>> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType) {
return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType));
}
}