Browse Source

支付

master
jianglong 2 years ago
parent
commit
833a347f4c
  1. 10
      app/admin/logic/content/ResourceLogic.php
  2. 4
      app/admin/logic/user/ShipLogLogic.php
  3. 8
      app/admin/view/content/resource/add.html
  4. 11
      app/admin/view/content/resource/edit.html
  5. 4
      app/admin/view/content/resource_category/add.html
  6. 4
      app/admin/view/content/resource_category/edit.html
  7. 3
      app/api/controller/Community.php
  8. 6
      app/api/logic/CommunityLogic.php
  9. 10
      app/api/logic/ResourceLogic.php
  10. 2
      app/api/logic/UserLogic.php

10
app/admin/logic/content/ResourceLogic.php

@ -98,7 +98,7 @@ class ResourceLogic extends Logic
try { try {
Resource::create([ Resource::create([
'cid' => $post['cid'], 'cid' => $post['cid'],
'cid2' => $post['cid2'], 'cid2' => $post['cid2'] ?? 0 ,
'title' => $post['title'], 'title' => $post['title'],
'image' => $post['image'] ?? '', 'image' => $post['image'] ?? '',
'path' => $post['path'] ?? '', 'path' => $post['path'] ?? '',
@ -113,7 +113,8 @@ class ResourceLogic extends Logic
'likes' => 0, 'likes' => 0,
'download' => 0, 'download' => 0,
'sort' => $post['sort'] ?? 0, 'sort' => $post['sort'] ?? 0,
'is_show' => $post['is_show'] 'is_show' => $post['is_show'],
'base_visit' => $post['base_visit']?? rand(500,1000),
]); ]);
return true; return true;
@ -134,7 +135,7 @@ class ResourceLogic extends Logic
try { try {
Resource::update([ Resource::update([
'cid' => $post['cid'], 'cid' => $post['cid'],
'cid2' => $post['cid2'], 'cid2' => $post['cid2'] ?? 0 ,
'title' => $post['title'], 'title' => $post['title'],
'image' => $post['image'] ?? '', 'image' => $post['image'] ?? '',
'path' => $post['path'] ?? '', 'path' => $post['path'] ?? '',
@ -149,7 +150,8 @@ class ResourceLogic extends Logic
'likes' => 0, 'likes' => 0,
'download' => 0, 'download' => 0,
'sort' => $post['sort'] ?? 0, 'sort' => $post['sort'] ?? 0,
'is_show' => $post['is_show'] 'is_show' => $post['is_show'],
'base_visit' => $post['base_visit']?? rand(500,1000),
], ['id'=>$post['id']]); ], ['id'=>$post['id']]);
return true; return true;

4
app/admin/logic/user/ShipLogLogic.php

@ -8,6 +8,7 @@ use app\common\model\order\OrderUser;
use app\common\model\user\UserShip; use app\common\model\user\UserShip;
use app\common\model\user\UserTag; use app\common\model\user\UserTag;
use app\common\model\user\User; use app\common\model\user\User;
use app\common\server\UrlServer;
class ShipLogLogic extends Logic class ShipLogLogic extends Logic
{ {
@ -61,12 +62,13 @@ class ShipLogLogic extends Logic
->alias('a') ->alias('a')
->join('user b','a.user_id=b.id','LEFT') ->join('user b','a.user_id=b.id','LEFT')
->join('user_ship c','a.org_id=c.id','LEFT') ->join('user_ship c','a.org_id=c.id','LEFT')
->page($get['page'], $get['limit'])->select()->toArray(); ->page($get['page'], $get['limit'])->order('id','desc')->select()->toArray();
$count = $orderuser ->alias('a')->alias('a') $count = $orderuser ->alias('a')->alias('a')
->join('user b','a.user_id=b.id','LEFT')->where($where)->count(); ->join('user b','a.user_id=b.id','LEFT')->where($where)->count();
foreach ($lists as &$item){ foreach ($lists as &$item){
$item['avatar'] = $item['avatar'] ? UrlServer::getFileUrl($item['avatar']) : '';
$item['pay_time_str'] = date("Y-m-d H:i:s",$item['pay_time']); $item['pay_time_str'] = date("Y-m-d H:i:s",$item['pay_time']);
$item['type_name'] = $item['type']==0?'免费':'付费'; $item['type_name'] = $item['type']==0?'免费':'付费';
$item['order_source_name'] = $order_source[$item['order_source']]; $item['order_source_name'] = $order_source[$item['order_source']];

8
app/admin/view/content/resource/add.html

@ -86,7 +86,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label for="cid2" class="layui-form-label"><span style="color:red;">*</span>资料二级分类:</label> <label for="cid2" class="layui-form-label"><span style="color:red;">*</span>资料二级分类:</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="cid2" id="cid2" lay-verType="tips" lay-verify="required"> <select name="cid2" id="cid2" lay-verType="tips" >
<option value="">全部</option> <option value="">全部</option>
</select> </select>
</div> </div>
@ -172,6 +172,12 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label for="sort" class="layui-form-label">基础浏览数:</label>
<div class="layui-input-inline">
<input type="number" name="base_visit" id="base_visit" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label for="content" class="layui-form-label">资料内容:</label> <label for="content" class="layui-form-label">资料内容:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<textarea name="content" id="content" lay-verify="content"></textarea> <textarea name="content" id="content" lay-verify="content"></textarea>

11
app/admin/view/content/resource/edit.html

@ -86,7 +86,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label for="cid2" class="layui-form-label"><span style="color:red;">*</span>资料二级分类:</label> <label for="cid2" class="layui-form-label"><span style="color:red;">*</span>资料二级分类:</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="cid2" id="cid2" lay-verType="tips" lay-verify="required"> <select name="cid2" id="cid2" lay-verType="tips" >
<option value="">全部</option> <option value="">全部</option>
{volist name="category2" id="vo"} {volist name="category2" id="vo"}
<option value="{$vo.id}" {if $detail.cid2==$vo.id}selected{/if}>{$vo.name}</option> <option value="{$vo.id}" {if $detail.cid2==$vo.id}selected{/if}>{$vo.name}</option>
@ -197,6 +197,15 @@
<input type="radio" name="is_show" value="0" title="隐藏" {if $detail.is_show==0}checked{/if}> <input type="radio" name="is_show" value="0" title="隐藏" {if $detail.is_show==0}checked{/if}>
</div> </div>
</div> </div>
<div class="layui-form-item">
<label for="sort" class="layui-form-label">基础浏览数:</label>
<div class="layui-input-inline">
<input type="number" name="base_visit" value="{$detail.base_visit}" id="base_visit" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label for="content" class="layui-form-label">资料内容:</label> <label for="content" class="layui-form-label">资料内容:</label>
<div class="layui-input-block"> <div class="layui-input-block">

4
app/admin/view/content/resource_category/add.html

@ -4,8 +4,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label for="pid" class="layui-form-label"><span style="color:red;">*</span>父级分类:</label> <label for="pid" class="layui-form-label"><span style="color:red;">*</span>父级分类:</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="pid" id="pid" lay-verType="tips" lay-verify="required"> <select name="pid" id="pid" lay-verType="tips">
<option value=""></option> <option value="0"></option>
{volist name="category" id="vo"} {volist name="category" id="vo"}
<option value="{$vo.id}">{$vo.name}</option> <option value="{$vo.id}">{$vo.name}</option>
{/volist} {/volist}

4
app/admin/view/content/resource_category/edit.html

@ -4,8 +4,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label for="pid" class="layui-form-label"><span style="color:red;">*</span>父级分类:</label> <label for="pid" class="layui-form-label"><span style="color:red;">*</span>父级分类:</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="pid" id="pid" lay-verType="tips" lay-verify="required"> <select name="pid" id="pid" lay-verType="tips">
<option value=""></option> <option value="0"></option>
{volist name="category" id="vo"} {volist name="category" id="vo"}
<option value="{$vo.id}" {if $detail.pid==$vo.id}selected{/if}>{$vo.name}</option> <option value="{$vo.id}" {if $detail.pid==$vo.id}selected{/if}>{$vo.name}</option>
{/volist} {/volist}

3
app/api/controller/Community.php

@ -95,7 +95,8 @@ class Community extends Api
public function cate() public function cate()
{ {
$get = $this->request->get(); $get = $this->request->get();
$type = ''; $type = 99;
if(isset($get['type'])){ if(isset($get['type'])){
$type = intval($get['type']); $type = intval($get['type']);
} }

6
app/api/logic/CommunityLogic.php

@ -222,7 +222,7 @@ class CommunityLogic extends Logic
public static function getCate($type='') public static function getCate($type='')
{ {
$where = ['is_show' => 1, 'del' => 0]; $where = ['is_show' => 1, 'del' => 0];
if($type!='' || $type==0){ if($type!=''){
$where['type'] = $type; $where['type'] = $type;
} }
$lists = CommunityCategory::field(['id', 'name','type']) $lists = CommunityCategory::field(['id', 'name','type'])
@ -500,7 +500,9 @@ class CommunityLogic extends Logic
$result['city_id'], $result['city_id'],
]):''; ]):'';
$contact = $result['contact'];
$result['contact'] = $result['contact_name'];
$result['contact_name'] = $contact;
return $result; return $result;
} }

10
app/api/logic/ResourceLogic.php

@ -38,6 +38,8 @@ class ResourceLogic extends Logic
if(isset($get['pid']) ){ if(isset($get['pid']) ){
$where[] = ['pid','=',$get['pid']]; $where[] = ['pid','=',$get['pid']];
}else{
$where[] = ['pid','=',0];
} }
return $model->field(['id', 'name']) return $model->field(['id', 'name'])
@ -51,6 +53,7 @@ class ResourceLogic extends Logic
} }
} }
/** /**
* @Notes: 文章列表 * @Notes: 文章列表
* @Author: 张无忌 * @Author: 张无忌
@ -73,6 +76,7 @@ class ResourceLogic extends Logic
$where[] = ['a.title', 'like', "%".$get['keyword']."%"]; $where[] = ['a.title', 'like', "%".$get['keyword']."%"];
} }
if(isset($get['cid']) && !empty($get['cid']) && $get['cid']>0 && !strstr($get['cid'],"city_") ) { if(isset($get['cid']) && !empty($get['cid']) && $get['cid']>0 && !strstr($get['cid'],"city_") ) {
$where[] = ['cid', '=', $get['cid']]; $where[] = ['cid', '=', $get['cid']];
} }
@ -109,7 +113,7 @@ class ResourceLogic extends Logic
$list = $model->alias('a') $list = $model->alias('a')
->join('resource_category c', 'c.id = a.cid') ->join('resource_category c', 'c.id = a.cid')
->field(['a.id', 'a.title', 'a.image', 'a.visit', 'a.likes','a.intro', 'a.content', 'a.create_time','a.price','a.type','a.province_id','a.city_id','a.district_id']) ->field(['a.id', 'a.title', 'a.image', 'a.base_visit','a.visit', 'a.likes','a.intro', 'a.content', 'a.create_time','a.price','a.type','a.province_id','a.city_id','a.district_id'])
->where($where) ->where($where)
->order($order) ->order($order)
->page($get['page_no'], $get['page_size']) ->page($get['page_no'], $get['page_size'])
@ -117,6 +121,7 @@ class ResourceLogic extends Logic
->toArray(); ->toArray();
foreach ($list as &$item){ foreach ($list as &$item){
$item['price_str'] = $item['type']==0? "免费":($item['type']==1?"VIP会员免费":round($item['price'],2)); $item['price_str'] = $item['type']==0? "免费":($item['type']==1?"VIP会员免费":round($item['price'],2));
$item['visit'] = $item['visit'] +$item['base_visit'] ;
} }
@ -136,7 +141,7 @@ class ResourceLogic extends Logic
$list = $model->alias('b') $list = $model->alias('b')
->join('resource a', 'b.resource_id = a.id') ->join('resource a', 'b.resource_id = a.id')
->join('resource_category c', 'c.id = a.cid') ->join('resource_category c', 'c.id = a.cid')
->field(['a.id', 'a.title', 'a.image', 'a.visit', 'a.likes','a.intro', 'a.content', 'a.create_time','a.price','a.type','a.province_id','a.city_id','a.district_id']) ->field(['a.id', 'a.title', 'a.image','a.image', 'a.visit', 'a.likes','a.intro', 'a.content', 'a.create_time','a.price','a.type','a.province_id','a.city_id','a.district_id'])
->where($where) ->where($where)
->order($order) ->order($order)
->page($get['page_no'], $get['page_size']) ->page($get['page_no'], $get['page_size'])
@ -206,6 +211,7 @@ class ResourceLogic extends Logic
$pattern = '/<a[^>]+href=["\'](.*?\.(?:mp4|wav))["\'][^>]*>(.*?)<\/a>/i'; $pattern = '/<a[^>]+href=["\'](.*?\.(?:mp4|wav))["\'][^>]*>(.*?)<\/a>/i';
$replacement = '<video src="$1"></video>'; $replacement = '<video src="$1"></video>';
$article['content'] = preg_replace($pattern, $replacement, $article['content']); $article['content'] = preg_replace($pattern, $replacement, $article['content']);
$article['visit'] = $article['visit'] +$article['base_visit'] ;
} }
return $article; return $article;

2
app/api/logic/UserLogic.php

@ -685,7 +685,7 @@ class UserLogic extends Logic
if(($shipId && $exTime==0) || $day==0){ if(($shipId && $exTime==0) || $day==0){
$time = ['time'=>'永久会员']; $time = ['time'=>'永久会员'];
}else{ }else{
if(!$shipId){ if(!$shipId || $exTime<time() ){
$time = ['time'=>date('Y-m-d',strtotime("+".$day." day"))]; $time = ['time'=>date('Y-m-d',strtotime("+".$day." day"))];
}else{ }else{
$time = ['time'=>date('Y-m-d',intval($exTime)+intval($day)*3600*24)]; $time = ['time'=>date('Y-m-d',intval($exTime)+intval($day)*3600*24)];

Loading…
Cancel
Save