From 855921d253a4854d4fb78b83bfcf7c6e93b3f68d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 29 五月 2024 19:43:50 +0800
Subject: [PATCH] 1.提交【管理后台】团购、拍卖商品立即结束退款处理 2.提交【管理后台】拍卖场管理部分接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 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 1d0a775..dc90a34 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
@@ -1,18 +1,31 @@
package com.ruoyi.order.service.impl;
-import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
+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.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.Order;
+import com.ruoyi.order.domain.pojo.OrderAuction;
+import com.ruoyi.order.domain.pojo.OrderMall;
+import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.service.IOrderAuctionService;
+import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
+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 java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -29,10 +42,19 @@
private IMemberInvoiceService iMemberInvoiceService;
@Resource
- private IMemberInvoiceOrderService IMemberInvoiceOrderService;
+ private IMemberInvoiceOrderService iMemberInvoiceOrderService;
+
+ @Resource
+ private IOrderMallService iOrderMallService;
@Resource
private IOrderService iOrderService;
+
+ @Resource
+ private GoodsSkuClient goodsSkuClient;
+
+ @Resource
+ private IOrderAuctionService iOrderAuctionService;
@Override
public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
@@ -58,8 +80,42 @@
memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
memberInvoiceOrder1.setOrderNo(order.getOrderNo());
- memberInvoiceOrder1.setOrderName("");
-
+ String OrderName="";
+ if (order.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER)||order.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS)||order.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS)){
+ LambdaQueryWrapper<OrderMall> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(OrderMall::getOrderId, order.getId());
+ wrapper.eq(OrderMall::getDelFlag, 0);
+ OrderMall orderMall= iOrderMallService.getOne(wrapper);
+ R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(orderMall.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();
+ }
+ memberInvoiceOrder1.setOrderName(OrderName);
+ iMemberInvoiceOrderService.save(memberInvoiceOrder1);
}
}
+
+ @Override
+ public PageDTO<MemberInvoice> getMemberInvoiceList(MemberInvoiceDTO memberInvoiceDTO) {
+ Page<MemberInvoice> page = new Page<>(memberInvoiceDTO.getPageCurr(), memberInvoiceDTO.getPageSize());
+ LambdaQueryWrapper<MemberInvoice> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(MemberInvoice::getMemberId, memberInvoiceDTO.getMemberId());
+ wrapper.eq(MemberInvoice::getDelFlag, 0);
+ wrapper.orderByDesc(MemberInvoice::getCreateTime);
+ Page<MemberInvoice> page1 = iMemberInvoiceService.page(page, wrapper);
+ return PageDTO.of(page1);
+ }
}
--
Gitblit v1.7.1