代码优化
This commit is contained in:
hupeng committed
1 parent
61fd52857c
commit
603099079f
9 files changed
+41
-41
No files matched your search
@@ -10,7 +10,7 @@
|
||||
|
||||
<name>ruoyi</name>
|
||||
<url>http://www.ruoyi.vip</url>
|
||||
<description>若依管理系统</description>
|
||||
<description>供货管理系统</description>
|
||||
|
||||
<properties>
|
||||
<ruoyi.version>4.1.0</ruoyi.version>
|
||||
|
||||
@@ -3,12 +3,12 @@ package com.ruoyi.app.modular.shop.controller;
|
||||
import com.itmuch.lightsecurity.jwt.UserOperator;
|
||||
import com.ruoyi.app.common.R;
|
||||
import com.ruoyi.app.common.persistence.model.WechatNewsArticle;
|
||||
import com.ruoyi.app.modular.shop.service.IAdService;
|
||||
import com.ruoyi.app.modular.shop.service.IGoodsService;
|
||||
import com.ruoyi.app.modular.shop.service.INewsService;
|
||||
import com.ruoyi.app.modular.shop.service.dto.AdsDTO;
|
||||
import com.ruoyi.app.modular.shop.service.dto.GoodsDTO;
|
||||
import com.ruoyi.app.modular.shop.service.dto.NewsDTO;
|
||||
import com.ruoyi.app.modular.shop.service.impl.AdServiceImpl;
|
||||
import com.ruoyi.app.modular.shop.service.impl.GoodsServiceImpl;
|
||||
import com.ruoyi.app.modular.shop.service.impl.NewsServiceImpl;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -33,15 +33,14 @@ import java.util.Map;
|
||||
@Api(value = "首页模块", tags = "首页模块", description = "首页模块")
|
||||
public class IndexController {
|
||||
private final UserOperator userOperator;
|
||||
private final GoodsServiceImpl goodsService;
|
||||
private final NewsServiceImpl newsService;
|
||||
private final AdServiceImpl adService;
|
||||
private final IGoodsService goodsService;
|
||||
private final INewsService newsService;
|
||||
private final IAdService adService;
|
||||
|
||||
|
||||
@GetMapping("/shop/index-list")
|
||||
@ApiOperation(value = "首页信息",notes = "首页信息")
|
||||
public R index(){
|
||||
//int userId = userOperator.getUser().getId();
|
||||
int userId = 0;
|
||||
List<GoodsDTO> recommedGoods = goodsService.getList(0,1,3,userId,"",1);
|
||||
List<GoodsDTO> newGoods = goodsService.getList(0,1,6,userId,"",2);
|
||||
@@ -55,7 +54,6 @@ public class IndexController {
|
||||
map.put("ads",ads);
|
||||
|
||||
return R.success(map);
|
||||
//return null;
|
||||
}
|
||||
|
||||
@GetMapping("/shop/news-lists")
|
||||
|
||||
@@ -4,12 +4,12 @@ import cn.hutool.core.util.StrUtil;
|
||||
import com.itmuch.lightsecurity.jwt.UserOperator;
|
||||
import com.ruoyi.app.common.R;
|
||||
import com.ruoyi.app.common.persistence.model.StoreSpecGoodsPrice;
|
||||
import com.ruoyi.app.modular.shop.service.ICateService;
|
||||
import com.ruoyi.app.modular.shop.service.IGoodsService;
|
||||
import com.ruoyi.app.modular.shop.service.IOrderService;
|
||||
import com.ruoyi.app.modular.shop.service.dto.CateDTO;
|
||||
import com.ruoyi.app.modular.shop.service.dto.GoodsDTO;
|
||||
import com.ruoyi.app.modular.shop.service.dto.SpecItemDTO;
|
||||
import com.ruoyi.app.modular.shop.service.impl.CateServiceImpl;
|
||||
import com.ruoyi.app.modular.shop.service.impl.GoodsServiceImpl;
|
||||
import com.ruoyi.app.modular.shop.service.impl.OrderServiceImpl;
|
||||
import com.ruoyi.app.modular.shop.service.mapper.GoodsMapper;
|
||||
import com.ruoyi.app.modular.shop.service.vo.CartVO;
|
||||
import com.ruoyi.app.modular.shop.service.vo.CollectVO;
|
||||
@@ -36,11 +36,11 @@ import java.util.Map;
|
||||
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
|
||||
@Api(value = "商城模块", tags = "商城模块", description = "商城模块")
|
||||
public class MallController {
|
||||
private final CateServiceImpl cateService;
|
||||
private final GoodsServiceImpl goodsService;
|
||||
private final ICateService cateService;
|
||||
private final IGoodsService goodsService;
|
||||
private final UserOperator userOperator;
|
||||
private final GoodsMapper goodsMapper;
|
||||
private final OrderServiceImpl orderervice;
|
||||
private final IOrderService orderervice;
|
||||
|
||||
@GetMapping("/shop/mall-lists")
|
||||
@ApiOperation(value = "商品分类模块列表",notes = "商品分类模块列表")
|
||||
|
||||
@@ -19,6 +19,7 @@ import com.ruoyi.app.common.persistence.model.StoreMember;
|
||||
import com.ruoyi.app.common.persistence.model.StoreOrder;
|
||||
import com.ruoyi.app.common.persistence.model.StoreOrderGoods;
|
||||
import com.ruoyi.app.modular.member.service.IMemberService;
|
||||
import com.ruoyi.app.modular.shop.service.IOrderService;
|
||||
import com.ruoyi.app.modular.shop.service.impl.OrderServiceImpl;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -47,7 +48,7 @@ import java.util.Map;
|
||||
@Api(value = "支付模块", tags = "支付模块", description = "支付模块")
|
||||
public class PayController {
|
||||
private final UserOperator userOperator;
|
||||
private final OrderServiceImpl orderService;
|
||||
private final IOrderService orderService;
|
||||
private final WxPayService wxPayService;
|
||||
private final IMemberService memberService;
|
||||
private final StoreOrderGoodsMapper storeOrderGoodsMapper;
|
||||
|
||||
@@ -11,6 +11,6 @@ import java.util.List;
|
||||
|
||||
|
||||
public interface IAdService extends IService<StoreAds> {
|
||||
public List<AdsDTO> getList();
|
||||
List<AdsDTO> getList();
|
||||
|
||||
}
|
||||
@@ -11,5 +11,5 @@ import java.util.List;
|
||||
|
||||
|
||||
public interface ICateService extends IService<StoreGoodsCate> {
|
||||
public List<CateDTO> getList();
|
||||
List<CateDTO> getList();
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
package com.ruoyi.app.modular.shop.service;
|
||||
|
||||
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.app.common.persistence.model.StoreGoods;
|
||||
import com.ruoyi.app.common.persistence.model.StoreSpecGoodsPrice;
|
||||
import com.ruoyi.app.modular.shop.service.dto.CartDTO;
|
||||
import com.ruoyi.app.modular.shop.service.dto.GoodsDTO;
|
||||
import com.ruoyi.app.modular.shop.service.dto.SpecItemDTO;
|
||||
import com.ruoyi.app.modular.shop.service.vo.CartVO;
|
||||
import com.ruoyi.app.modular.shop.service.vo.PageVO;
|
||||
|
||||
@@ -16,20 +15,22 @@ import java.util.Map;
|
||||
|
||||
|
||||
public interface IGoodsService extends IService<StoreGoods> {
|
||||
public List<GoodsDTO> getList(int cateId,int page,int limit,
|
||||
List<GoodsDTO> getList(int cateId,int page,int limit,
|
||||
int userId,String keywords,int order);
|
||||
|
||||
public boolean isCollect(int goodsId,int userId);
|
||||
boolean isCollect(int goodsId,int userId);
|
||||
|
||||
public List<StoreGoods> collectGoods(int page,int limit,int userId);
|
||||
List<StoreGoods> collectGoods(int page,int limit,int userId);
|
||||
|
||||
public Map<String,StoreSpecGoodsPrice> goodsSpecPrice(int goodsId);
|
||||
Map<String,StoreSpecGoodsPrice> goodsSpecPrice(int goodsId);
|
||||
|
||||
public boolean addOrCancelCollect(int goodsId,int userId,int type);
|
||||
boolean addOrCancelCollect(int goodsId,int userId,int type);
|
||||
|
||||
public boolean addCart(CartVO cartVO,int userId);
|
||||
boolean addCart(CartVO cartVO,int userId);
|
||||
|
||||
public boolean delCart(String goodsIds,int userId);
|
||||
boolean delCart(String goodsIds,int userId);
|
||||
|
||||
public List<CartDTO> cartList(PageVO pageVO,int userId);
|
||||
List<CartDTO> cartList(PageVO pageVO,int userId);
|
||||
|
||||
Map<String, List<SpecItemDTO>> goodsSpec(int goodsId);
|
||||
}
|
||||
@@ -12,6 +12,6 @@ import java.util.List;
|
||||
|
||||
public interface INewsService extends IService<WechatNewsArticle> {
|
||||
|
||||
public List<NewsDTO> getList(int page,int limit);
|
||||
List<NewsDTO> getList(int page,int limit);
|
||||
|
||||
}
|
||||
@@ -18,28 +18,28 @@ import java.util.Map;
|
||||
|
||||
public interface IOrderService extends IService<StoreOrder> {
|
||||
|
||||
public String addOrderOfOne(OrderVo orderVo,int userId);
|
||||
String addOrderOfOne(OrderVo orderVo,int userId);
|
||||
|
||||
public String addOrderOfTwo(OrderVo orderVo,int userId);
|
||||
String addOrderOfTwo(OrderVo orderVo,int userId);
|
||||
|
||||
public int checkStore(int goodsId,String spec_key);
|
||||
int checkStore(int goodsId,String spec_key);
|
||||
|
||||
public void updateCouponStatus(int id);
|
||||
void updateCouponStatus(int id);
|
||||
|
||||
public List<OrderDTO> orderList(int status, int userId, int page,int limit);
|
||||
List<OrderDTO> orderList(int status, int userId, int page,int limit);
|
||||
|
||||
public OrderDTO orderDetail(String orderId,int userId);
|
||||
OrderDTO orderDetail(String orderId,int userId);
|
||||
|
||||
public void orderHandle(int orderId,int type,int userId);
|
||||
void orderHandle(int orderId,int type,int userId);
|
||||
|
||||
public List<StorePointsMoneyLog> pointsMoneyLogs(int type, int userId, int page,int limit);
|
||||
List<StorePointsMoneyLog> pointsMoneyLogs(int type, int userId, int page,int limit);
|
||||
|
||||
public Map<String,Integer> countInfo(int userId);
|
||||
Map<String,Integer> countInfo(int userId);
|
||||
|
||||
public StoreOrder orderInfo(String orderId,int userId);
|
||||
StoreOrder orderInfo(String orderId,int userId);
|
||||
|
||||
public void payYue(StoreOrder order);
|
||||
void payYue(StoreOrder order);
|
||||
|
||||
public void notifyHandle(StoreOrder order);
|
||||
void notifyHandle(StoreOrder order);
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user