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