feat: 修改支付逻辑以支持微信小程序支付

app/api/controller/user/UserController.php

@@ -87,7 +87,7 @@ class UserController extends BaseApiController
         $params['channel_type'] =  $this->userInfo['terminal'];
         $order  = UserLogic::recharge($params);
         $redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
-        $result = PaymentLogic::pay(PayEnum::WECHAT_PAY, 'recharge', $order, $this->userInfo['terminal'], $redirectUrl);
+        $result = PaymentLogic::pay(PayEnum::WECHAT_PAY_MINI, 'recharge', $order, $this->userInfo['terminal'], $redirectUrl);
         if (PaymentLogic::hasError()) {
             return $this->fail(PaymentLogic::getError(), $params);
         }

app/store/controller/system_store_storage/SystemStoreStorageController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\store\controller\system_store_storage;
+
+
+use app\store\controller\BaseAdminController;
+use app\store\lists\system_store_storage\SystemStoreStorageLists;
+use app\admin\logic\system_store_storage\SystemStoreStorageLogic;
+use app\admin\validate\system_store_storage\SystemStoreStorageValidate;
+use hg\apidoc\annotation as ApiDoc;
+
+
+/**
+ * 门店入库记录控制器
+ * Class SystemStoreStorageController
+ * @package app\admin\controller\system_store_storage
+ */
+#[ApiDoc\title('门店入库记录')]
+class SystemStoreStorageController extends BaseAdminController
+{
+
+    #[
+        ApiDoc\Title('列表'),
+        ApiDoc\url('/store/system_store_storage/systemstorestorage/lists'),
+        ApiDoc\Method('GET'),
+        ApiDoc\NotHeaders(),
+    ]
+    public function lists()
+    {
+        return $this->dataLists(new SystemStoreStorageLists());
+    }
+
+
+
+}

app/store/lists/system_store_storage/SystemStoreStorageLists.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace app\store\lists\system_store_storage;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\system_store_storage\SystemStoreStorage;
+use app\common\lists\ListsSearchInterface;
+use app\common\model\auth\Admin;
+use app\common\model\store_product\StoreProduct;
+use app\common\model\system_store\SystemStore;
+use app\common\model\system_store\SystemStoreStaff;
+
+/**
+ * 门店入库记录列表
+ * Class SystemStoreStorageLists
+ * @package app\admin\listssystem_store_storage
+ */
+class SystemStoreStorageLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/06/06 17:06
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['admin_id', 'staff_id', 'status'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取门店入库记录列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author admin
+     * @date 2024/06/06 17:06
+     */
+    public function lists(): array
+    {
+        $this->searchWhere[] = ['store_id','=',$this->adminInfo['store_id']];//只显示当前门店的入库记录
+        return SystemStoreStorage::where($this->searchWhere)
+            ->field(['id', 'store_id', 'admin_id', 'staff_id', 'product_id', 'nums','mark', 'status'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()->each(function ($item) {
+                $item['system_store_name'] = SystemStore::where('id', $item['store_id'])->value('name');
+                $item['admin_name'] = Admin::where('id', $item['admin_id'])->value('name');
+                $item['admin_name'] = Admin::where('id', $item['admin_id'])->value('name');
+                if ($item['staff_id'] > 0) {
+                    $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name');
+                } else {
+                    $item['staff_name'] = '无';
+                }
+                $find=StoreProduct::where('id',$item['product_id'])->field('store_name,image')->find();
+                $item['store_name']=$find['store_name'];
+                $item['image']=$find['image'];
+                return $item;
+            })
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取门店入库记录数量
+     * @return int
+     * @author admin
+     * @date 2024/06/06 17:06
+     */
+    public function count(): int
+    {
+        return SystemStoreStorage::where($this->searchWhere)->count();
+    }
+
+}