From 2ca91520409493f00ba8a085af721a12b8c15ca8 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Tue, 7 Mar 2023 14:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E6=8A=A5=E9=94=99=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9D=E8=A7=84=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=88=B0=E8=BE=BE=E9=99=90=E5=88=B6=E5=90=8E=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=86=E6=83=A9=E7=BD=9A=E6=9C=AA=E5=87=8F?= =?UTF-8?q?=E5=B0=91=E8=BF=9D=E8=A7=84=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon/article/api/controller/Index.php | 15 ++---- addon/futures/model/Futures.php | 5 +- app/model/NewBaseModel.php | 67 +++++++++++++++++++++++++ public/picture/aijiu/fenxiang.png | Bin 0 -> 3752 bytes 4 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 public/picture/aijiu/fenxiang.png diff --git a/addon/article/api/controller/Index.php b/addon/article/api/controller/Index.php index e594e6a1..ab866a0e 100644 --- a/addon/article/api/controller/Index.php +++ b/addon/article/api/controller/Index.php @@ -7,8 +7,6 @@ use addon\article\model\ArticleFabulous; use addon\article\model\ArticleHistory; use addon\article\model\ArticleShareRecord; use addon\article\model\ArticleShareRewardRecord; -use addon\businesscard\model\Record; -use addon\fenxiao\newModel\Fenxiao; use app\api\controller\BaseApi; use addon\article\model\Article; use app\model\newModel\Config; @@ -100,9 +98,6 @@ class Index extends BaseApi{ $info['member'] = (new Member())->getArticleMemberInfo($this->member_id); // 文章浏览信息处理 (new ArticleHistory())->addInfo($this->member_id,$id); - // 记录用户浏览信息 - if($this->member_id != $sourceMember) (new Record())->addInfo($this->member_id,$sourceMember); - if(empty($info['data'])) return $this->response($this->error('', '文章不存在')); return $this->response($info); @@ -195,11 +190,11 @@ class Index extends BaseApi{ if($isHas > 0 && !$isGet){ // 正常领取奖励 $res = $ArticleShareRewardRecordModel->shareReward($articleId,$this->member_id,$sourceMember,(float)$set['integral']); - if($set['parent_integral'] > 0 && $res['code'] == 0){ - // 上级领取奖励 - $parentMemberId = (new Fenxiao())->getParentMemberId($sourceMember); - $res = $ArticleShareRewardRecordModel->shareReward($articleId,$this->member_id,$parentMemberId,(float)$set['parent_integral'],1); - } + // if($set['parent_integral'] > 0 && $res['code'] == 0){ + // // 上级领取奖励 + // $parentMemberId = (new Fenxiao())->getParentMemberId($sourceMember); + // $res = $ArticleShareRewardRecordModel->shareReward($articleId,$this->member_id,$parentMemberId,(float)$set['parent_integral'],1); + // } return $this->response($res); } diff --git a/addon/futures/model/Futures.php b/addon/futures/model/Futures.php index ab8d0e42..878f33d6 100644 --- a/addon/futures/model/Futures.php +++ b/addon/futures/model/Futures.php @@ -310,7 +310,10 @@ class Futures extends BaseModel{ $startTime = $futuresUserInfo['punish_time'] > time() ? $futuresUserInfo['punish_time'] : time(); Db::name('futures_user') ->where('member_id',$date['member_id']) - ->update(['punish_time' => strtotime("+{$violationHour} hours", $startTime)]); + ->update([ + 'punish_time' => strtotime("+{$violationHour} hours", $startTime),// 添加惩罚时间 + 'violation_num' => Db::raw("violation_num - {$violationUnpaid}")// 减少违规次数 + ]); } return $this->success(); diff --git a/app/model/NewBaseModel.php b/app/model/NewBaseModel.php index 2028231a..b3b86d95 100644 --- a/app/model/NewBaseModel.php +++ b/app/model/NewBaseModel.php @@ -98,4 +98,71 @@ class NewBaseModel extends \think\Model{ return $lang; } + + /** + * Common: 获取单条信息 + * Author: wu-hui + * Time: 2022/10/14 15:41 + * @param $id + * @param array $fields + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function singleInfo($id,$fields = []):array{ + //根据id获取数据信息 + $info = $this->field($fields)->find($id); + if(!$info) return []; + //处理相关数据信息 + $info = $info ? $info->toArray() : []; + + return $this->success($info); + } + /** + * Common: 添加/编辑内容（公共） + * Author: wu-hui + * Time: 2022/10/14 11:25 + * @param $info + * @return array + */ + public function editInfo($info){ + $this->startTrans(); + try{ + // 判断是添加还是修改 + if((int)$info[$this->pk] > 0) self::update($info, [$this->pk => $info[$this->pk]]);// 修改内容 + else self::create($info); + + $this->commit(); + return $this->success(); + }catch(\Exception $e){ + $this->rollback(); + return $this->error('',$e->getMessage()); + } + } + /** + * Common: 删除信息（公共） + * Author: wu-hui + * Time: 2022/10/14 12:01 + * @param $id + * @return array + */ + public function delInfo($id){ + // id 不存在，返回 + if((int)$id <= 0) return $this->error('','删除失败，参数错误!'); + // 删除操作 + $this->startTrans(); + try{ + + $this->where($this->pk,$id) + ->useSoftDelete('delete_time',time()) + ->delete(); + + $this->commit(); + return $this->success(); + }catch(\Exception $e){ + $this->rollback(); + return $this->error('',$e->getMessage()); + } + } } \ No newline at end of file diff --git a/public/picture/aijiu/fenxiang.png b/public/picture/aijiu/fenxiang.png new file mode 100644 index 0000000000000000000000000000000000000000..c5cad511e9e66ead1d5184d860e254071f9057e1 GIT binary patch literal 3752 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 OC}3)6WkA+*yZb-l-UgZg literal 0 HcmV?d00001