From dca0031ad5552679d6dfbb80d6edd7adbfc7ec2c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 四月 2023 16:27:51 +0800
Subject: [PATCH] 分服务
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java | 69 ++++++----------------------------
1 files changed, 12 insertions(+), 57 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
similarity index 63%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
index c22fe44..66e954c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
@@ -1,15 +1,16 @@
-package com.ruoyi.member.controller.miniapp;
+package com.ruoyi.order.controller.miniapp;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.*;
-import com.ruoyi.member.domain.vo.*;
-import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.order.domain.dto.AppPageDto;
+import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
+import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.domain.dto.*;
-import com.ruoyi.system.domain.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,52 +35,12 @@
@Autowired
- private RemoteMemberService remoteMemberService;
-
- @Autowired
- private BannerService bannerService;
-
- @Autowired
- private QuickEntryService quickEntryService;
-
- @Autowired
- private AdvertService advertService;
+ private RemoteMemberService memberService;
@Autowired
private GoodsService goodsService;
- @Autowired
- private ShopService shopService;
- @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
- @ApiOperation(value = "获取最近商户")
- public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
- Long userId = SecurityUtils.getUserId();
- appNearbyShopDto.setUserId(userId);
- AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
- return R.ok(appNearbyShopVo);
- }
-
- @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页banner")
- public R<List<AppBannerVo>> getHomeBanner() {
- List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
- return R.ok(appBannerVoList);
- }
-
- @RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页快速入口")
- public R<List<AppQuickEntryVo>> getQuickEntry() {
- List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
- return R.ok(appQuickEntryVoList);
- }
-
- @RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页广告")
- public R<AppAdvertVo> getAdvert() {
- AppAdvertVo appAdvertVo = advertService.getAdvertVo();
- return R.ok(appAdvertVo);
- }
@RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
@ApiOperation(value = "推荐商品")
@@ -87,7 +48,7 @@
Long userId = SecurityUtils.getUserId();
Long shopId = null;
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
shopId = member.getRealtionShopId();
}
@@ -104,7 +65,7 @@
public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appShopGoodsPageDto.setShopId(member.getRealtionShopId());
}
@@ -121,7 +82,7 @@
public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
}
@@ -138,7 +99,7 @@
public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
if(userId!=null){
- Member member = remoteMemberService.getMember(userId).getData();
+ Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRealtionShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
}
@@ -150,12 +111,6 @@
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
- @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户详情")
- public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
- AppShopInfoVo appShopInfoVo = shopService.getAppShopInfo(Long.valueOf(appBaseGetDto.getId()));
- return R.ok(appShopInfoVo);
- }
}
--
Gitblit v1.7.1