rentaiming
2024-06-03 87c4df897d0c1344df54fb7afc261e7d6490a988
修改循环注入
2个文件已添加
7个文件已修改
174 ■■■■ 已修改文件
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java
@@ -37,14 +37,12 @@
    }
    @PostMapping("/getMemberArticleList")
    @ResponseBody
    @ApiOperation(value = "用户端-获取用户资讯")
    public R<PageDTO<Article>> getMemberArticleList(@RequestBody ArticleDTO articleDTO) {
        return R.ok(iArticleService.getMemberArticleList(articleDTO));
    }
    @PostMapping("/saveMemberArticle")
    @ResponseBody
    @ApiOperation(value = "用户端-添加或者修改用户资讯")
    public R saveMemberArticle(@RequestBody ArticleDTO articleDTO) {
        iArticleService.saveMemberArticle(articleDTO);
@@ -52,7 +50,6 @@
    }
    @PostMapping("/delMemberArticle")
    @ResponseBody
    @ApiOperation(value = "用户端-删除用户资讯")
    public R delMemberArticle(@RequestBody ArticleDTO articleDTO) {
        iArticleService.delMemberArticle(articleDTO);
@@ -61,7 +58,6 @@
    @PostMapping("/getMemberArticleInfo")
    @ResponseBody
    @ApiOperation(value = "用户端-获取资讯详情")
    public R<ArticleVO> getMemberArticleInfo(ArticleDTO articleDTO) {
        return R.ok(iArticleService.getMemberArticleInfo(articleDTO));
@@ -69,14 +65,12 @@
    @PostMapping("/getArticleCommentsList")
    @ResponseBody
    @ApiOperation(value = "用户端-获取评论列表")
    public R<PageDTO<ArticleCommentsVO>> getArticleCommentsList(ArticleDTO articleDTO) {
        return R.ok(iArticleService.getArticleCommentsList(articleDTO));
    }
    @PostMapping("/getreport")
    @ResponseBody
    @ApiOperation(value = "用户端-用户举报举报文章")
    public R getReport(ArticleDTO articleDTO) {
        iArticleService.getReport(articleDTO);
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
@@ -33,13 +33,7 @@
    @Resource
    private IAuctionGoodsService iAuctionGoodsService;
    @InnerAuth
    @PostMapping("/getAuctionGoodsOne")
    public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
        AuctionGoods auctionGoods=iAuctionGoodsService.getById(auctionSalesroomId);
        return R.ok(auctionGoods);
    }
     @PostMapping("/getAuctionGoodsList")
    @ApiOperation(value = "用户端-普通拍卖商品")
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -44,15 +44,6 @@
    @Resource
    private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
    @InnerAuth
    @PostMapping("/getAuctionSalesroomOne")
    @ResponseBody
    public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
        AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
        return R.ok(auctionSalesroomOne);
    }
    /**
     * 拍卖大屏获取拍卖信息
     *
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
@@ -4,12 +4,11 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AuctionGoods;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
 * <p>
@@ -27,6 +26,14 @@
    private final IAuctionGoodsService auctionGoodsService;
    @InnerAuth
    @PostMapping("/getAuctionGoodsOne")
    public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
        AuctionGoods auctionGoods=auctionGoodsService.getById(auctionSalesroomId);
        return R.ok(auctionGoods);
    }
    @PutMapping("/auction-goods/end/{id}")
    R<?> endAuctionGoods(@PathVariable("id") Long id) {
        try {
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java
New file
@@ -0,0 +1,51 @@
package com.ruoyi.auction.controller.inner;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * <p>
 * 拍卖场表 前端控制器
 * </p>
 *
 * @author mitao
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/auction-salesroom")
public class AuctionSalesroomController {
    @Resource
    private IAuctionSalesroomService iAuctionSalesroomService;
    @InnerAuth
    @PostMapping("/getAuctionSalesroomOne")
    @ResponseBody
    public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
        AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
        return R.ok(auctionSalesroomOne);
    }
}
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/ForepartGoodsGroupPurchaseController.java
@@ -44,7 +44,6 @@
    }
    @PostMapping("/CtjlGoodsGroupPurchase")
    @ResponseBody
    @ApiOperation(value = "用户端-我的参团记录")
    public R<PageDTO<WdGoodsGroupPurchaseVO>> CtjlGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO) {
        return R.ok(goodsGroupPurchaseService.CtjlGoodsGroupPurchase(homeGoodsSkuDTO));
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
@@ -42,26 +42,6 @@
    private IRegionService  IRegionService;
    @PostMapping("/getMemberAddressOne")
    @ResponseBody
    @InnerAuth
    public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
        LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(MemberAddress::getMemberId,userId);
        wrapper2.eq(MemberAddress::getDelFlag,0);
        wrapper2.eq(MemberAddress::getIsDefault,2);
        MemberAddress memberAddress=iMemberAddressService.getOne(wrapper2);
        if (memberAddress==null){
            LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(MemberAddress::getMemberId,userId);
            wrapper.eq(MemberAddress::getDelFlag,0);
            wrapper.last("limit 1");
            memberAddress=iMemberAddressService.getOne(wrapper2);
        }
        return R.ok(memberAddress);
    }
    @PostMapping("/getRegione")
    @ApiOperation(value = "用户端-获取三级联动的地址")
    public R<List<RegionVo>> getRegione() {
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java
New file
@@ -0,0 +1,62 @@
package com.ruoyi.member.controller.inner;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.domain.vo.RegionVo;
import com.ruoyi.member.dto.MemberAddressDTO;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * <p>
 * 会员地址表 前端控制器
 * </p>
 *
 * @author mitao
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/member-address")
public class MemberAddressController {
    /**
     * 获取当前商品信息
     *
     */
    @ApiModelProperty
    private IMemberAddressService iMemberAddressService;
    @PostMapping("/getMemberAddressOne")
    @ResponseBody
    @InnerAuth
    public R<MemberAddress> getMemberAddressOne(@RequestBody Integer userId) {
        LambdaQueryWrapper<MemberAddress> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(MemberAddress::getMemberId,userId);
        wrapper2.eq(MemberAddress::getDelFlag,0);
        wrapper2.eq(MemberAddress::getIsDefault,2);
        MemberAddress memberAddress=iMemberAddressService.getOne(wrapper2);
        if (memberAddress==null){
            LambdaQueryWrapper<MemberAddress> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(MemberAddress::getMemberId,userId);
            wrapper.eq(MemberAddress::getDelFlag,0);
            wrapper.last("limit 1");
            memberAddress=iMemberAddressService.getOne(wrapper2);
        }
        return R.ok(memberAddress);
    }
}
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
@@ -28,10 +28,8 @@
        return R.ok(memberService.getMemberListByIds(memberIdList));
    }
    @RequestMapping("/getMembeOne")
    @ResponseBody
    @PostMapping("/getMembeOne")
    @InnerAuth
    @ApiOperation(value = "获取通过id用户信息")
    public R<Member> getMembeOne(@RequestBody Long userId) {
        return R.ok(memberService.getById(userId));
    }