feature/main20240421
guojia 12 months ago
parent 146692ce4f
commit ebc3a8e091
  1. 4
      app/common/model/Payment.php
  2. 4
      app/store/controller/setting/Payment.php
  3. 7
      app/store/model/Payment.php

@ -85,11 +85,11 @@ class Payment extends BaseModel
$model = new static; $model = new static;
// 默认的支付方式数据 // 默认的支付方式数据
$defaultData = $model->defaultData(); $defaultData = $model->defaultData();
if (!$data = Cache::get("1payment_{$storeId}_{$merchantId}")) { if (!$data = Cache::get("payment_{$storeId}_{$merchantId}")) {
// 获取所有支付方式 // 获取所有支付方式
$data = $model->dataByStorage($storeId, $defaultData, $merchantId); $data = $model->dataByStorage($storeId, $defaultData, $merchantId);
// 写入缓存中 // 写入缓存中
Cache::tag('cache')->set("1payment_{$storeId}_{$merchantId}", $data); Cache::tag('cache')->set("payment_{$storeId}_{$merchantId}", $data);
} }
// 重组缓存数据 (多维) // 重组缓存数据 (多维)
return static::reorganize2($defaultData, $data); return static::reorganize2($defaultData, $data);

@ -33,7 +33,9 @@ class Payment extends Controller
public function update(): Json public function update(): Json
{ {
$model = new PaymentModel; $model = new PaymentModel;
if ($model->updateOptions($this->postForm())) { $postform = $this->postForm();
$postform['merchant_id'] = $this->merchantId;
if ($model->updateOptions($postform, $this->merchantId)) {
return $this->renderSuccess('更新成功'); return $this->renderSuccess('更新成功');
} }
return $this->renderError($model->getError() ?: '更新失败'); return $this->renderError($model->getError() ?: '更新失败');

@ -27,10 +27,10 @@ class Payment extends PaymentModel
* @param array $form * @param array $form
* @return bool * @return bool
*/ */
public function updateOptions(array $form): bool public function updateOptions(array $form, $merchantId = 0): bool
{ {
// 生成写入的数据 // 生成写入的数据
$dataList = $this->buildData($form); $dataList = $this->buildData($form, $merchantId);
// 删除所有的支付方式记录 // 删除所有的支付方式记录
static::deleteAll([]); static::deleteAll([]);
// 批量写入商品图片记录 // 批量写入商品图片记录
@ -65,7 +65,7 @@ class Payment extends PaymentModel
* @param array $form * @param array $form
* @return array[] * @return array[]
*/ */
private function buildData(array $form): array private function buildData(array $form, $merchantId = 0): array
{ {
$data = []; $data = [];
foreach ($form as $item) { foreach ($form as $item) {
@ -79,6 +79,7 @@ class Payment extends PaymentModel
'is_default' => (int)$method['is_default'], 'is_default' => (int)$method['is_default'],
'others' => [], 'others' => [],
'store_id' => self::$storeId, 'store_id' => self::$storeId,
'merchant_id' => $merchantId,
]; ];
} }
} }

Loading…
Cancel
Save