Merge branch 'dev-mitao'

mitao

2024-05-27 95163bc7f6714edcb14dd4369717b0a9d1ae15da

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java

@@ -4,6 +4,7 @@
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;
@@ -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();
           }