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/MemberInvoiceRiseServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
index 24139ac..76b9dce 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
@@ -1,9 +1,19 @@
package com.ruoyi.order.service.impl;
-import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
+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.utils.page.PageDTO;
+import com.ruoyi.order.domain.MemberInvoiceRise;
+import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.service.IOrderService;
+import com.ruoyi.system.api.domain.Order;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Resource;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +27,107 @@
@Service
public class MemberInvoiceRiseServiceImpl extends ServiceImpl<MemberInvoiceRiseMapper, MemberInvoiceRise> implements IMemberInvoiceRiseService {
+ @Resource
+ private IMemberInvoiceRiseService iMemberInvoiceRiseService;
+
+ @Resource
+ private IOrderService iOrderService;
+
+ @Override
+ public PageDTO<MemberInvoiceRise> getMemberInvoiceRiseList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ Page<MemberInvoiceRise> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
+ LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
+ wrapper.eq(MemberInvoiceRise::getDelFlag,0);
+ wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
+ Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, wrapper);
+ return PageDTO.of(page1);
+ }
+
+ @Override
+ public void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+
+ MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+ if (memberInvoiceRise==null){
+ memberInvoiceRise=new MemberInvoiceRise();
+ }
+ LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
+ wrapper.eq(MemberInvoiceRise::getDelFlag,0);
+ wrapper.eq(MemberInvoiceRise::getIsDefault,2);
+ MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+
+ memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
+ memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
+ memberInvoiceRise.setCorporationName(memberInvoiceRiseDTO.getCorporationName());
+ memberInvoiceRise.setCorporationId(memberInvoiceRiseDTO.getCorporationId());
+ memberInvoiceRise.setCorporationAddress(memberInvoiceRiseDTO.getCorporationAddress());
+ memberInvoiceRise.setCorporationAccount(memberInvoiceRiseDTO.getCorporationAccount());
+ memberInvoiceRise.setCorporationOpen(memberInvoiceRiseDTO.getCorporationOpen());
+ memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone());
+
+ if (memberInvoiceRise1==null){
+ memberInvoiceRise.setIsDefault(2);
+ }
+ iMemberInvoiceRiseService.saveOrUpdate(memberInvoiceRise);
+ }
+
+ @Override
+ public void saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
+ wrapper.eq(MemberInvoiceRise::getDelFlag,0);
+ wrapper.eq(MemberInvoiceRise::getIsDefault,2);
+ MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+ memberInvoiceRise1.setIsDefault(1);
+ iMemberInvoiceRiseService.updateById(memberInvoiceRise1);
+
+ MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+ memberInvoiceRise.setIsDefault(2);
+ iMemberInvoiceRiseService.updateById(memberInvoiceRise);
+ }
+
+ @Override
+ public void delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ iMemberInvoiceRiseService.removeById(memberInvoiceRiseDTO.getId());
+ }
+
+ @Override
+ public MemberInvoiceRise getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ return iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
+ }
+
+ @Override
+ public MemberInvoiceRise getIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
+ wrapper.eq(MemberInvoiceRise::getDelFlag,0);
+ wrapper.eq(MemberInvoiceRise::getIsDefault,2);
+ MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
+ return memberInvoiceRise1;
+ }
+
+ @Override
+ public PageDTO<Order> getOrderList(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
+ Page<Order> page = new Page<>(memberInvoiceRiseDTO.getPageCurr(), memberInvoiceRiseDTO.getPageSize());
+ LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
+ wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getDelFlag,0);
+ List<Integer> list=new ArrayList<>();
+ if (memberInvoiceRiseDTO.getOrderType()==1){
+ list.add(2);
+ list.add(3);
+ wrapper.in(Order::getInvoiceStatus,list);
+ }else{
+ list.add(1);
+ list.add(4);
+ wrapper.in(Order::getInvoiceStatus,list);
+ }
+ Page<Order> page1 = iOrderService.page(page, wrapper);
+ return PageDTO.of(page1);
+
+ }
+
+
}
--
Gitblit v1.7.1