修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

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

@@ -49,15 +49,7 @@
        if (memberInvoiceRise==null){
            memberInvoiceRise=new MemberInvoiceRise();
        }
        if (memberInvoiceRiseDTO.getIsDefault()==2){
            LambdaQueryWrapper<MemberInvoiceRise> wrapper1= Wrappers.lambdaQuery();
            wrapper1.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
            wrapper1.eq(MemberInvoiceRise::getDelFlag,0);
            wrapper1.eq(MemberInvoiceRise::getIsDefault,2);
            MemberInvoiceRise memberInvoiceRise2= this.getOne(wrapper1);
            memberInvoiceRise2.setIsDefault(1);
            this.updateById(memberInvoiceRise2);
        }


        memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
        memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
@@ -67,20 +59,10 @@
        memberInvoiceRise.setCorporationAccount(memberInvoiceRiseDTO.getCorporationAccount());
        memberInvoiceRise.setCorporationOpen(memberInvoiceRiseDTO.getCorporationOpen());
        memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone());
        memberInvoiceRise.setIsDefault(memberInvoiceRiseDTO.getIsDefault());

        memberInvoiceRise.setMemberId(memberInvoiceRiseDTO.getMemberId());
        memberInvoiceRise.setIsDefault(1);

        this.saveOrUpdate(memberInvoiceRise);

        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);

        if (memberInvoiceRise1==null){
            memberInvoiceRise.setIsDefault(2);
        }
    }

    @Override
@@ -92,9 +74,10 @@
        wrapper1.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper1.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise2= this.getOne(wrapper1);
        memberInvoiceRise2.setIsDefault(1);
        this.updateById(memberInvoiceRise2);

        if(memberInvoiceRise2!=null){
            memberInvoiceRise2.setIsDefault(1);
            this.updateById(memberInvoiceRise2);
        }
        MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId());
        memberInvoiceRise.setIsDefault(2);
        this.updateById(memberInvoiceRise);
@@ -127,9 +110,9 @@
        wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(Order::getOrderStatus,4);
        wrapper.eq(Order::getDelFlag,0);
        wrapper.gt(Order::getTotalAmount,0);
        List<Integer> list=new ArrayList<>();
        if (memberInvoiceRiseDTO.getOrderType()==1){
            list.add(2);
            list.add(3);
            wrapper.in(Order::getInvoiceStatus,list);
        }else{
@@ -137,6 +120,7 @@
            list.add(4);
            wrapper.in(Order::getInvoiceStatus,list);
        }
        wrapper.eq(Order::getIsRequest,1);
        Page<Order> page1 = iOrderService.page(page, wrapper);
        return PageDTO.of(page1);