From e59e26244b2a07b9d8360551cbab75c6fd8a1248 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 15:15:21 +0800
Subject: [PATCH] 修改循环注入
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 18 -
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 28 +-
ruoyi-modules/ruoyi-order/pom.xml | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java | 7
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java | 11
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/WeiXinAppController.java | 0
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java | 19 -
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java | 6
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 14 -
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/PayController.java | 1
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionController.java | 2
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 34 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java | 6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 4
ruoyi-modules/ruoyi-seata-demo/src/main/resources/bootstrap.yml | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderReturnRequestController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/JsapiTicketUtil.java | 4
ruoyi-modules/ruoyi-seata-demo/target/classes/bootstrap.yml | 4
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceRiseController.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 25 +-
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java | 8
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponController.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 13
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java | 15 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java | 2
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 2
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java | 5
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java | 15 -
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java | 64 +++++
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java | 25 +-
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/CouponMemberDTO.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java | 6
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java | 21 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java | 6
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java | 2
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartSensitiveWordsController.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/AppConfig.java | 34 +++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InvoicingApplicationController.java | 2
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java | 21 +-
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionVideoController.java | 20 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceOrderController.java | 6
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberLevelController.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 5
/dev/null | 50 -----
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java | 8
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 9
55 files changed, 297 insertions(+), 294 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index 833fe57..1d66ebb 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -54,10 +54,11 @@
}
@Override
- public R<List<OrderAuctionBond>> getOrderAuctionBondList(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, String source) {
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList1(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO, String source) {
return R.fail("获取保证金订单列表失败:" + cause.getMessage());
}
+
@Override
public R<Map<String, Object>> refund(List<RefundDTO> refundDTOS, String source) {
return R.fail("批量退款失败" + cause.getMessage());
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
index c820bfd..bdec9d5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -68,8 +68,8 @@
R<List<Order>> getOrderByGroupPurchaseId(@PathVariable("id") Long id,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/order-auction-bond/getOrderAuctionBondList")
- R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO,
+ @PostMapping("/order-auction-bond/getOrderAuctionBondList1")
+ R<List<OrderAuctionBond>> getOrderAuctionBondList1(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java
similarity index 91%
rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java
index 0eeec5a..2d55b88 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleCommentsController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleCommentsController.java
@@ -1,8 +1,7 @@
-package com.ruoyi.article.controller;
+package com.ruoyi.article.controller.forepart;
import com.ruoyi.article.dto.ArticleCommentsDTO;
-import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
@@ -23,7 +22,7 @@
@RestController
@RequestMapping("/article-comments")
@Api(value = "用户端-评论回复表相关接口", tags = "用户端-评论回复表址相关接口", description = "用户端-评论回复表相关接口")
-public class ArticleCommentsController {
+public class ForepartArticleCommentsController {
@Resource
private IArticleCommentsService articleCommentsService;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java
similarity index 85%
rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java
index 4f96fb7..c3f1880 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/ArticleController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartArticleController.java
@@ -1,30 +1,19 @@
-package com.ruoyi.article.controller;
+package com.ruoyi.article.controller.forepart;
import com.ruoyi.article.domain.Article;
import com.ruoyi.article.dto.ArticleDTO;
-import com.ruoyi.article.dto.MemberLikeDTO;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
/**
* <p>
@@ -37,7 +26,7 @@
@RestController
@RequestMapping("/article")
@Api(value = "用户端-资讯相关接口", tags = "用户端-资讯相关接口", description = "用户端-资讯相关接口")
-public class ArticleController {
+public class ForepartArticleController {
@Resource
private IArticleService iArticleService;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java
index febb4d2..0dc82e8 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberArticleCollectionController.java
@@ -1,12 +1,9 @@
-package com.ruoyi.article.controller;
+package com.ruoyi.article.controller.forepart;
-import com.ruoyi.article.domain.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.dto.MemberArticleCollectionDTO;
-import com.ruoyi.article.dto.MemberLikeDTO;
import com.ruoyi.article.service.IMemberArticleCollectionService;
-import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.article.vo.MemberArticleCollectionVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -28,7 +25,7 @@
@RestController
@RequestMapping("/member-article-collection")
@Api(value = "用户端-资讯文章收藏相关接口", tags = "用户端-资讯文章收藏相关接口", description = "用户端-资讯文章收藏相关接口")
-public class MemberArticleCollectionController {
+public class ForepartMemberArticleCollectionController {
@Resource
private IMemberArticleCollectionService memberArticleCollectionService;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java
similarity index 91%
rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java
rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java
index b1ca0e5..65c30db 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberLikeController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartMemberLikeController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.article.controller;
+package com.ruoyi.article.controller.forepart;
import com.ruoyi.article.dto.MemberLikeDTO;
@@ -22,7 +22,7 @@
@RestController
@RequestMapping("/member-like")
@Api(value = "用户端-资讯点赞相关接口", tags = "用户端-资讯点赞相关接口", description = "用户端-资讯点赞相关接口")
-public class MemberLikeController {
+public class ForepartMemberLikeController {
@Resource
private IMemberLikeService memberLikeService;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartSensitiveWordsController.java
similarity index 92%
rename from ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java
rename to ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartSensitiveWordsController.java
index 03920a8..a111bd0 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/SensitiveWordsController.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/ForepartSensitiveWordsController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.article.controller;
+package com.ruoyi.article.controller.forepart;
import com.ruoyi.article.domain.SensitiveWords;
@@ -24,7 +24,7 @@
@RestController
@RequestMapping("/sensitive-words")
@Api(value = "用户端-资讯敏感词相关接口", tags = "用户端-资讯敏感词相关接口", description = "用户端-资讯敏感词相关接口")
-public class SensitiveWordsController {
+public class ForepartSensitiveWordsController {
@Resource
private ISensitiveWordsService SensitiveWordsService;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
index 3e82b6e..70bd3e4 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.article.domain.ArticleComments;
import com.ruoyi.article.dto.ArticleCommentsDTO;
import com.ruoyi.article.mapper.ArticleCommentsMapper;
+import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.common.core.exception.ServiceException;
@@ -23,17 +24,15 @@
@Service
public class ArticleCommentsServiceImpl extends
ServiceImpl<ArticleCommentsMapper, ArticleComments> implements IArticleCommentsService {
- @Resource
- private IArticleCommentsService articleCommentsService;
@Resource
- private IArticleService articleService;
+ private ArticleMapper articleMapper;
@Override
public void saveMemberArticleComments(ArticleCommentsDTO articleCommentsDTO) {
ArticleComments articleComments=new ArticleComments();
if (articleCommentsDTO.getId()!=null){
- articleComments= articleCommentsService.getById(articleCommentsDTO.getId());
+ articleComments= this.getById(articleCommentsDTO.getId());
}
if (articleCommentsDTO.getMemberId()==null){
throw new ServiceException("用户id错误");
@@ -51,20 +50,20 @@
articleComments.setBmemberId(articleCommentsDTO.getBmemberId());
articleComments.setType(2);
}
- Article byId = articleService.getById(articleCommentsDTO.getArticleId());
+ Article byId = articleMapper.selectById(articleCommentsDTO.getArticleId());
byId.setCommentCount(byId.getCommentCount()+1);
- articleService.saveOrUpdate(byId);
- articleCommentsService.saveOrUpdate(articleComments);
+ articleMapper.updateById(byId);
+ this.saveOrUpdate(articleComments);
}
@Override
public void delMemberArticleComments(ArticleCommentsDTO articleCommentsDTO) {
- ArticleComments byId1 = articleCommentsService.getById(articleCommentsDTO.getId());
+ ArticleComments byId1 = this.getById(articleCommentsDTO.getId());
- Article byId = articleService.getById(byId1.getArticleId());
+ Article byId = articleMapper.selectById(byId1.getArticleId());
byId.setCommentCount(byId.getCommentCount()-1);
- articleService.saveOrUpdate(byId);
+ articleMapper.updateById(byId);
- articleCommentsService.removeById(articleCommentsDTO.getId());
+ this.removeById(articleCommentsDTO.getId());
}
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index 2375d1e..a4a9761 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -44,8 +44,6 @@
@Service
public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements IArticleService {
- @Resource
- private IArticleService articleService;
@Resource
private IArticleCommentsService articleCommentsService;
@@ -70,7 +68,7 @@
wrapper.eq(Article::getStatus,2);
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
- Page< Article> page1 = articleService.page(page, wrapper);
+ Page< Article> page1 = this.page(page, wrapper);
PageDTO<ArticleVO> articleCommentsVOPageDTO = PageDTO.of(page1, ArticleVO.class);
List<ArticleVO> list2 = articleCommentsVOPageDTO.getList();
@@ -114,7 +112,7 @@
wrapper.eq(Article::getMemberId,articleDTO.getMemberId());
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
- Page<Article> page1 = articleService.page(page, wrapper);
+ Page<Article> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
@@ -122,7 +120,7 @@
public void saveMemberArticle(ArticleDTO articleDTO) {
Article article=new Article();
if (articleDTO.getId()!=null){
- article=articleService.getById(articleDTO.getId());
+ article=this.getById(articleDTO.getId());
}
article.setMemberId(articleDTO.getMemberId());
article.setArticleType(ArticleTypeEnum.USER_POSTING);
@@ -141,18 +139,18 @@
}
article.setImages(urlList.toString());
}
- articleService.saveOrUpdate(article);
+ this.saveOrUpdate(article);
}
@Override
public void delMemberArticle(ArticleDTO articleDTO) {
- articleService.removeById(articleDTO.getId());
+ this.removeById(articleDTO.getId());
}
@Override
public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
- Article article=articleService.getById(articleDTO.getId());
+ Article article=this.getById(articleDTO.getId());
ArticleVO articleVO=new ArticleVO();
BeanUtils.copyProperties(article, articleVO);
@@ -264,12 +262,12 @@
@Override
public void getReport(ArticleDTO articleDTO) {
- Article article= articleService.getById(articleDTO.getId());
+ Article article= this.getById(articleDTO.getId());
R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId(),
SecurityConstants.INNER);
Member data = membeOne.getData();
article.setReportBy(data.getNickname());
article.setReportedTime(LocalDateTime.now());
- articleService.saveOrUpdate(article);
+ this.saveOrUpdate(article);
}
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
index 09d3d0f..377b3ed 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.article.domain.MemberArticleCollection;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.dto.MemberArticleCollectionDTO;
+import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.mapper.MemberArticleCollectionMapper;
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
@@ -33,11 +34,9 @@
@Service
public class MemberArticleCollectionServiceImpl extends ServiceImpl<MemberArticleCollectionMapper, MemberArticleCollection> implements IMemberArticleCollectionService {
- @Resource
- private IMemberArticleCollectionService memberArticleCollectionService;
@Resource
- private IArticleService articleService;
+ private ArticleMapper articleMapper;
@Resource
private MemberClient memberClient;
@@ -55,26 +54,26 @@
wrapper.eq(MemberArticleCollection::getTargetId,memberArticleCollectionDTO.getTargetId());
if (memberArticleCollectionDTO.getState()==1){
- List<MemberArticleCollection> list = memberArticleCollectionService.list(wrapper);
+ List<MemberArticleCollection> list = this.list(wrapper);
if (list.size()==0){
MemberArticleCollection m =new MemberArticleCollection();
m.setMemberId(memberArticleCollectionDTO.getMemberId());
m.setTargetId(memberArticleCollectionDTO.getTargetId());
- memberArticleCollectionService.save(m);
+ this.save(m);
- Article byId = articleService.getById(memberArticleCollectionDTO.getTargetId());
+ Article byId = articleMapper.selectById(memberArticleCollectionDTO.getTargetId());
byId.setCollectCount(byId.getCollectCount()+1);
- articleService.saveOrUpdate(byId);
+ articleMapper.updateById(byId);
}
}else{
- List<MemberArticleCollection> list = memberArticleCollectionService.list(wrapper);
+ List<MemberArticleCollection> list = this.list(wrapper);
if (list.size()>0){
for (MemberArticleCollection memberArticleCollection:list){
- Article byId = articleService.getById(memberArticleCollection.getTargetId());
+ Article byId = articleMapper.selectById(memberArticleCollection.getTargetId());
byId.setCollectCount(byId.getCollectCount()-1);
- articleService.saveOrUpdate(byId);
- memberArticleCollectionService.removeById(memberArticleCollection);
+ articleMapper.updateById(byId);
+ this.removeById(memberArticleCollection);
}
}
@@ -86,11 +85,11 @@
Page<MemberArticleCollection> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
LambdaQueryWrapper< MemberArticleCollection> wrapper= Wrappers.lambdaQuery();
wrapper.eq(MemberArticleCollection::getMemberId,articleDTO.getMemberId());
- Page<MemberArticleCollection> page1 = memberArticleCollectionService.page(page, wrapper);
+ Page<MemberArticleCollection> page1 = this.page(page, wrapper);
PageDTO<MemberArticleCollectionVO> articleCommentsVOPageDTO = PageDTO.of(page1, MemberArticleCollectionVO.class);
List<MemberArticleCollectionVO> list2 = articleCommentsVOPageDTO.getList();
for (MemberArticleCollectionVO memberArticleCollectionVO:list2){
- Article byId = articleService.getById(memberArticleCollectionVO.getTargetId());
+ Article byId = articleMapper.selectById(memberArticleCollectionVO.getTargetId());
memberArticleCollectionVO.setContent(byId.getContent());
memberArticleCollectionVO.setImages(byId.getImages());
memberArticleCollectionVO.setTitle(byId.getTitle());
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java
index 8c2ee66..da9f9e8 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberLikeServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.article.domain.ArticleComments;
import com.ruoyi.article.domain.MemberLike;
import com.ruoyi.article.dto.MemberLikeDTO;
+import com.ruoyi.article.mapper.ArticleMapper;
import com.ruoyi.article.mapper.MemberLikeMapper;
import com.ruoyi.article.service.IArticleCommentsService;
import com.ruoyi.article.service.IArticleService;
@@ -31,9 +32,7 @@
IMemberLikeService {
@Resource
- private IMemberLikeService memberLikeService;
- @Resource
- private IArticleService articleService;
+ private ArticleMapper articleMapper;
@Resource
private IArticleCommentsService articleCommentsService;
@@ -52,16 +51,16 @@
wrapper.eq(MemberLike::getType,memberLikeDTO.getType());
wrapper.eq( MemberLike::getDelFlag,0);
if (memberLikeDTO.getState()==1){
- List< MemberLike> memberLikes = memberLikeService.list(wrapper);
+ List< MemberLike> memberLikes = this.list(wrapper);
if (memberLikes.size()==0){
MemberLike memberLike=new MemberLike();
memberLike.setMemberId(memberLikeDTO.getMemberId());
memberLike.setArticleId(memberLikeDTO.getArticleId());
memberLike.setType(memberLikeDTO.getType());
if (memberLikeDTO.getType()==1){
- Article byId = articleService.getById(memberLikeDTO.getArticleId());
+ Article byId = articleMapper.selectById(memberLikeDTO.getArticleId());
byId.setLikeCount(byId.getLikeCount()+1);
- articleService.saveOrUpdate(byId);
+ articleMapper.updateById(byId);
}
if (memberLikeDTO.getType()==2){
ArticleComments byId = articleCommentsService.getById(memberLikeDTO.getArticleId());
@@ -73,18 +72,18 @@
byId.setLikeCount(byId.getLikeCount()+1);
articleCommentsService.saveOrUpdate(byId);
}
- memberLikeService.save(memberLike);
+ this.save(memberLike);
}
}else{
- List< MemberLike> memberLikes = memberLikeService.list(wrapper);
+ List< MemberLike> memberLikes = this.list(wrapper);
if (memberLikes.size()>0){
for (MemberLike memberLike:memberLikes){
- memberLikeService.removeById(memberLike);
+ this.removeById(memberLike);
if (memberLikeDTO.getType()==1){
- Article byId = articleService.getById(memberLikeDTO.getArticleId());
+ Article byId = articleMapper.selectById(memberLikeDTO.getArticleId());
byId.setLikeCount(byId.getLikeCount()-1);
- articleService.saveOrUpdate(byId);
+ articleMapper.updateById(byId);
}
if (memberLikeDTO.getType()==2){
ArticleComments byId = articleCommentsService.getById(memberLikeDTO.getArticleId());
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java
index 0aed3ed..b9870a7 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/SensitiveWordsServiceImpl.java
@@ -21,12 +21,10 @@
@Service
public class SensitiveWordsServiceImpl extends ServiceImpl<SensitiveWordsMapper, SensitiveWords> implements ISensitiveWordsService {
- @Resource
- private ISensitiveWordsService sensitiveWordsService;
@Override
public List<SensitiveWords> getMemberArticleList() {
LambdaQueryWrapper<SensitiveWords> wrapper= Wrappers.lambdaQuery();
wrapper.eq(SensitiveWords::getDelFlag,0);
- return sensitiveWordsService.list(wrapper);
+ return this.list(wrapper);
}
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBrowseRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java
similarity index 84%
rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBrowseRecordController.java
rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java
index 93f9d9c..b042b39 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBrowseRecordController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBrowseRecordController.java
@@ -3,11 +3,9 @@
import com.ruoyi.auction.service.IAuctionBrowseRecordService;
import com.ruoyi.auction.service.IAuctionGoodsService;
-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.system.api.domain.dto.AuctionCollectionDTO;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
@@ -29,17 +27,12 @@
* @since 2024-05-30
*/
@RestController
-@RequestMapping("/auction-browse-record")
-public class AuctionBrowseRecordController {
+@RequestMapping("/forepart/auction-browse-record")
+public class ForepartAuctionBrowseRecordController {
@Resource
private IAuctionBrowseRecordService iAuctionBrowseRecordService;
- @Resource
- private IAuctionSalesroomService iAuctionSalesroomService;
-
- @Resource
- private IAuctionGoodsService iAuctionGoodsService;
@RequestMapping("/getWdAuctionBrowseRecordList")
@ResponseBody
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
index 59d82c3..75efe65 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -45,8 +45,7 @@
@Service
public class AuctionBrowseRecordServiceImpl extends ServiceImpl<AuctionBrowseRecordMapper, AuctionBrowseRecord> implements IAuctionBrowseRecordService {
- @Resource
- private IAuctionBrowseRecordService iAuctionBrowseRecordService;
+
@Resource
private AuctionSalesroomMapper auctionSalesroomMapper;
@@ -78,7 +77,7 @@
wrapper3.ge(AuctionBrowseRecord::getCreateTime, parseTime7)
.le(AuctionBrowseRecord::getCreateTime, parseTime);
- List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
+ List<AuctionBrowseRecord> list = this.list(wrapper3);
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
.collect(Collectors.toSet());
@@ -142,7 +141,7 @@
wrapper3.ge(AuctionBrowseRecord::getCreateTime, parseTime7)
.le(AuctionBrowseRecord::getCreateTime, parseTime);
- List<AuctionBrowseRecord> list = iAuctionBrowseRecordService.list(wrapper3);
+ List<AuctionBrowseRecord> list = this.list(wrapper3);
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
.collect(Collectors.toSet());
@@ -165,7 +164,7 @@
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
- List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
+ List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
List.add(memberAuctionSalesroomVO);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 6abdf2d..527a996 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -111,8 +111,6 @@
@Resource
private AuctionSalesroomGoodsMapper auctionSalesroomGoodsMapper;
- @Resource
- private IAuctionSalesroomGoodsService auctionSalesroomGoodsService;
@Resource
private IAuctionGoodsService auctionGoodsService;
@@ -331,7 +329,7 @@
memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode());
memberAuctionSalesroomVO.setSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomVO.setCoverPic(auctionSalesroom.getCoverPic());
- List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
+ List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
if (data.size()>0){
memberAuctionSalesroomVO.setIsApply(2);
}else{
@@ -339,7 +337,7 @@
}
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
- List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
+ List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
memberAuctionSalesroomVO.setApplyNum(data1.size());
List.add(memberAuctionSalesroomVO);
}
@@ -363,7 +361,7 @@
memberAuctionSalesroomInfoVO.setStartTime(byId.getStartTime());
memberAuctionSalesroomInfoVO.setStatus(byId.getStatus());
memberAuctionSalesroomInfoVO.setCoverPic(byId.getCoverPic());
- List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
+ List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
if (data.size()>0){
memberAuctionSalesroomInfoVO.setIsApply(2);
}else{
@@ -430,7 +428,7 @@
public void SaveBid(BidDTO bidVO) {
Member membeOne = memberClient.getMembeOne(bidVO.getMemberId(), SecurityConstants.INNER).getData();
if (bidVO.getAuctionType()==2){
- AuctionSalesroomGoods byId = auctionSalesroomGoodsService.getById(bidVO.getTargetId());
+ AuctionSalesroomGoods byId = auctionSalesroomGoodsMapper.selectById(bidVO.getTargetId());
if (byId.getStartingPrice().doubleValue()<bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比起拍价低");
}
@@ -646,7 +644,7 @@
}
auctionSalesroom.setId(auctionSalesroomOrg.getId());
this.updateById(auctionSalesroom);
- List<AuctionSalesroomGoods> list = auctionSalesroomGoodsService.list(
+ List<AuctionSalesroomGoods> list = auctionSalesroomGoodsMapper.selectList(
Wrappers.<AuctionSalesroomGoods>lambdaQuery()
.eq(AuctionSalesroomGoods::getAuctionSalesroomId, id));
// 封装库存修改实体
@@ -664,21 +662,24 @@
.collect(Collectors.toList());
goodsSkuClient.updGoodsStock(goodsStockUpdDTOS, SecurityConstants.INNER);
// 移除原来地拍卖商品
- auctionSalesroomGoodsService.remove(Wrappers.<AuctionSalesroomGoods>lambdaQuery()
+ auctionSalesroomGoodsMapper.delete(Wrappers.<AuctionSalesroomGoods>lambdaQuery()
.eq(AuctionSalesroomGoods::getAuctionSalesroomId, id));
}
for (AuctionSalesroomGoods auctionSalesroomGood : auctionSalesroomGoods) {
auctionSalesroomGood.setAuctionSalesroomId(id);
}
// 添加拍卖商品
- auctionSalesroomGoodsService.saveBatch(auctionSalesroomGoods);
+ for (AuctionSalesroomGoods auctionSalesroomGoodss:auctionSalesroomGoods){
+ auctionSalesroomGoodsMapper.insert(auctionSalesroomGoodss);
+ }
+
}
@Override
public PageDTO<WdMemberAuctionSalesroomVO> getWdAuctionSalesroomList(MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO =new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
- List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
+ List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
Set<Long> goodsSkuIdList = null;
goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
.collect(Collectors.toSet());
@@ -702,7 +703,7 @@
MemberAuctionSalesroomDTO memberAuctionSalesroomDTO1=new MemberAuctionSalesroomDTO();
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
- List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
+ List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
List.add(memberAuctionSalesroomVO);
}
@@ -724,8 +725,9 @@
MgtAuctionSalesroomVO mgtAuctionSalesroomVO = BeanUtils.copyBean(auctionSalesroom,
MgtAuctionSalesroomVO.class);
// 获取拍卖场商品
- List<AuctionSalesroomGoods> list = auctionSalesroomGoodsService.lambdaQuery()
- .eq(AuctionSalesroomGoods::getAuctionSalesroomId, id).list();
+ LambdaQueryWrapper<AuctionSalesroomGoods> wrappers=new LambdaQueryWrapper<AuctionSalesroomGoods>();
+ wrappers.eq(AuctionSalesroomGoods::getAuctionSalesroomId, id);
+ List<AuctionSalesroomGoods> list = auctionSalesroomGoodsMapper.selectList(wrappers);
if (StringUtils.isNotEmpty(list)) {
List<MgtAuctionSalesroomGoodsVO> mgtAuctionSalesroomGoodsVOS = BeanUtils.copyList(list,
MgtAuctionSalesroomGoodsVO.class);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java
index aca7c87..1aae32f 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java
@@ -6,6 +6,8 @@
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.domain.AuctionVideo;
+import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
+import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
import com.ruoyi.auction.mapper.AuctionVideoMapper;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionVideoService;
@@ -32,7 +34,7 @@
private PromotionClient promotionClient;
@Resource
- private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
+ private AuctionSalesroomGoodsMapper auctionSalesroomGoodsMapper;
/**
* 暖场视频or封面海报
@@ -54,7 +56,7 @@
wrapper.eq(AuctionSalesroomGoods::getStatus,1);
wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,orepartAuctionVideo.getAuctionSalesroomId());
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
- AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper);
+ AuctionSalesroomGoods auctionSalesroomGoods=auctionSalesroomGoodsMapper.selectOne(wrapper);
if (auctionSalesroomGoods!=null){
R.fail("当前有拍卖品正在拍卖中，请结束后再试！");
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index b40685d..c1ae02f 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -1,5 +1,5 @@
package com.ruoyi.goods.service.impl;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -17,10 +17,10 @@
import com.ruoyi.goods.controller.management.vo.GoodsSkuVO;
import com.ruoyi.goods.domain.GoodsGroupPurchase;
import com.ruoyi.goods.domain.GoodsInfoTitleValue;
+import com.ruoyi.goods.mapper.GoodsGroupPurchaseMapper;
+import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.mapper.GoodsSkuMapper;
-import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
import com.ruoyi.goods.service.IGoodsInfoTitleValueService;
-import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
@@ -53,8 +53,8 @@
public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> implements IGoodsSkuService {
private final IGoodsInfoTitleValueService goodsInfoTitleValueService;
- private final IGoodsSeckillService goodsSeckillService;
- private final IGoodsGroupPurchaseService goodsGroupPurchaseService;
+ private final GoodsSeckillMapper goodsSeckillMapper;
+ private final GoodsGroupPurchaseMapper goodsGroupPurchaseMapper;
private final RedissonClient redissonClient;
private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -185,17 +185,21 @@
}
private void updateGoodsStatus(ListStatusDTO dto) {
- goodsSeckillService.lambdaUpdate()
- .set(GoodsSeckill::getListingStatus,
- ListingStatusEnum.REMOVED_FROM_THE_SHELF)
- .eq(GoodsSeckill::getListingStatus, ListingStatusEnum.ON_SHELVES)
- .eq(GoodsSeckill::getGoodsSkuId, dto.getId()).update();
- goodsGroupPurchaseService.lambdaUpdate()
- .set(GoodsGroupPurchase::getListingStatus,
- ListingStatusEnum.REMOVED_FROM_THE_SHELF)
- .eq(GoodsGroupPurchase::getListingStatus,
+ LambdaQueryWrapper<GoodsSeckill> queryWrapper =new LambdaQueryWrapper<>();
+ queryWrapper.eq(GoodsSeckill::getListingStatus, ListingStatusEnum.ON_SHELVES)
+ .eq(GoodsSeckill::getGoodsSkuId, dto.getId());
+ GoodsSeckill goodsSeckill = goodsSeckillMapper.selectOne(queryWrapper);
+ goodsSeckill.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+ goodsSeckillMapper.updateById(goodsSeckill);
+
+ LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper1 =new LambdaQueryWrapper<>();
+ queryWrapper1.eq(GoodsGroupPurchase::getListingStatus,
ListingStatusEnum.ON_SHELVES)
- .eq(GoodsGroupPurchase::getGoodsSkuId, dto.getId()).update();
+ .eq(GoodsGroupPurchase::getGoodsSkuId, dto.getId());
+ GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectOne(queryWrapper1);
+ goodsGroupPurchase.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+
+ goodsGroupPurchaseMapper.updateById(goodsGroupPurchase);
}
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/AppConfig.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/AppConfig.java
new file mode 100644
index 0000000..948b6e1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/config/AppConfig.java
@@ -0,0 +1,34 @@
+package com.ruoyi.member.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author jqs34
+ * @ClassName AppConfig
+ * @date 2023年02月17日
+ * @version: 1.0
+ */
+@Configuration
+public class AppConfig {
+
+
+ @Bean
+ public WxMaService wxMaService() {
+ WxMaService service = new WxMaServiceImpl();
+ service.setWxMaConfig(memberWxMaConfig());
+ return service;
+ }
+
+ @Bean
+ public WxMaConfig memberWxMaConfig(){
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid("wxb7f0ea286fc4e535");
+ config.setSecret("852a2512a6ab559cafc68bae5d4160ac");
+ return config;
+ }
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/AlipayAppController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java
similarity index 96%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/AlipayAppController.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java
index 30a0c2e..4e2ed96 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/AlipayAppController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.controller;
+package com.ruoyi.member.controller.forepart;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
@@ -13,8 +13,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
-@RequestMapping("/alipay")
-public class AlipayAppController {
+@RequestMapping("/forepart/alipay")
+public class ForepartAlipayAppController {
/**
* Alipay客户端
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
similarity index 94%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
index 489824c..dd1a6e8 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.controller;
+package com.ruoyi.member.controller.forepart;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,7 +14,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -28,9 +27,9 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/member-address")
+@RequestMapping("/forepart/member-address")
@Api(value = "用户端-用户地址相关接口", tags = "用户端-用户地址相关接口", description = "用户端-用户地址相关接口")
-public class MemberAddressController {
+public class ForepartMemberAddressController {
/**
* 获取当前商品信息
*
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
similarity index 90%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
index 27569a2..51c6e2d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.controller;
+package com.ruoyi.member.controller.forepart;
import com.ruoyi.common.core.domain.R;
@@ -31,19 +31,13 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/member")
+@RequestMapping("/forepart/member")
@Api(value = "用户端-用户信息相关接口", tags = "用户端-用户信息相关接口", description = "用户端-用户信息相关接口")
-public class MemberController {
+public class ForepartMemberController {
@Resource
private IMemberService iMemberService;
- @RequestMapping("/getMembeOne")
- @ResponseBody
- @InnerAuth
- @ApiOperation(value = "获取通过id用户信息")
- public R<Member> getMembeOne(@RequestBody Long userId) {
- return R.ok(iMemberService.getById(userId));
- }
+
@RequestMapping("/miniLogin")
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberLevelController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberLevelController.java
similarity index 70%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberLevelController.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberLevelController.java
index 8cf6e91..aa18c69 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberLevelController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberLevelController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.controller;
+package com.ruoyi.member.controller.forepart;
import lombok.RequiredArgsConstructor;
@@ -14,8 +14,8 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/member-level")
+@RequestMapping("/forepart/member-level")
@RequiredArgsConstructor
-public class MemberLevelController {
+public class ForepartMemberLevelController {
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
similarity index 89%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
index 931e285..946447a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.member.controller;
+package com.ruoyi.member.controller.forepart;
import com.ruoyi.common.core.domain.R;
@@ -24,9 +24,9 @@
* @since 2024-05-23
*/
@RestController
-@RequestMapping("/member-points")
+@RequestMapping("/forepart/member-points")
@Api(value = "用户端-用户积分", tags = "用户端-用户积分", description = "用户端-用户积分")
-public class MemberPointsController {
+public class ForepartMemberPointsController {
@Resource
private IMemberPointsService iMemberPointsService;
@RequestMapping("/getMemberPoints")
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/WeiXinAppController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/WeiXinAppController.java
similarity index 100%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/WeiXinAppController.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/WeiXinAppController.java
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
index d37a001..8bbda9a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
@@ -6,11 +6,10 @@
import com.ruoyi.system.api.domain.Member;
import java.util.List;
import java.util.Set;
+
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author mitao
@@ -29,4 +28,12 @@
return R.ok(memberService.getMemberListByIds(memberIdList));
}
+ @RequestMapping("/getMembeOne")
+ @ResponseBody
+ @InnerAuth
+ @ApiOperation(value = "获取通过id用户信息")
+ public R<Member> getMembeOne(@RequestBody Long userId) {
+ return R.ok(memberService.getById(userId));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml
index 090f919..52f9382 100644
--- a/ruoyi-modules/ruoyi-order/pom.xml
+++ b/ruoyi-modules/ruoyi-order/pom.xml
@@ -103,13 +103,6 @@
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.2.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.8</version>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java
similarity index 91%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java
index 2a121ef..71cda5e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.forepart;
import com.ruoyi.common.core.domain.R;
@@ -24,9 +24,9 @@
* @since 2024-05-23
*/
@RestController
-@RequestMapping("/member-invoice")
+@RequestMapping("/forepart/member-invoice")
@Api(value = "用户端-我的发票相关接口", tags = "用户端-我的发票相关接口", description = "用户端-我的发票相关接口")
-public class MemberInvoiceController {
+public class ForepartMemberInvoiceController {
@Resource
private IMemberInvoiceService iMemberInvoiceService;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceOrderController.java
similarity index 90%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceOrderController.java
index e38eec3..2ad1618 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceOrderController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.forepart;
import com.ruoyi.common.core.domain.R;
@@ -24,9 +24,9 @@
* @since 2024-05-23
*/
@RestController
-@RequestMapping("/member-invoice-order")
+@RequestMapping("/forepart/member-invoice-order")
@Api(value = "用户端-用户开票历史详情相关接口", tags = "用户端-用户开票历史详情相关接口", description = "用户端-用户开票历史详情关接口")
-public class MemberInvoiceOrderController {
+public class ForepartMemberInvoiceOrderController {
@Resource
private IMemberInvoiceOrderService iMemberInvoiceOrderService;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceRiseController.java
similarity index 95%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceRiseController.java
index dac960e..ee54a62 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceRiseController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.forepart;
import com.ruoyi.common.core.domain.R;
@@ -25,9 +25,9 @@
* @since 2024-05-23
*/
@RestController
-@RequestMapping("/member-invoice-rise")
+@RequestMapping("/forepart/member-invoice-rise")
@Api(value = "用户端-用户发票相关接口", tags = "用户端-用户发票相关接口", description = "用户端-用户发票相关接口")
-public class MemberInvoiceRiseController {
+public class ForepartMemberInvoiceRiseController {
@Resource
private IMemberInvoiceRiseService iMemberInvoiceRiseService;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java
similarity index 79%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java
index e4ffe06..b8e155f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/PaylogController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java
@@ -1,18 +1,8 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.forepart;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.service.impl.PaylogServiceImpl;
-import com.ruoyi.order.util.DateUtil;
-import com.ruoyi.order.util.SinataUtil;
-import com.ruoyi.order.util.alipay.config.AlipayConfig;
-import com.ruoyi.order.util.alipay.util.PayDemoActivity;
-import com.ruoyi.order.util.tencent.common.Configure;
-import com.ruoyi.order.util.tencent.common.Signature;
-import com.ruoyi.order.util.tencent.common.XMLParser;
-import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
-import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
import com.ruoyi.system.api.domain.dto.PayInfoDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,9 +25,9 @@
* @since 2024-05-22
*/
@RestController
-@RequestMapping("/paylog")
+@RequestMapping("/forepart/paylog")
@Api(value = "用户端-获取支付信息", tags = "用户端-获取支付信息", description = "用户端-获取支付信息")
-public class PaylogController {
+public class ForepartPaylogController {
/**
* 获取支付信息
*
@@ -51,9 +41,6 @@
* 金额
* @return
*/
-
- @Resource
- private IPaylogService iPaylogService;
@Resource
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
similarity index 60%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
index 61f09b5..7e3e869 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionBondController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
@@ -1,21 +1,26 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.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.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.*;
-import com.ruoyi.system.api.domain.vo.PayInfoVO;
+
import java.util.List;
import javax.annotation.Resource;
+
+import com.ruoyi.system.api.domain.vo.PayInfoVO;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@@ -29,14 +34,13 @@
*/
@RestController
@RequestMapping("/order-auction-bond")
-public class OrderAuctionBondController {
+public class InnerOrderAuctionBondController {
@Resource
- private IOrderAuctionBondService iOrderAuctionBondService;
+ private IOrderAuctionBondService iOrderAuctionBondService;
/**
* 获取当前商品信息
- *
*/
@InnerAuth
@PostMapping("/getOrderAuctionBond")
@@ -50,7 +54,53 @@
@InnerAuth
@PostMapping("/getOrderAuctionBondList")
@ResponseBody
- public R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList(
+ @RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(OrderAuctionBond::getMemberId, memberAuctionSalesroomDTO.getMemberId());
+ wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,
+ memberAuctionSalesroomDTO.getAuctionSalesroomId());
+ wrapper.eq(OrderAuctionBond::getDelFlag, 0);
+ List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper);
+ return R.ok(list);
+
+ }
+
+ /**
+ * 查询保证金订单列表
+ *
+ * @param id 拍卖商品id
+ * @param auctionOrderTypeEnum 拍卖类型： 普通拍品 拍卖会拍品
+ * @param bondStatusEnum 保证金状态 待支付 已支付 已退款 为null则查询所有
+ * @return List<OrderAuctionBond>
+ */
+ @InnerAuth
+ @PostMapping("/list")
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestParam("id") Long id,
+ @RequestParam("auctionOrderTypeEnum") AuctionOrderTypeEnum auctionOrderTypeEnum,
+ @RequestParam(value = "bondStatusEnum", required = false) BondStatusEnum bondStatusEnum) {
+ return R.ok(iOrderAuctionBondService.getOrderAuctionBondList(id, auctionOrderTypeEnum,
+ bondStatusEnum));
+ }
+
+ /**
+ * 批量更新保证金订单状态
+ *
+ * @param ids 保证金订单id列表
+ * @param bondStatusEnum 保证金状态
+ */
+ @InnerAuth
+ @PutMapping
+ R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
+ @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum) {
+ iOrderAuctionBondService.updateOrderAuctionBondStatus(ids, bondStatusEnum);
+ return R.ok();
+ }
+
+ @InnerAuth
+ @PostMapping("/getOrderAuctionBondList1")
+ @ResponseBody
+ public R<List<OrderAuctionBond>> getOrderAuctionBondList1(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
wrapper.eq(OrderAuctionBond::getMemberId,memberAuctionSalesroomDTO.getMemberId());
wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,memberAuctionSalesroomDTO.getAuctionSalesroomId());
@@ -96,5 +146,5 @@
return R.ok();
}
-
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/InvoicingApplicationController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InvoicingApplicationController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/InvoicingApplicationController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InvoicingApplicationController.java
index 2e62fa4..51328df 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/InvoicingApplicationController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InvoicingApplicationController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.inner;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionBondController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionBondController.java
deleted file mode 100644
index c91bcc1..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionBondController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.ruoyi.order.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.enums.AuctionOrderTypeEnum;
-import com.ruoyi.common.core.enums.BondStatusEnum;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.order.service.IOrderAuctionBondService;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
-import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
-import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
-import java.util.List;
-import javax.annotation.Resource;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 拍卖保证金表 前端控制器
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@RestController
-@RequestMapping("/order-auction-bond")
-public class OrderAuctionBondController {
-
- @Resource
- private IOrderAuctionBondService iOrderAuctionBondService;
-
- /**
- * 获取当前商品信息
- */
- @InnerAuth
- @PostMapping("/getOrderAuctionBond")
- @ResponseBody
- public R<T> getOrderAuctionBond(@RequestBody OrderAuctionBondDTO orderAuctionBondDTO) {
- iOrderAuctionBondService.getOrderAuctionBond(orderAuctionBondDTO);
- return R.ok();
-
- }
-
- @InnerAuth
- @PostMapping("/getOrderAuctionBondList")
- @ResponseBody
- public R<List<OrderAuctionBond>> getOrderAuctionBondList(
- @RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
- LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(OrderAuctionBond::getMemberId, memberAuctionSalesroomDTO.getMemberId());
- wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,
- memberAuctionSalesroomDTO.getAuctionSalesroomId());
- wrapper.eq(OrderAuctionBond::getDelFlag, 0);
- List<OrderAuctionBond> list = iOrderAuctionBondService.list(wrapper);
- return R.ok(list);
-
- }
-
- /**
- * 查询保证金订单列表
- *
- * @param id 拍卖商品id
- * @param auctionOrderTypeEnum 拍卖类型： 普通拍品 拍卖会拍品
- * @param bondStatusEnum 保证金状态 待支付 已支付 已退款 为null则查询所有
- * @return List<OrderAuctionBond>
- */
- @InnerAuth
- @PostMapping("/list")
- public R<List<OrderAuctionBond>> getOrderAuctionBondList(@RequestParam("id") Long id,
- @RequestParam("auctionOrderTypeEnum") AuctionOrderTypeEnum auctionOrderTypeEnum,
- @RequestParam(value = "bondStatusEnum", required = false) BondStatusEnum bondStatusEnum) {
- return R.ok(iOrderAuctionBondService.getOrderAuctionBondList(id, auctionOrderTypeEnum,
- bondStatusEnum));
- }
-
- /**
- * 批量更新保证金订单状态
- *
- * @param ids 保证金订单id列表
- * @param bondStatusEnum 保证金状态
- */
- @InnerAuth
- @PutMapping
- R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
- @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum) {
- iOrderAuctionBondService.updateOrderAuctionBondStatus(ids, bondStatusEnum);
- return R.ok();
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionController.java
index 39ea189..9ed8881 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderAuctionController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderAuctionController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.inner;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
similarity index 98%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
index 5814434..2afa63a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.inner;
import com.ruoyi.common.core.domain.R;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderMallController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderMallController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java
index d10e61c..2bc62b3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderMallController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.inner;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderReturnRequestController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderReturnRequestController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderReturnRequestController.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderReturnRequestController.java
index 2246185..4b63c48 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderReturnRequestController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderReturnRequestController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.controller;
+package com.ruoyi.order.controller.inner;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/PayController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/PayController.java
index 99c0cdb..83eb4f4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/PayController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/PayController.java
@@ -23,7 +23,6 @@
public class PayController {
private final IPaylogService paylogService;
- private final PaylogServiceImpl paylogServiceImpl;
@InnerAuth
@PostMapping("/refund-batch")
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
index 67b935f..9c223f9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -41,9 +41,6 @@
public class OrderAuctionBondServiceImpl extends ServiceImpl<OrderAuctionBondMapper, OrderAuctionBond> implements IOrderAuctionBondService {
@Resource
- private IOrderAuctionBondService iOrderAuctionBondService;
-
- @Resource
private IPaylogService iPaylogService;
@Resource
@@ -61,7 +58,7 @@
wrapper.notIn(OrderAuctionBond::getMemberId, orderAuctionBondDTO.getUserList());
wrapper.eq(OrderAuctionBond::getDelFlag, 0);
wrapper.eq(OrderAuctionBond::getAuctionSalesroomId, orderAuctionBondDTO.getAuctionSalesroomId());
- List<OrderAuctionBond> orderAuctionBondList = iOrderAuctionBondService.list(wrapper);
+ List<OrderAuctionBond> orderAuctionBondList = this.list(wrapper);
for (OrderAuctionBond orderAuctionBond : orderAuctionBondList) {
LambdaQueryWrapper<Paylog> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
@@ -130,7 +127,7 @@
orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setType(0);
payInfoVO.setSubject("保证金");
@@ -150,7 +147,7 @@
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.ALIPAY);
}
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
@@ -172,7 +169,7 @@
orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setType(0);
payInfoVO.setSubject("保证金");
@@ -191,7 +188,7 @@
} else {
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.ALIPAY);
}
- iOrderAuctionBondService.save(orderAuctionBond);
+ this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
payInfoVO.setType(2);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 1247964..e2a57af 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -27,8 +27,7 @@
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
- @Resource
- private IOrderService orderService;
+
@Resource
private IOrderMallService orderMallService;
@Override
@@ -48,7 +47,7 @@
order.setReceiverCity(OrderDTO.getReceiverCity());
order.setReceiverDetailAddress(OrderDTO.getReceiverDetailAddress());
order.setBound(OrderDTO.getBound());
- orderService.save(order);
+ this.save(order);
}
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index 4731fc4..95882ef 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -47,7 +47,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.system.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;
/**
@@ -61,11 +60,7 @@
@Service
public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService {
- @Resource
- private PaylogServiceImpl paylogServiceImpl;
- @Resource
- private IPaylogService iPaylogService;
@Resource
private OrderClient orderClient;
@@ -82,10 +77,10 @@
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
- return paylogServiceImpl.alipay(orderNO, subject, body, price, request);
+ return this.alipay(orderNO, subject, body, price, request);
} else {
// 微信预下单
- return paylogServiceImpl.wxpay(2, orderNO, body,openId, price, request);
+ return this.wxpay(2, orderNO, body,openId, price, request);
}
}
} catch (Exception e) {
@@ -135,9 +130,9 @@
try {
LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Paylog::getOutTradeNo,paylog1.getOutTradeNo());
- Paylog one = iPaylogService.getOne(wrapper);
+ Paylog one = this.getOne(wrapper);
if(SinataUtil.isEmpty(one)) {
- iPaylogService.save(paylog1);
+ this.save(paylog1);
if (paylog1.getOutTradeNo().contains("BO")) {
BondDTO bondVO=new BondDTO();
bondVO.setOrderNO(paylog1.getOutTradeNo());
@@ -221,7 +216,7 @@
LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
- Paylog one = iPaylogService.getOne(wrapper);
+ Paylog one = this.getOne(wrapper);
if(SinataUtil.isEmpty(one)) {
Paylog paylog = new Paylog();
paylog.setOutTradeNo(out_trade_no);
@@ -232,7 +227,7 @@
paylog.setState(1);
System.out.println("支付完成时间" + time_end);
paylog.setAddTime(LocalDateTime.now());
- iPaylogService.save(paylog);
+ this.save(paylog);
if (paylog.getOutTradeNo().contains("BO")) {
BondDTO bondVO=new BondDTO();
bondVO.setOrderNO(paylog.getOutTradeNo());
@@ -474,7 +469,7 @@
Set<String> orderNoList = refundDTOS.stream().map(RefundDTO::getOrderNo)
.collect(Collectors.toSet());
if (StringUtils.isNotEmpty(orderNoList)) {
- Map<String, Paylog> paylogMap = iPaylogService.lambdaQuery()
+ Map<String, Paylog> paylogMap = this.lambdaQuery()
.in(Paylog::getOutTradeNo, orderNoList).eq(Paylog::getState, 1).list().stream()
.collect(Collectors.toMap(Paylog::getOutTradeNo, Function.identity()));
List<Paylog> updList = new ArrayList<>();
@@ -491,7 +486,7 @@
}
});
}
- iPaylogService.updateBatchById(updList);
+ this.updateBatchById(updList);
}
return map;
}
@@ -501,7 +496,7 @@
boolean res = false;
if (StringUtils.isNotNull(paylog)) {
if (paylog.getPayType() == 1) {
- res = paylogServiceImpl.refundForAlipay(paylog.getOutTradeNo(),
+ res = this.refundForAlipay(paylog.getOutTradeNo(),
paylog.getTradeNo(), amount.doubleValue());
}
if (paylog.getPayType() == 2) {
@@ -512,7 +507,7 @@
String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
Integer totalFee = Integer.parseInt(
money.substring(0, money.length() - 3));
- res = paylogServiceImpl.refundForWxpay(2, paylog.getTradeNo(),
+ res = this.refundForWxpay(2, paylog.getTradeNo(),
paylog.getOutTradeNo(), orderNo, totalFee,
refundFee, "4");
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/JsapiTicketUtil.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/JsapiTicketUtil.java
index 6f86f99..09347c5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/JsapiTicketUtil.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/tencent/common/JsapiTicketUtil.java
@@ -10,6 +10,7 @@
import java.util.HashMap;
import java.util.Map;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import net.sf.json.JSONObject;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -17,8 +18,7 @@
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
+
/***
* @author V型知识库 www.vxzsk.com
*
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
deleted file mode 100644
index 9a97451..0000000
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.promotion.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.promotion.service.IPromotionVideoService;
-import java.util.List;
-import javax.annotation.Resource;
-
-import com.ruoyi.system.api.domain.PromotionVideo;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 视频表 前端控制器
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@RestController
-@RequestMapping("/promotion-video")
-public class PromotionVideoController {
-
- @Resource
- private IPromotionVideoService iPromotionVideoService;
-
- @PostMapping("/getPromotionVideoList")
- @InnerAuth
- public R<List<PromotionVideo>> getPromotionVideoList() {
- List<PromotionVideo> list = iPromotionVideoService.list(new LambdaQueryWrapper<PromotionVideo>().eq(PromotionVideo::getDelFlag,0));
- return R.ok(list);
- }
-
-
- @PostMapping("/getPromotionVideoOne")
- @ResponseBody
- @InnerAuth
- public R<PromotionVideo> getPromotionVideoOne(@RequestBody Long promotionVideoId) {
- PromotionVideo promotionVideoOne=iPromotionVideoService.getById(promotionVideoId);
- return R.ok(promotionVideoOne);
-
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponController.java
similarity index 66%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponController.java
rename to ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponController.java
index 9855007..2c7b19d 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.promotion.controller;
+package com.ruoyi.promotion.controller.forepart;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,7 +14,7 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/coupon")
-public class CouponController {
+@RequestMapping("/forepart/coupon")
+public class ForepartCouponController {
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
similarity index 85%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
rename to ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
index f4b2182..69bd415 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.promotion.controller;
+package com.ruoyi.promotion.controller.forepart;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
+import com.ruoyi.promotion.controller.forepart.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.promotion.service.ICouponMemberService;
import io.swagger.annotations.Api;
@@ -24,9 +24,9 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/coupon-member")
+@RequestMapping("/forepart/coupon-member")
@Api(value = "用户端-获取用户优惠卷", tags = "用户端-获取用户优惠卷", description = "用户端-获取用户优惠卷")
-public class CouponMemberController {
+public class ForepartCouponMemberController {
@Resource
private ICouponMemberService iCouponMemberService;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java
rename to ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java
index 8d71d39..bc28ff0 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.promotion.controller;
+package com.ruoyi.promotion.controller.forepart;
import com.ruoyi.common.core.domain.R;
@@ -22,9 +22,9 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/promotion-banner")
+@RequestMapping("/forepart/promotion-banner")
@Api(value = "用户端-商场或者资讯的轮播图", tags = "用户端-商场或者资讯的轮播图", description = "用户端-商场或者资讯的轮播图")
-public class PromotionBannerController {
+public class ForepartPromotionBannerController {
@Resource
private IPromotionBannerService iPromotionBannerService;
@RequestMapping("/getBaanerList")
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionVideoController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionVideoController.java
new file mode 100644
index 0000000..aefa4a9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionVideoController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.promotion.controller.forepart;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 视频表 前端控制器
+ * </p>
+ *
+ * @author mitao
+ * @since 2024-05-16
+ */
+@RestController
+@RequestMapping("/forepart/promotion-video")
+public class FrepartPromotionVideoController {
+
+
+}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java
similarity index 90%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
rename to ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java
index 7181554..3bcffdb 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.promotion.controller;
+package com.ruoyi.promotion.controller.forepart;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
+import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.service.IPromotionWishListService;
import io.swagger.annotations.Api;
@@ -24,9 +24,9 @@
* @since 2024-05-16
*/
@RestController
-@RequestMapping("/promotion-wish-list")
+@RequestMapping("/forepart/promotion-wish-list")
@Api(value = "用户端-心愿单相关接口", tags = "用户端-心愿单相关接口", description = "用户端-心愿单相关接口")
-public class PromotionWishListController {
+public class FrepartPromotionWishListController {
@Resource
private IPromotionWishListService iPromotionWishListService;
@RequestMapping("/getPromotionWishList")
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/CouponMemberDTO.java
similarity index 87%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java
rename to ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/CouponMemberDTO.java
index b966f3c..83a6fda 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/CouponMemberDTO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.promotion.controller.dto;
+package com.ruoyi.promotion.controller.forepart.dto;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java
similarity index 94%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java
rename to ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java
index bc215aa..d6678a3 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/PromotionWishListDTO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.promotion.controller.dto;
+package com.ruoyi.promotion.controller.forepart.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
index 5329b1d..b9a662e 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
+import com.ruoyi.promotion.controller.forepart.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.CouponMember;
/**
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
index 23693a3..73a57a9 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
+import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
/**
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index 02772e7..e422d97 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
+import com.ruoyi.promotion.controller.forepart.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
index aa8099c..57c439b 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
+import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.mapper.PromotionWishListMapper;
import com.ruoyi.promotion.service.IPromotionWishListService;
diff --git a/ruoyi-modules/ruoyi-seata-demo/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-seata-demo/src/main/resources/bootstrap.yml
index bbf374a..ab85965 100644
--- a/ruoyi-modules/ruoyi-seata-demo/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-seata-demo/src/main/resources/bootstrap.yml
@@ -17,13 +17,13 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8858
+ server-addr: 192.168.110.188:8858
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
config:
# 配置中心地址
- server-addr: 127.0.0.1:8858
+ server-addr: 192.168.110.188:8858
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
group: DEFAULT_GROUP
name: ${spring.application.name}
diff --git a/ruoyi-modules/ruoyi-seata-demo/target/classes/bootstrap.yml b/ruoyi-modules/ruoyi-seata-demo/target/classes/bootstrap.yml
index bbf374a..ab85965 100644
--- a/ruoyi-modules/ruoyi-seata-demo/target/classes/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-seata-demo/target/classes/bootstrap.yml
@@ -17,13 +17,13 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8858
+ server-addr: 192.168.110.188:8858
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
config:
# 配置中心地址
- server-addr: 127.0.0.1:8858
+ server-addr: 192.168.110.188:8858
namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
group: DEFAULT_GROUP
name: ${spring.application.name}
--
Gitblit v1.7.1