团购组件增加筛选

quanwei

2026-01-17 e1e2fe5710a5b5cd9c19bd3aa99c998a1a613ca8

 admin/app/api/service/order/settled/OrderSettledService.php

@@ -112,7 +112,7 @@
            // 设置订单商品总金额(不含优惠折扣)
            $this->setOrderTotalPrice($supplier['productList']);
            $orderTotalPrice += $this->orderData['order_total_price'];
            // 设置订单商品总结算金额(不含优惠折扣)
            // 设置订单商品总结算金额
            $this->setOrderSettlementPrice($supplier['productList']);
            $settlementPrice += $this->orderData['settlement_price'];
            // 先计算商品满减
@@ -179,7 +179,7 @@
                }
                $this->orderData['store_id'] = $this->params['supplier'][$supplier['shop_supplier_id']]['store_id'];
            }
		 

            // 处理配送方式
            if ($this->orderData['delivery'] == DeliveryTypeEnum::EXPRESS) {
                $this->setOrderExpress($supplier['productList']);
@@ -342,7 +342,7 @@
    private function setOrderSettlementPrice($productList)
    {
        // 订单商品的总金额(不含优惠券折扣)
        $this->orderData['settlement_price'] = helper::number2(helper::getArrayColumnSum($productList, 'settlement_price'));
        $this->orderData['settlement_price'] = helper::number2(helper::getArrayColumnSum($productList, 'total_settlement_price'));
    }

    /**
@@ -772,6 +772,8 @@
                'image_id' => $product['image'][0]['image_id'],
                'deduct_stock_type' => $product['deduct_stock_type'],
                'spec_type' => $product['spec_type'],
                'open_coupon' => $product['open_coupon'],
                'open_coupons' => $product['open_coupons'],
                'spec_sku_id' => $product['product_sku']['spec_sku_id'],
                'product_sku_id' => $product['product_sku']['product_sku_id'],
                'product_attr' => $product['product_sku']['product_attr'],
@@ -794,6 +796,7 @@
                'consumption_bonus' => isset($product['consumption_bonus'])?$product['consumption_bonus']:0,
                'total_num' => $product['total_num'],
                'total_price' => $product['total_price'],
                'total_settlement_price' => $product['total_settlement_price'],
                'total_pay_price' => $product['total_pay_price'],
                'supplier_money' => $product['supplier_money'],
                'is_agent' => $product['is_agent'],
@@ -908,7 +911,7 @@
                $product['max_points_num'] = $product['points_num'];
            } else {
                // 商品不允许积分抵扣
                if (!$product['is_points_discount']) continue;
                if (!$product['is_points_discount']||$product['is_vip']||$product['is_newcomer']||$product['is_repurchase']) continue;
                // 积分抵扣比例
                $deductionRatio = helper::bcdiv($setting['discount']['max_money_ratio'], 100);
                // 最多可抵扣的金额