'2243'

app/controller/admin/Shop.php

@@ -6,8 +6,8 @@ use app\extra\basic\Base;
 use app\extra\service\saas\ShopService;
 use app\extra\tools\CodeExtend;
 use app\middleware\AuthMiddleware;
-use app\model\saas\SaasAgent;
 use app\model\saas\SaasCombo;
+use app\model\saas\SaasShop;
 use app\model\saas\SaasStore;
 use app\model\saas\SaasStoreShop;
 use app\model\system\SystemUser;
@@ -31,7 +31,7 @@ class Shop extends Base
     protected ShopService $service;
 
     #[Inject]
-    protected SaasAgent $model;
+    protected SaasShop $model;
 
     #[Route(path: "list",methods: "get")]
     public function getStoreList(Request $request): Response

app/controller/api/Cart.php

@@ -15,15 +15,44 @@ class Cart extends Base
 {
 
 
+    /**
+     * 获取打印购物车列表
+     * @return Response
+     */
+    #[Route(path: "list",methods: "get")]
+    public function getCartList(): Response
+    {
+        try {
+            return success("");
+        } catch (\Throwable $th) {
+            return error($th->getMessage());
+        }
+    }
+
+
     /**
      * 图片打印
      * @return Response
      */
     #[Route(path: "image",methods: "post")]
-    public function uploadMultiImage()
+    public function uploadMultiImage(): Response
     {
         try {
+            return success("");
+        } catch (\Throwable $th) {
+            return error($th->getMessage());
+        }
+    }
 
+    /**
+     * 文档打印
+     * @return Response
+     */
+    #[Route(path: "word",methods: "post")]
+    public function uploadWord(): Response
+    {
+        try {
+            return success("ok");
         } catch (\Throwable $th) {
             return error($th->getMessage());
         }

app/controller/merchant/Member.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace app\controller\merchant;
+
+use app\extra\basic\Base;
+use app\middleware\AuthMiddleware;
+use app\model\saas\SaasCombo;
+use app\model\saas\SaasShop;
+use LinFly\Annotation\Route\Controller;
+use LinFly\Annotation\Route\Middleware;
+use LinFly\Annotation\Route\Route;
+use support\Request;
+use support\Response;
+
+
+#[Controller(prefix: "/api/mer/member"),Middleware(AuthMiddleware::class)]
+class Member extends Base
+{
+
+
+    #[Route(path: "combo",methods: "get")]
+    public function getComboDetail(Request $request): Response
+    {
+        try {
+            $shop = (new SaasShop)->where("shop_id",$request->user['agent_id'])->findOrEmpty();
+            $combo = (new SaasCombo)->where("type",2)->where("status",1)->field("id,name,ROUND(money/100,2) as money,ROUND(old_money/100,2) as old_money,is_first")->select();
+            $param = [
+                "state"     => $shop['user_card'], // 1 默认 2 自定义 3关闭
+                "system"    => $combo,
+                "shop"      => empty($shop['user_card_price']) ? $combo :$shop['user_card_price']
+            ];
+            return success("ok",$param);
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+
+    #[Route(path: "combo",methods: "post")]
+    public function setCombo(Request $request): Response
+    {
+        try {
+            $param = $request->post();
+            $shop = (new SaasShop)->where("shop_id",$request->user['agent_id'])->findOrEmpty();
+            $shop->user_card = $param['state'];
+            if (isset($param['shop'])) {
+                $shop->user_card_price = json_encode($param['shop']);
+            }
+            $state = $shop->save();
+            if (!$state) return errorTrans("error.data");
+            return successTrans("success.data");
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+}

app/controller/merchant/Renew.php

@@ -40,7 +40,7 @@ class Renew extends Base
                 return date("Y-m-d",strtotime($data['vip_end']));
             }])->findOrEmpty();
             if ($shop->isEmpty()) return errorTrans("empty.data");
-            $combo = (new SaasCombo)->where("status",1)->order("sort",'desc')->field("ROUND(money/100,2) as f_money,ROUND(old_money/100,2) as f_old_money,id,unit,time,name")
+            $combo = (new SaasCombo)->where("type",1)->where("status",1)->order("sort",'desc')->field("ROUND(money/100,2) as f_money,ROUND(old_money/100,2) as f_old_money,id,unit,time,name")
                 ->append(['diff'])
                 ->withAttr(['diff' => function($query,$data){
                     return $data['f_old_money'] - $data['f_money'];

app/extra/service/saas/ShopService.php

@@ -4,6 +4,7 @@ namespace app\extra\service\saas;
 
 use app\extra\basic\Service;
 use app\model\saas\SaasAgent;
+use app\model\saas\SaasShop;
 
 class ShopService extends Service
 {
@@ -14,7 +15,7 @@ class ShopService extends Service
      */
     public function getList(array $param = [])
     {
-        $this->mode = new SaasAgent();
+        $this->mode = new SaasShop();
         return $this->searchVal($param,$this->searchFilter($param))->where("is_deleted",0)->paginate([
             "list_rows" => $param['pageSize'],
             "page"      => $param['page']