fix:合伙人列表操作日志

cloudroam

2024-12-04 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc

 src/main/java/com/mzl/flower/service/statistics/StatisticsService.java

@@ -9,10 +9,12 @@
import com.mzl.flower.dto.request.flower.FlowerQueryDTO;
import com.mzl.flower.dto.request.payment.OrderItemSalesQueryDTO;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
import com.mzl.flower.dto.response.payment.OrderStatusCountDTO;
import com.mzl.flower.dto.response.statistics.FlowerStatisticsDTO;
import com.mzl.flower.dto.response.statistics.OrderStatisticsDTO;
import com.mzl.flower.dto.response.statistics.RateStatisticsDTO;
import com.mzl.flower.dto.response.statistics.SaleStatisticsDTO;
import com.mzl.flower.dto.response.wallet.WalletWithdrawVO;
import com.mzl.flower.entity.customer.Customer;
import com.mzl.flower.entity.ip.UserAccess;
import com.mzl.flower.entity.payment.Order;
@@ -22,6 +24,7 @@
import com.mzl.flower.mapper.ip.UserAccessMapper;
import com.mzl.flower.mapper.payment.*;
import com.mzl.flower.mapper.supplier.SupplierMapper;
import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.utils.IpUtil;
import io.micrometer.core.instrument.util.StringUtils;
@@ -64,6 +67,9 @@

    @Autowired
    private UserAccessMapper userAccessMapper;

    @Autowired
    private WalletMapper walletMapper;

    public SaleStatisticsDTO getSaleStatistics(String date){
        if(StringUtils.isEmpty(date)){
@@ -112,12 +118,20 @@
                .eq("deleted", 0));
        dto.setCustomerCount(cc.longValue());//用户管理：统计商户列表已启用的全部用户（点击跳转到商户列表）

        Integer oc = orderMapper.selectCount(new QueryWrapper<Order>()
                .eq("deleted", 0)
                .isNotNull("payment_time")
                .isNull("cancel_time")
                .isNull("refund_time"));
        dto.setOrderCount(oc.longValue());//订单管理：全部订单数量-待付款-已取消-已退款（点击跳转到订单列表）
        //订单管理：全部订单数量-待付款-已取消-已退款（点击跳转到订单列表）
        List<OrderStatusCountDTO> ll = orderMapper.getOrderStatusCount(new OrderQueryDTO());
        Integer oc = 0;
        if (ll != null && ll.size() > 0) {
            for (OrderStatusCountDTO c : ll) {
                if(Constants.ORDER_STATUS_BACKEND.PENDING.name().equals(c.getValue())
                        || Constants.ORDER_STATUS_BACKEND.CANCEL.name().equals(c.getValue())
                        || Constants.ORDER_STATUS_BACKEND.REFUND.name().equals(c.getValue())){
                    continue;
                }
                oc += c.getOrderCount();
            }
        }
        dto.setOrderCount(oc.longValue());

        page = new Page(1, 1);
        OrderQueryDTO oq = new OrderQueryDTO();
@@ -158,8 +172,13 @@
        dto.setTotalSaleAmount(a);
        dto.setTotalSaleFlowerCount(c == null ? 0 : c.longValue());

        dto.setSupplierPendingAmount(new BigDecimal(0));//TODO 供应商待提现：结算列表待结算（供应商）+供应商钱包余额
        dto.setSupplierCompleteAmount(new BigDecimal(0));//TODO 供应商已提现：结算列表已结算（供应商）+供应商钱包已提现金额
        WalletWithdrawVO withdrawTotal = walletMapper.getSumWithdrawTotal();
        BigDecimal sumHistoryWithdrawTotal = walletMapper.getSumHistoryWithdrawTotal();
        dto.setSupplierPendingAmount(withdrawTotal.getSupplierPendingAmount().add(sumHistoryWithdrawTotal));
        dto.setSupplierCompleteAmount(withdrawTotal.getSupplierCompleteAmount().add(sumHistoryWithdrawTotal));

//        dto.setSupplierPendingAmount(new BigDecimal(0));//TODO 供应商待提现：结算列表待结算（供应商）+供应商钱包余额
//        dto.setSupplierCompleteAmount(new BigDecimal(0));//TODO 供应商已提现：结算列表已结算（供应商）+供应商钱包已提现金额

        return dto;
    }
@@ -363,7 +382,7 @@
        sq = new OrderItemSalesQueryDTO();
        sq.setStatusList(statusList);
        sq.setSalesStartDate(begin);
        sq.setSalesStartDate(end);
        sq.setSalesEndDate(end);
        orderItemSalesMapper.selectItemSalesList(page, sq);
        dto.setCountToday(page.getTotal());

@@ -371,7 +390,7 @@
        sq = new OrderItemSalesQueryDTO();
        sq.setStatusList(statusList);
        sq.setSalesStartDate(beginY);
        sq.setSalesStartDate(endY);
        sq.setSalesEndDate(endY);
        orderItemSalesMapper.selectItemSalesList(page, sq);
        dto.setCountRate(getRate(dto.getCountToday().intValue(), (int)page.getTotal()));