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/controller/supplier/Index.php | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/admin/app/api/controller/supplier/Index.php b/admin/app/api/controller/supplier/Index.php
index 04f4db6..24ccd31 100644
--- a/admin/app/api/controller/supplier/Index.php
+++ b/admin/app/api/controller/supplier/Index.php
@@ -4,12 +4,16 @@
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\member\Order as MemberOrderModel;
+use app\api\model\supplier\member\Plan as MemberPlanModel;
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;
use app\api\model\order\Order as OrderModel;
use app\api\model\user\Visit as VisitModel;
use app\common\service\statistics\OrderService;
+use app\common\service\supplier\MemberService;
use app\supplier\service\statistics\UserService;
use app\supplier\model\order\OrderSettled as OrderSettledModel;
use app\api\model\settings\Setting as SettingModel;
@@ -86,7 +90,8 @@
//店铺列表
public function category()
{
- $category = CategoryModel::getALL()->toArray();
+ $param=request()->param();
+ $category = CategoryModel::getALL($param)->toArray();
$category = array_merge([['category_id' => 0, 'name' => '全部']], $category);
return $this->renderSuccess('', compact('category'));
}
@@ -176,9 +181,19 @@
}
$params = $this->request->param();
+ $plans = (new MemberPlanModel())->detail($params['plan_id']);
+ $result=['data'=>['order_id'=>0]];
+ if ($plans['price'] > 0){
+ $memberService = new MemberService();
+ $result = $memberService->createOrder($supplier['shop_supplier_id'], $params['plan_id'], $user);
+ if (!$result['status']){
+ return $this->renderError($result['msg'] ?: '创建订单失败');
+ }
+ }
// 生成订单
$model = new DepositOrderModel;
- $order_id = $model->createOrder($user, $supplier);
+ $order_id = $model->createOrder($user, $supplier,$result);
+
if (!$order_id) {
return $this->renderError($model->getError() ?: '创建订单失败');
}
@@ -266,4 +281,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