From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 18:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 ac3f033..bef0618 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
@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.pojo.MemberInvoice;
-import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
-import com.ruoyi.order.domain.pojo.OrderAuction;
-import com.ruoyi.order.domain.pojo.OrderMall;
+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.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
@@ -85,7 +86,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{
@@ -93,9 +95,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();
}
--
Gitblit v1.7.1