From 6e8a55edef22faa7f7d5bbbccd727119a6fd918f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 14:05:08 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index 83dec48..e488b09 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -3,21 +3,29 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.utils.page.PageDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.OrderFromEnum;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.domain.MemberInvoice;
+import com.ruoyi.order.domain.MemberInvoiceOrder;
+import com.ruoyi.order.domain.OrderAuction;
+import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.dto.MemberInvoiceDTO;
-import com.ruoyi.order.domain.pojo.*;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
-import com.ruoyi.order.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.service.IMemberInvoiceOrderService;
+import com.ruoyi.order.service.IMemberInvoiceService;
+import com.ruoyi.order.service.IOrderAuctionService;
+import com.ruoyi.order.service.IOrderMallService;
+import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -30,8 +38,6 @@
@Service
public class MemberInvoiceServiceImpl extends ServiceImpl<MemberInvoiceMapper, MemberInvoice> implements IMemberInvoiceService {
- @Resource
- private IMemberInvoiceService iMemberInvoiceService;
@Resource
private IMemberInvoiceOrderService iMemberInvoiceOrderService;
@@ -63,7 +69,7 @@
memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone());
memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen());
memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());
- iMemberInvoiceService.save(memberInvoice);
+ this.save(memberInvoice);
List<Integer> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
for (Integer memberInvoiceOrder:memberInvoiceOrderList){
@@ -78,7 +84,8 @@
wrapper.eq(OrderMall::getOrderId, order.getId());
wrapper.eq(OrderMall::getDelFlag, 0);
OrderMall orderMall= iOrderMallService.getOne(wrapper);
- R<GoodsSku> goodsSkuR=goodsSkuClient.getGoodsSkuOne(orderMall.getGoodsSkuId());
+ R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(orderMall.getGoodsSkuId(),
+ SecurityConstants.INNER);
GoodsSku goodsSku=goodsSkuR.getData();
OrderName=goodsSku.getSkuName();
}else{
@@ -86,9 +93,11 @@
wrapper.eq(OrderAuction::getOrderId, order.getId());
wrapper.eq(OrderAuction::getDelFlag, 0);
OrderAuction orderAuction=iOrderAuctionService.getOne(wrapper);
- R<GoodsSeckill> goodsSeckillR=goodsSkuClient.getGoodsSeckillOne(orderAuction.getSalesroomGoodsId());
+ R<GoodsSeckill> goodsSeckillR = goodsSkuClient.getGoodsSeckillOne(
+ orderAuction.getSalesroomGoodsId(), SecurityConstants.INNER);
GoodsSeckill goodsSeckill=goodsSeckillR.getData();
- R<GoodsSku> goodsSkuR=goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId());
+ R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId(),
+ SecurityConstants.INNER);
GoodsSku goodsSku=goodsSkuR.getData();
OrderName=goodsSku.getSkuName();
}
@@ -104,7 +113,7 @@
wrapper.eq(MemberInvoice::getMemberId, memberInvoiceDTO.getMemberId());
wrapper.eq(MemberInvoice::getDelFlag, 0);
wrapper.orderByDesc(MemberInvoice::getCreateTime);
- Page<MemberInvoice> page1 = iMemberInvoiceService.page(page, wrapper);
+ Page<MemberInvoice> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
}
--
Gitblit v1.7.1