From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/api/service/order/settled/OrderSettledService.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/admin/app/api/service/order/settled/OrderSettledService.php b/admin/app/api/service/order/settled/OrderSettledService.php
index 8753840..d91d7ef 100644
--- a/admin/app/api/service/order/settled/OrderSettledService.php
+++ b/admin/app/api/service/order/settled/OrderSettledService.php
@@ -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'],
--
Gitblit v1.9.2