1

app/api/controller/Pub.php

@@ -381,6 +381,25 @@ class Pub extends BaseController
         $data = empty($data) ? [] : $data;
         return app("json")->success($data);
     }
+    /**
+     * 打卡记录列表
+     * @param Request $request
+     */
+    public function getClockList(Request $request)
+    {
+        $post = UtilService::getMore([
+            ['uid', 0],
+            ['to_uid', 0],
+            ['contract_id', 0],
+            ['page', 1],
+            ['pageSize', 50],
+        ], $request);
+        $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
+        $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
+        $data = (new UserClock())->getClockList($post);
+        $data = empty($data) ? [] : $data;
+        return app("json")->success($data);
+    }
     /**
      * 获取其他用户名片信息
      * @param Request $request

app/model/api/UserClock.php

@@ -11,4 +11,47 @@ use think\Model;
 class UserClock extends Model
 {
     //
+    /**
+     * 打卡列表
+     * @return type
+     */
+    public function getClockList($post)
+    {
+        $post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
+        $post["page"]     = $post["page"]<=0     ? 1  : (int)$post["page"];
+        $where=[];
+//        if(isset($post["status"]) && in_array((string)$post["status"], ["0","1"])){
+//            $where[]=["status","=",(int)$post["status"]];
+//        }
+        if(!empty($post["uid"])&&$post["uid"]>0){
+            $where[]=["uid","=",$post["uid"]];
+        }
+        if(!empty($post["to_uid"])&&$post["to_uid"]>0){
+            $where[]=["to_uid","=",$post["to_uid"]];
+        }
+        if(!empty($post["contract_id"])&&$post["contract_id"]>0){
+            $where[]=["contract_id","=",$post["contract_id"]];
+        }
+        $totalCount = $this->where($where)->count();
+        $data=null;
+        if($totalCount>0){
+            $data = $this
+//                ->field($field)
+                ->where($where)
+                ->order("create_time", "desc")
+                ->page($post["page"], $post["pageSize"])
+                ->select();
+            if(!empty($data)){
+                $data = $data->toArray();
+                foreach ($data as $k => $v){
+                    $data[$k]["uid_nickname"] = (new User())->where("uid", $v["uid"])->value("nickname");
+                    $data[$k]["uid_avatar"] = (new User())->where("uid", $v["uid"])->value("avatar");
+                    $data[$k]["to_uid_nickname"] = (new User())->where("uid", $v["to_uid"])->value("nickname");
+                    $data[$k]["to_uid_avatar"] = (new User())->where("uid", $v["to_uid"])->value("avatar");
+                }
+            }
+        }
+        $data = empty($data)?[]:$data;
+        return ["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount];
+    }
 }

app/model/api/UserScoreDetail.php

@@ -17,6 +17,7 @@ class UserScoreDetail extends BaseModel
         'admin_score_add'      => ["code" => "后台补加积分", "content" => "后台补加积分:{money}。"],
         'admin_score_jdd'      => ["code" => "后台补扣积分", "content" => "后台补扣积分:{money}。"],
         'income_score'         => ["code" => "商城下单赠送积分", "content" => "用户收入{money}积分"],
+        'subInfo_score'         => ["code" => "推荐用户生成名片", "content" => "上级用户收入{money}积分"],
         'outcome_score'        => ["code" => "商城购买积分抵扣支出",  "content" => "{mono},支出{money}积分"],
     ];
     

app/system/controller/ContractTemplate.php

@@ -1,5 +1,6 @@
 <?php
-declare (strict_types = 1);
+declare (strict_types=1);
+
 namespace app\system\controller;
 
 use app\BaseController;
@@ -19,13 +20,15 @@ use library\services\UtilService;
 // | Date: 2020-09-06 21:53
 // +----------------------------------------------------------------------
 
-class ContractTemplate extends  BaseController{
+class ContractTemplate extends BaseController
+{
     /**
      * 商品列表
      * @param Request $request
      * @return type
      */
-    public function list(Request $request) {
+    public function list(Request $request)
+    {
         $post = UtilService::getMore([
 //            ['is_hot', ''],
 //            ['is_recommend', ''],
@@ -33,79 +36,93 @@ class ContractTemplate extends  BaseController{
             ['page', 1],
             ['pageSize', 50],
         ], $request);
-        $post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
-        $post["page"]     = $post["page"]<=0     ? 1  : (int)$post["page"];
-        $data = (new ContractTemplateModel)->getDataList($post,"*",1);
-        return app('json')->success(["list" =>$data["list"], "pageSize" => $data["pageSize"],"page"=>$data["page"],"pageCount"=>$data["totalCount"]]);
+        $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
+        $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
+        $data = (new ContractTemplateModel)->getDataList($post, "*", 1);
+        return app('json')->success(["list" => $data["list"], "pageSize" => $data["pageSize"], "page" => $data["page"], "pageCount" => $data["totalCount"]]);
     }
 
-    
+
     /**
      * 添加编辑商品
      * @param Request $request
      * @return type
      */
-    public function add(Request $request){
-        $post = UtilService::getMore([
-            ['id',''],
-            ['title','','empty','请填写模板标题'],
+    public function add(Request $request)
+    {
+        try {
+
+
+            $post = UtilService::getMore([
+                ['id', ''],
+                ['title', '', 'empty', '请填写模板标题'],
 //            ['price','0','is_numeric','请输入正确的模板售价'],
 //            ['old_price','0','is_numeric','请输入正确的模板原价'],
-            ['imgs',[],'empty','请上传商品主图'],
+                ['imgs', [], 'empty', '请上传商品主图'],
 //            ['imgs',[]],
-            ['is_show','0'],
+                ['is_show', '0'],
 //            ['is_recommend','0'],
 //            ['is_init','0'],
 //            ['code','','empty','请输入CODE'],
 //            ['status','0'],
-            ['content',''],
-        ],$request);
-        $save=[];
-        $save["title"]        = $post["title"];
+                ['content', ''],
+            ], $request);
+            $save = [];
+            $save["title"] = $post["title"];
 //        $save["price"]        = floatval($post["price"]);
 //        $save["old_price"]    = floatval($post["old_price"]);
-        $save["is_show"]       = (int)$post["is_show"]      == 1 ? 1 : 0;
-        $save["imgs"]         = empty($post["imgs"]) ? "" : implode(",", $post["imgs"]);
+            $save["is_show"] = (int)$post["is_show"] == 1 ? 1 : 0;
+            $save["imgs"] = empty($post["imgs"]) ? "" : implode(",", $post["imgs"]);
 //        $save["is_hot"]       = (int)$post["is_hot"]      == 1 ? 1 : 0;
 //        $save["is_recommend"] = (int)$post["is_recommend"]== 1 ? 1 : 0;
 //        $save["is_init"]      = (int)$post["is_init"]     == 1 ? 1 : 0;
-        $save["content"]         = $post["content"];
+            $save["content"] = $post["content"];
 //        $save["unreal_sales"] = (int)$post["unreal_sales"];
-        $save["admin_time"]   = time();
-        $save["admin_id"]     = $request->adminInfo['id'];
+            $save["admin_time"] = time();
+            @file_put_contents('quanju.txt', json_encode($request->adminInfo) . "-管理员信息\r\n", 8);
+
+            if (!empty($request->adminInfo) && isset($request->adminInfo['id'])) {
+                $save["admin_id"] = $request->adminInfo['id'];
+            } else {
+                // 处理 id 不存在的情况
+                $save["admin_id"] = 0; // 或者其他默认值
+            }
 //        if($save["price"]<0 || $save["old_price"]<0){
 //            return app('json')->fail("请输入正确的价格");
 //        }
-        
-        $id = empty($post["id"])?0:(int)$post["id"];
+
+            $id = empty($post["id"]) ? 0 : (int)$post["id"];
 //        $codeWhere[]=["code","=",$save["code"]];
-        if($id>0){
-            $codeWhere[]=["id","<>",$id];
-        }
+            if ($id > 0) {
+                $codeWhere[] = ["id", "<>", $id];
+            }
 //        $count = (new ContractTemplateModel)->where($codeWhere)->where("id","<>",$id)->count();
 //        if($count>0){
 //            return app('json')->fail("当前code已存在");
 //        }
-        $r=0;
-        if(empty($id) || $id=="0"){
-            $save["time"] = time();
-            $r = (new ContractTemplateModel)->insert($save);
-        }else{
-            $r = (new ContractTemplateModel)->where("id",$id)->update($save);
-        }
-        if($r){
-            return app('json')->success("数据保存成功");
-        }else{
-            return app('json')->fail("数据保存失败");
+            if (empty($id) || $id == "0") {
+                $save["time"] = time();
+                $r = (new ContractTemplateModel)->insert($save);
+            } else {
+                $r = (new ContractTemplateModel)->where("id", $id)->update($save);
+            }
+            if ($r) {
+                return app('json')->success("数据保存成功");
+            } else {
+                return app('json')->fail("数据保存失败");
+            }
+        } catch (\Exception $e) {
+            @file_put_contents('quanju.txt', $e->getLine(). $e->getMessage(). $e->getFile() . "-报错内容\r\n", 8);
+            return '数据保存失败: ' . $e->getMessage();
         }
     }
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
 //     /**
 //     * 服务类型列表
 //     * @param Request $request
@@ -230,6 +247,6 @@ class ContractTemplate extends  BaseController{
 //        $bool =   (new ServiceTimeTypeModel)->where("id",$id)->delete();
 //        return app('json')->success("删除成功");
 //    }
-    
-    
+
+
 }