From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 20:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 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..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
@@ -3,21 +3,27 @@
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.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.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,14 +36,11 @@
@Service
public class MemberInvoiceServiceImpl extends ServiceImpl<MemberInvoiceMapper, MemberInvoice> implements IMemberInvoiceService {
- @Resource
- private IMemberInvoiceService iMemberInvoiceService;
@Resource
private IMemberInvoiceOrderService iMemberInvoiceOrderService;
- @Resource
- private IOrderMallService iOrderMallService;
+
@Resource
private IOrderService iOrderService;
@@ -63,35 +66,19 @@
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){
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)){
- 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());
- 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());
- GoodsSeckill goodsSeckill=goodsSeckillR.getData();
- R<GoodsSku> goodsSkuR=goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId());
- GoodsSku goodsSku=goodsSkuR.getData();
- OrderName=goodsSku.getSkuName();
- }
+ OrderName=order.getSkuName();
memberInvoiceOrder1.setOrderName(OrderName);
iMemberInvoiceOrderService.save(memberInvoiceOrder1);
}
@@ -104,7 +91,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