From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题
---
admin/app/api/controller/supplier/Index.php | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/admin/app/api/controller/supplier/Index.php b/admin/app/api/controller/supplier/Index.php
index ef3dae5..04f4db6 100644
--- a/admin/app/api/controller/supplier/Index.php
+++ b/admin/app/api/controller/supplier/Index.php
@@ -24,7 +24,7 @@
use app\common\model\app\App as AppModel;
use app\common\enum\order\OrderTypeEnum;
use app\api\model\store\Store as StoreModel;
-
+use app\api\model\supplier\member\Member as MemberModel;
/**
* 供应商
*/
@@ -153,7 +153,11 @@
$supplier = SupplierModel::detail($data['shop_supplier_id']);
// 客服消息
$msg_count = ChatModel::getNoReadCount($this->getSupplierUser($user)['supplier_user_id']);
- return $this->renderSuccess('', compact('totalCount', 'todayCount', 'supplier', 'is_open', 'msg_count'));
+ $member=MemberModel::supplierDetail([
+ 'shop_supplier_id'=>$data['shop_supplier_id'],
+ 'is_expire'=>0
+ ]);
+ return $this->renderSuccess('', compact('totalCount', 'todayCount', 'supplier', 'is_open', 'msg_count','member'));
}
/**
@@ -174,12 +178,12 @@
// 生成订单
$model = new DepositOrderModel;
- $order_id = $model->createOrder($user, $supplier, $params['pay_type'], $params['pay_source']);
+ $order_id = $model->createOrder($user, $supplier);
if (!$order_id) {
return $this->renderError($model->getError() ?: '创建订单失败');
}
// 在线支付
- $payment = DepositOrderModel::onOrderPayment($user, $model, $params['pay_type'], $params['pay_source']);
+ //$payment = DepositOrderModel::onOrderPayment($user, $model, $params['pay_type'], $params['pay_source']);
// 返回结算信息
return $this->renderSuccess('', [
'order_id' => $order_id, // 订单id
--
Gitblit v1.9.2