修改bug

rentaiming

2024-07-10 b29becf95484be48aa09e87fcc7cc19f94cf9c81

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

@@ -25,7 +25,6 @@
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import io.seata.common.util.StringUtils;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -66,6 +65,11 @@
    private MemberClient memberClient;
    @Override
    public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
        List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
        if (memberInvoiceOrderList.size()==0){
            throw new ServiceException("无开票订单");
        }

        MemberInvoice memberInvoice =new MemberInvoice();
        memberInvoice.setMemberId(memberInvoiceDTO.getMemberId());
        memberInvoice.setInvoiceMoney(memberInvoiceDTO.getInvoiceMoney());
@@ -79,14 +83,12 @@
        memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone());
        memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen());
        memberInvoice.setRiseType(memberInvoiceDTO.getRiseType());

        BigDecimal pice=new BigDecimal(0.0);
        this.save(memberInvoice);
       List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId();
       for (Long memberInvoiceOrder:memberInvoiceOrderList){
        Double pice=0.00;
       for (int i=0;i<memberInvoiceOrderList.size();i++){
           MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
           Order order= iOrderService.getById(memberInvoiceOrder);
           order.setInvoiceStatus(1);
           Order order= iOrderService.getById(memberInvoiceOrderList.get(i));
           order.setInvoiceStatus(2);
           iOrderService.updateById(order);
           memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
           memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
@@ -95,9 +97,10 @@
           OrderName=order.getSkuName();
           memberInvoiceOrder1.setOrderName(OrderName);
           iMemberInvoiceOrderService.save(memberInvoiceOrder1);
           pice.add(order.getTotalAmount());
           pice=pice+order.getTotalAmount().doubleValue();
       }
        memberInvoice.setInvoiceMoney(pice);

        memberInvoice.setInvoiceMoney(new BigDecimal(pice));
        this.updateById(memberInvoice);
    }

@@ -140,7 +143,8 @@
                .in(com.ruoyi.common.core.utils.StringUtils.isNotEmpty(memberIdSet),
                        MemberInvoice::getMemberId, memberIdSet)
                .eq(query.getInvoiceStatus() != null, MemberInvoice::getInvoiceStatus,
                        query.getInvoiceStatus()).page(page);
                        query.getInvoiceStatus()).orderByDesc(MemberInvoice::getCreateTime)
                .page(page);
        if (page.getRecords().isEmpty()) {
            return PageDTO.empty(page);
        }