diff --git a/app/admin/controller/user_ship/UserShipController .php b/app/admin/controller/user_ship/UserShipController .php
new file mode 100644
index 00000000..bac73751
--- /dev/null
+++ b/app/admin/controller/user_ship/UserShipController .php	
@@ -0,0 +1,95 @@
+<?php
+
+namespace app\admin\controller\user_ship;
+
+
+use app\admin\controller\BaseAdminController;
+use app\admin\lists\user_ship\UserShipLists;
+use app\admin\logic\user_ship\UserShipLogic;
+use app\admin\validate\user_ship\UserShipValidate;
+
+
+/**
+ * 会员类型控制器
+ * Class UserShipController
+ * @package app\admin\controller\user_ship
+ */
+class UserShipController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取会员类型列表
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function lists()
+    {
+        return $this->dataLists(new UserShipLists());
+    }
+
+
+    /**
+     * @notes 添加会员类型
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function add()
+    {
+        $params = (new UserShipValidate())->post()->goCheck('add');
+        $result = UserShipLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(UserShipLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑会员类型
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function edit()
+    {
+        $params = (new UserShipValidate())->post()->goCheck('edit');
+        $result = UserShipLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(UserShipLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除会员类型
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function delete()
+    {
+        $params = (new UserShipValidate())->post()->goCheck('delete');
+        UserShipLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取会员类型详情
+     * @return \think\response\Json
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function detail()
+    {
+        $params = (new UserShipValidate())->goCheck('detail');
+        $result = UserShipLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/admin/lists/user_label/UserLabelLists.php b/app/admin/lists/user_label/UserLabelLists.php
index 53261482..79639ed7 100644
--- a/app/admin/lists/user_label/UserLabelLists.php
+++ b/app/admin/lists/user_label/UserLabelLists.php
@@ -6,7 +6,7 @@ namespace app\admin\lists\user_label;
 use app\admin\lists\BaseAdminDataLists;
 use app\common\model\user_label\UserLabel;
 use app\common\lists\ListsSearchInterface;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 
 /**
  * 用户标签列表
diff --git a/app/admin/lists/user_product_storage/UserProductStorageLists.php b/app/admin/lists/user_product_storage/UserProductStorageLists.php
index 6a0cb49a..f44c9f8a 100644
--- a/app/admin/lists/user_product_storage/UserProductStorageLists.php
+++ b/app/admin/lists/user_product_storage/UserProductStorageLists.php
@@ -48,9 +48,15 @@ class UserProductStorageLists extends BaseAdminDataLists implements ListsSearchI
         $status=$this->request->get('status',1);
         if($status==1){
             $this->searchWhere[]=['status','=',1];//只显示正常状态的记录，不显示已出库完的记录
+            $field='id,uid,oid,product_id,sum(nums) nums,status,create_time';
+            $group='product_id';
+        }else{
+            $field='id,uid,oid,product_id,nums,status,create_time';
+            $group=null;
         }
         return UserProductStorage::where($this->searchWhere)
-            ->field(['id', 'uid', 'oid', 'product_id', 'nums', 'status','create_time'])
+            ->field($field)
+            ->group($group)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
diff --git a/app/admin/lists/user_ship/UserShipLists.php b/app/admin/lists/user_ship/UserShipLists.php
new file mode 100644
index 00000000..faf9b87b
--- /dev/null
+++ b/app/admin/lists/user_ship/UserShipLists.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace app\admin\lists\user_ship;
+
+
+use app\admin\lists\BaseAdminDataLists;
+use app\common\model\user_ship\UserShip;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 会员类型列表
+ * Class UserShipLists
+ * @package app\admin\listsuser_ship
+ */
+class UserShipLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['title'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取会员类型列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function lists(): array
+    {
+        return UserShip::where($this->searchWhere)
+            ->field(['id', 'title', 'discount', 'limit', 'sort'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取会员类型数量
+     * @return int
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function count(): int
+    {
+        return UserShip::where($this->searchWhere)->count();
+    }
+
+}
\ No newline at end of file
diff --git a/app/admin/logic/user_ship/UserShipLogic.php b/app/admin/logic/user_ship/UserShipLogic.php
new file mode 100644
index 00000000..0166b1a8
--- /dev/null
+++ b/app/admin/logic/user_ship/UserShipLogic.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace app\admin\logic\user_ship;
+
+
+use app\common\model\user_ship\UserShip;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * 会员类型逻辑
+ * Class UserShipLogic
+ * @package app\admin\logic\user_ship
+ */
+class UserShipLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加会员类型
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            UserShip::create([
+                'title' => $params['title'],
+                'limit' => $params['limit'],
+                'sort' => $params['sort']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑会员类型
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            UserShip::where('id', $params['id'])->update([
+                'title' => $params['title'],
+                'limit' => $params['limit'],
+                'sort' => $params['sort']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除会员类型
+     * @param array $params
+     * @return bool
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public static function delete(array $params): bool
+    {
+        return UserShip::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取会员类型详情
+     * @param $params
+     * @return array
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public static function detail($params): array
+    {
+        return UserShip::findOrEmpty($params['id'])->toArray();
+    }
+}
\ No newline at end of file
diff --git a/app/admin/validate/user_ship/UserShipValidate.php b/app/admin/validate/user_ship/UserShipValidate.php
new file mode 100644
index 00000000..e9a3899d
--- /dev/null
+++ b/app/admin/validate/user_ship/UserShipValidate.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace app\admin\validate\user_ship;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 会员类型验证器
+ * Class UserShipValidate
+ * @package app\admin\validate\user_ship
+ */
+class UserShipValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => 'require',
+        'title' => 'require',
+        'limit' => 'require',
+        'sort' => 'require',
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'title' => '会员名称',
+        'limit' => '充值金额',
+        'sort' => '排序倒序',
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return UserShipValidate
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['title','limit','sort']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return UserShipValidate
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id','title','limit','sort']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return UserShipValidate
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return UserShipValidate
+     * @author admin
+     * @date 2024/06/29 14:18
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+
+}
\ No newline at end of file
diff --git a/app/api/controller/LiuController.php b/app/api/controller/LiuController.php
index b7005658..1560f7d5 100644
--- a/app/api/controller/LiuController.php
+++ b/app/api/controller/LiuController.php
@@ -27,7 +27,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\user\UserRecharge;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 use app\common\model\user_sign\UserSign;
 use app\common\model\vip_flow\VipFlow;
 use app\common\service\pay\PayService;
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index c1e798d1..8ad7e258 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -25,7 +25,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\model\system_store\SystemStoreStaff;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 use app\common\model\user_sign\UserSign;
 use app\common\model\user_spread_log\UserSpreadLog;
 use Picqer\Barcode\BarcodeGeneratorJPG;
diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index f12c1f1d..6a5d2b62 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -16,7 +16,7 @@ use app\common\{logic\BaseLogic,
     model\user\User,
     model\user\UserAuth,
     model\user\UserRecharge,
-    model\user\UserShip,
+    model\user_ship\UserShip,
     model\user_sign\UserSign,
     model\vip_flow\VipFlow,
     service\SmsService,
diff --git a/app/common/lists/user/UserShipLists.php b/app/common/lists/user/UserShipLists.php
index 5b461451..8356504b 100644
--- a/app/common/lists/user/UserShipLists.php
+++ b/app/common/lists/user/UserShipLists.php
@@ -5,7 +5,7 @@ namespace app\common\lists\user;
 
 
 use app\admin\lists\BaseAdminDataLists;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 
 /**
  * 会员类型
diff --git a/app/common/logic/PayNotifyLogic copy.php b/app/common/logic/PayNotifyLogic copy.php
index 3f641cfb..015e4ec9 100644
--- a/app/common/logic/PayNotifyLogic copy.php	
+++ b/app/common/logic/PayNotifyLogic copy.php	
@@ -23,7 +23,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\user\UserRecharge;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 use app\common\model\user_sign\UserSign;
 use app\common\service\Curl;
 use app\common\service\PushService;
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 0ca0ac78..6b4cec2b 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -23,7 +23,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\user\UserRecharge;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 use app\common\model\user_sign\UserSign;
 use app\common\model\vip_flow\VipFlow;
 use app\common\service\Curl;
diff --git a/app/common/model/user/UserShip.php b/app/common/model/user_ship/UserShip.php
similarity index 84%
rename from app/common/model/user/UserShip.php
rename to app/common/model/user_ship/UserShip.php
index 7d0a05ed..1cfc60f2 100644
--- a/app/common/model/user/UserShip.php
+++ b/app/common/model/user_ship/UserShip.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\common\model\user;
+namespace app\common\model\user_ship;
 
 use app\common\model\BaseModel;
 use think\model\concern\SoftDelete;
diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php
index 2a193332..7ed2d0bb 100644
--- a/app/store/lists/user/UserLists.php
+++ b/app/store/lists/user/UserLists.php
@@ -8,7 +8,7 @@ use app\common\model\store_finance_flow\StoreFinanceFlow;
 use app\common\model\user_sign\UserSign;
 use app\store\lists\BaseAdminDataLists;
 use app\common\model\user\User;
-use app\common\model\user\UserShip;
+use app\common\model\user_ship\UserShip;
 use app\common\lists\ListsSearchInterface;
 
 class UserLists extends BaseAdminDataLists  implements ListsSearchInterface