From feda780069d64479c0c20493603717e100655da9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 05 Dec 2025 18:26:25 +0800
Subject: [PATCH] 完成新人专区 完成复购专区 完成见点奖
---
admin/app/api/controller/supplier/Index.php | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/admin/app/api/controller/supplier/Index.php b/admin/app/api/controller/supplier/Index.php
index ef3dae5..71efd2e 100644
--- a/admin/app/api/controller/supplier/Index.php
+++ b/admin/app/api/controller/supplier/Index.php
@@ -4,6 +4,7 @@
use app\api\controller\Controller;
use app\api\model\supplier\DepositOrder as DepositOrderModel;
+use app\api\model\supplier\DepositRefund as DepositRefundModel;
use app\api\model\supplier\Supplier as SupplierModel;
use app\api\model\plus\coupon\Coupon as CouponModel;
use app\api\model\page\Ad as AdModel;
@@ -24,7 +25,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 +154,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 +179,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
@@ -262,4 +267,22 @@
return $this->renderError($model->getError() ?: '修改失败');
}
}
+ public function refundDeposit()
+ {
+ $data = $this->postData();
+ $model = new DepositRefundModel;
+ $shop_supplier=SupplierModel::detail($data['shop_supplier_id']);
+ if(!$shop_supplier){
+ return $this->renderError('店铺不存在');
+ }
+ if ($shop_supplier['status']==10){
+ return $this->renderError('退还押金申请中，不能重复申请');
+ }
+ $data['deposit_money']=$shop_supplier['deposit_money'];
+ if($model->add($data)){
+ return $this->renderSuccess('提交成功');
+ }else{
+ return $this->renderError($model->getError() ?: '提交失败');
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2