Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

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

@@ -5,7 +5,7 @@
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.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
@@ -27,8 +27,6 @@
@Service
public class MemberInvoiceRiseServiceImpl extends ServiceImpl<MemberInvoiceRiseMapper, MemberInvoiceRise> implements IMemberInvoiceRiseService {

    @Resource
    private  IMemberInvoiceRiseService iMemberInvoiceRiseService;

    @Resource
    private IOrderService iOrderService;
@@ -40,14 +38,14 @@
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.orderByDesc(MemberInvoiceRise::getIsDefault);
        Page<MemberInvoiceRise> page1 = iMemberInvoiceRiseService.page(page, wrapper);
        Page<MemberInvoiceRise> page1 = this.page(page, wrapper);
        return PageDTO.of(page1);
    }

    @Override
    public void saveMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {

        MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
        MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId());
        if (memberInvoiceRise==null){
            memberInvoiceRise=new MemberInvoiceRise();
        }
@@ -55,7 +53,7 @@
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
        MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);

        memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType());
        memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType());
@@ -69,7 +67,7 @@
        if (memberInvoiceRise1==null){
            memberInvoiceRise.setIsDefault(2);
        }
        iMemberInvoiceRiseService.saveOrUpdate(memberInvoiceRise);
        this.saveOrUpdate(memberInvoiceRise);
        }

    @Override
@@ -78,23 +76,23 @@
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
        MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);
        memberInvoiceRise1.setIsDefault(1);
        iMemberInvoiceRiseService.updateById(memberInvoiceRise1);
        this.updateById(memberInvoiceRise1);

        MemberInvoiceRise memberInvoiceRise=iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
        MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId());
        memberInvoiceRise.setIsDefault(2);
        iMemberInvoiceRiseService.updateById(memberInvoiceRise);
        this.updateById(memberInvoiceRise);
    }

    @Override
    public void delMemberInvoiceRise(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
                iMemberInvoiceRiseService.removeById(memberInvoiceRiseDTO.getId());
        this.removeById(memberInvoiceRiseDTO.getId());
    }

    @Override
    public MemberInvoiceRise getMemberInvoiceRiseOne(MemberInvoiceRiseDTO memberInvoiceRiseDTO) {
        return iMemberInvoiceRiseService.getById(memberInvoiceRiseDTO.getId());
        return this.getById(memberInvoiceRiseDTO.getId());
    }

    @Override
@@ -103,7 +101,7 @@
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= iMemberInvoiceRiseService.getOne(wrapper);
        MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);
        return memberInvoiceRise1;
    }