From 5faeb96553f03ea9f16876d39d3d3ac9704cddb7 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 04 六月 2024 18:36:44 +0800
Subject: [PATCH] 用户端商品

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java |   21 +++------------------
 1 files changed, 3 insertions(+), 18 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 9578167..d837dd0 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
@@ -72,28 +72,13 @@
        for (Integer memberInvoiceOrder:memberInvoiceOrderList){
            MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
            Order order= iOrderService.getById(memberInvoiceOrder);
+           order.setInvoiceStatus(1);
+           iOrderService.updateById(order);
            memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
            memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
            memberInvoiceOrder1.setOrderNo(order.getOrderNo());
            String OrderName="";
-           if (order.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER)||order.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS)||order.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS)){
-               R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(),
-                       SecurityConstants.INNER);
-               GoodsSku goodsSku=goodsSkuR.getData();
-               OrderName=goodsSku.getSkuName();
-           }else{
-               LambdaQueryWrapper<OrderAuction> wrapper = Wrappers.lambdaQuery();
-               wrapper.eq(OrderAuction::getOrderId, order.getId());
-               wrapper.eq(OrderAuction::getDelFlag, 0);
-               OrderAuction orderAuction=iOrderAuctionService.getOne(wrapper);
-               R<GoodsSeckill> goodsSeckillR = goodsSkuClient.getGoodsSeckillOne(
-                       orderAuction.getSalesroomGoodsId(), SecurityConstants.INNER);
-               GoodsSeckill goodsSeckill=goodsSeckillR.getData();
-               R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId(),
-                       SecurityConstants.INNER);
-               GoodsSku goodsSku=goodsSkuR.getData();
-               OrderName=goodsSku.getSkuName();
-           }
+           OrderName=order.getSkuName();
            memberInvoiceOrder1.setOrderName(OrderName);
            iMemberInvoiceOrderService.save(memberInvoiceOrder1);
        }

--
Gitblit v1.7.1