Wesmiler

addons/admin/src/views/system/article/other.vue

@@ -0,0 +1,390 @@
+<template>
+  <div class="ele-body">
+    <el-card shadow="never">
+      <!-- 搜索表单 -->
+      <el-form :model="table.where" label-width="90px" class="ele-form-search"
+               @keyup.enter.native="$refs.table.reload()" @submit.native.prevent>
+        <el-row :gutter="15">
+          <el-col :md="8" :sm="12">
+            <el-form-item label="关键词:">
+              <el-input v-model="table.where.keyword" placeholder="请输入标题关键词" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+            <el-form-item label="类型:">
+              <el-select v-model="table.where.type" @change="changeType(1)" placeholder="请选择类型" class="ele-fluid">
+                <el-option v-for="(item,k) in typeArr" :key="k" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+          <el-form-item label="分类:" prop="cate_id">
+            <el-select v-model="table.where.cate_id" placeholder="请选择分类" class="ele-fluid">
+              <el-option label="全部" :value="0"></el-option>
+              <el-option v-for="(item,k) in cateList" :key="k" :label="item.name" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+            <el-form-item label="状态:">
+              <el-select v-model="table.where.status" placeholder="请选择" class="ele-fluid">
+                <el-option label="全部" :value="0"/>
+                <el-option label="发布" :value="1"/>
+                <el-option label="未发布" :value="2"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :md="6" :sm="12">
+            <div class="ele-form-actions">
+              <el-button type="primary" @click="$refs.table.reload()" icon="el-icon-search" class="ele-btn-icon">查询
+              </el-button>
+              <el-button @click="(table.where={status:0,type:1,cate_id:0})&&$refs.table.reload()">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- 操作按钮 -->
+      <div class="ele-table-tool ele-table-tool-default">
+        <el-button @click="add()" type="primary" icon="el-icon-plus" class="ele-btn-icon" size="small" v-if="permission.includes('sys:article:add')">添加资讯
+        </el-button>
+        <el-button @click="remove()" type="danger" icon="el-icon-delete" class="ele-btn-icon" size="small" v-if="permission.includes('sys:article:dall')">批量删除
+        </el-button>
+      </div>
+      <!-- 数据表格 -->
+      <ele-data-table ref="table" :config="table" :choose.sync="choose" height="calc(100vh - 315px)"  highlight-current-row>
+        <template >
+          <el-table-column type="selection" width="45" align="center" fixed="left"/>
+          <el-table-column prop="id" label="ID" width="60" align="center" fixed="left" show-overflow-tooltip/>
+          <el-table-column label="封面" min-width="100" align="center">
+            <template slot-scope="{row}">
+              <el-image v-if="row.cover" :src="row.cover" style="width: 60px; height: 60px;" fit="cover"
+                        :preview-src-list="[row.cover]" />
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="title" label="标题" show-overflow-tooltip min-width="200"/>
+          <el-table-column prop="type_name" label="类型" show-overflow-tooltip min-width="100">
+            <template slot-scope="{row}">
+              <span class="ele-text-primary">{{row.type_name}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="category" label="分类" show-overflow-tooltip min-width="100">
+            <template slot-scope="{row}">
+              <span class="ele-text-primary">{{row.category?row.category.name:'无'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="view_num" label="浏览量" sortable="custom" show-overflow-tooltip min-width="100" align="center"/>
+          <el-table-column prop="sort" label="排序" sortable="custom" show-overflow-tooltip min-width="100" align="center"/>
+          <el-table-column prop="create_time" label="发布时间" sortable="custom" min-width="180" align="center"/>
+          <el-table-column prop="status" label="发布" :resizable="false" min-width="120">
+            <template slot-scope="{row}">
+              <el-switch v-model="row.status" @change="editStatus(row)" :active-value="1" :inactive-value="2"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="180px" align="center" :resizable="false"  fixed="right">
+            <template slot-scope="{row}">
+              <el-link @click="edit(row)" icon="el-icon-edit" type="primary" :underline="false" v-if="permission.includes('sys:article:edit')">修改</el-link>
+              <el-popconfirm title="确定要删除此资讯吗？删除后不可恢复！" @confirm="remove(row)" class="ele-action">
+                <el-link slot="reference" icon="el-icon-delete" type="danger" :underline="false" v-if="permission.includes('sys:article:delete')">删除</el-link>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </template>
+      </ele-data-table>
+    </el-card>
+    <!-- 编辑弹窗 -->
+    <el-dialog :title="editForm.id?'修改资讯':'添加资讯'" :visible.sync="showEdit" width="1200px"
+               @closed="resetEditForm()" :destroy-on-close="true" custom-class="ele-dialog-form" :lock-scroll="false">
+      <el-form :model="editForm" ref="editForm" :rules="editRules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :sm="15">
+            <el-form-item label="封面:" prop="cover">
+              <uploadImage v-if="showEdit" :limit="1" v-model="editForm.cover"></uploadImage>
+              <div style="color: #909399; font-size: 12px; margin-top: 5px;">建议尺寸：根据广告位置选择合适尺寸</div>
+            </el-form-item>
+            <el-form-item label="类型:" prop="type">
+              <el-select v-model="editForm.type" @change="changeType(2)" placeholder="请选择类型" class="ele-fluid">
+                <el-option v-for="(item,k) in typeArr" :key="k" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="分类:" prop="cate_id">
+              <el-select v-model="editForm.cate_id" placeholder="请选择分类" class="ele-fluid">
+                <el-option v-for="(item,k) in cateList" :key="k" :label="item.name" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标题:" prop="title">
+              <el-input v-model="editForm.title" placeholder="请输入标题" clearable/>
+            </el-form-item>
+            <el-form-item label="作者/来源:" prop="author">
+              <el-input v-model="editForm.author" placeholder="请输入作者或来源，默认平台名称" clearable/>
+            </el-form-item>
+            <el-form-item label="描述:">
+              <el-input v-model="editForm.description" type="textarea" :rows="3" placeholder="请输入描述（选填）" maxlength="200" show-word-limit/>
+            </el-form-item>
+            <el-form-item label="发布日期:" prop="publish_at">
+              <el-date-picker
+                  v-model="editForm.publish_at"
+                  type="datetime"
+                  placeholder="选择显示的发布日期，默认新增时间"
+                  size="small"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="排序号:" prop="sort">
+              <el-input-number v-model="editForm.sort" controls-position="right" :min="0"
+                               placeholder="排序号，倒序" class="ele-fluid ele-text-left"/>
+            </el-form-item>
+          </el-col>
+          <el-col :sm="20">
+            <el-form-item label="内容类型:">
+              <el-radio-group v-model="editForm.content_type">
+                <el-radio :label="1">富文本</el-radio>
+                <el-radio :label="2">JSON内容块</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="资讯内容:" prop="content">
+              <div class="block-box" v-if="editForm.content_type==2">
+                <el-table :data="jsonList" border stripe style="margin-top: 10px;" max-height="300" class="json-table">
+                  <el-table-column type="index" label="序号" width="50" align="center" />
+                  <el-table-column label="子列内容" width="600"align="center" >
+                    <template slot-scope="{row}">
+                      <div style="margin-bottom: 10px;">
+                        <el-input v-model="row.title" placeholder="如：1.政策子标题" maxlength="200" />
+                      </div>
+                      <div>
+                        <tinymce-editor v-model="row.description" />
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="100" align="center" fixed="right">
+                    <template slot-scope="{$index}">
+                      <div>
+                        <el-button type="text" v-if="$index>0" size="small" icon="el-icon-delete" style="color: #F56C6C;"
+                                   @click="deleteRow($index)">删除</el-button>
+                      </div>
+                     <div>
+                       <el-button type="text" size="small" icon="el-icon-plus" style="color: #409EFF;"
+                                  @click="addRow()">添加</el-button>
+                     </div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+              <tinymce-editor v-else v-model="editForm.content"/>
+            </el-form-item>
+            <el-form-item label="状态:">
+              <el-radio-group v-model="editForm.status">
+                <el-radio :label="1">发布</el-radio>
+                <el-radio :label="2">不发布</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="showEdit=false">取消</el-button>
+        <el-button type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import uploadImage from '@/components/uploadImage'
+import TinymceEditor from '@/components/TinymceEditor'
+import { mapGetters } from "vuex";
+export default {
+  name: "Sysarticle",
+  components: {TinymceEditor,uploadImage},
+  data() {
+    return {
+      table: {url: '/article/index', where: {status:0,cate_id:0,type:1}},  // 表格配置
+      choose: [],  // 表格选中数据
+      showEdit: false,  // 是否显示表单弹窗
+      editForm: {status:1,type:1,content_type:1},  // 表单数据
+      jsonList: [
+        {title: '',description: ''},
+      ],
+      typeArr: [
+        {id:1,name:'行业资讯中心'},
+        {id:2,name:'行业政策专栏'},
+      ],
+      editRules: {  // 表单验证规则
+        title: [
+          {required: true, message: '请输入名称', trigger: 'blur'}
+        ],
+        cate_id: [
+          {required: true, message: '请选择分类', trigger: 'blur'}
+        ],
+        type: [
+          {required: true, message: '请选择类型', trigger: 'blur'}
+        ],
+        content_type: [
+          {required: true, message: '请选择内容类型', trigger: 'blur'}
+        ],
+      },
+      // 分类
+      cateList:[],
+      loading: false,
+      // 自定义文件上传(这里使用把选择的文件转成blob演示)
+      file_picker_callback: (callback, value, meta) => {
+        let input = document.createElement('input');
+        input.setAttribute('type', 'file');
+        // 设定文件可选类型
+        if (meta.filetype === 'image') {
+          input.setAttribute('accept', 'image/*');
+        } else if (meta.filetype === 'media') {
+          input.setAttribute('accept', 'video/*');
+        }
+        input.onchange = () => {
+          let file = input.files[0];
+          let reader = new FileReader();
+          reader.onload = (e) => {
+            let blob = new Blob([e.target.result], {type: file.type});
+            callback(URL.createObjectURL(blob));
+          };
+          reader.readAsArrayBuffer(file);
+        }
+        input.click();
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+  },
+  created(){
+    this.getCategory();
+  },
+  methods: {
+    /* 添加 */
+    add() {
+      this.jsonList = [
+        {title: '',description: ''},
+      ];
+      this.resetEditForm();
+      this.showEdit = true;
+    },
+    /* 显示编辑 */
+    edit(row) {
+      this.editForm = Object.assign({}, row);
+      this.jsonList = this.editForm.content;
+      this.showEdit = true;
+    },
+    addRow(){
+      this.jsonList.push({title: '', description:''})
+    },
+    // 删除
+    deleteRow(index){
+      this.jsonList.splice(index,1);
+    },
+    /* 重置表单 */
+    resetEditForm() {
+      this.editForm = {status: 1, type: 1,content_type:1, title: '', content: ''};
+      if (this.$refs.editForm) {
+        this.$refs.editForm.clearValidate();
+      }
+    },
+    changeType(type){
+      this.getCategory(type==1? this.table.where.type:this.editForm.type);
+    },
+    // 分类
+    getCategory(type){
+      this.$http.post('/articleCategory/options',{type:type?type:this.table.where.type}).then(res => {
+        if (res.data.code === 0) {
+          this.cateList = res.data.data;
+        }
+      })
+    },
+    /* 保存编辑 */
+    save() {
+      this.$refs['editForm'].validate((valid) => {
+        if (valid) {
+          if(this.editForm.content_type==2){
+            this.editForm.content = this.jsonList;
+          }else{
+
+          }
+
+          const loading = this.$loading({lock: true});
+          this.$http.post('/article/edit', this.editForm).then(res => {
+            loading.close();
+            if (res.data.code === 0) {
+              this.showEdit = false;
+              this.$message({type: 'success', message: res.data.msg});
+              this.$refs.table.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          }).catch(e => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    /* 删除 */
+    remove(row) {
+      if (!row) {  // 批量删除
+        if (this.choose.length === 0) return this.$message.error('请至少选择一条数据');
+        let ids = this.choose.map(d => d.id);
+        this.$confirm('确定要删除选中的吗?', '提示', {type: 'warning'}).then(() => {
+          const loading = this.$loading({lock: true});
+          this.$http.post('/article/delete', {id: ids}).then(res => {
+            loading.close();
+            if (res.data.code === 0) {
+              this.$message({type: 'success', message: res.data.msg});
+              this.$refs.table.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          }).catch(e => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+        }).catch(() => 0);
+      } else {  // 单个删除
+        const loading = this.$loading({lock: true});
+        this.$http.post('/article/delete', {id:row.id}).then(res => {
+          loading.close();
+          if (res.data.code === 0) {
+            this.$message({type: 'success', message: res.data.msg});
+            this.$refs.table.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          loading.close();
+          this.$message.error(e.message);
+        });
+      }
+    },
+    /* 更改状态 */
+    editStatus(row) {
+      this.$message.closeAll()
+      const loading = this.$loading({lock: true});
+      let params = Object.assign({}, row);
+      this.$http.post('/article/status', params).then(res => {
+        loading.close();
+        if (res.data.code === 0) {
+          this.$message({type: 'success', message: res.data.msg});
+        } else {
+          row.status = !row.status ? 2 : 1;
+          this.$message.error(res.data.msg);
+        }
+      }).catch(e => {
+        loading.close();
+        this.$message.error(e.message);
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+.ele-block >>> .el-upload, .ele-block >>> .el-upload-dragger {
+  width: 100%;
+}
+</style>

app/Http/Controllers/Api/v1/IndexController.php

@@ -37,6 +37,7 @@ class IndexController extends webApp
                     'auth_desc' => format_content(ConfigService::make()->getConfigByCode('auth_desc', '')),
                     'bank_desc' => format_content(ConfigService::make()->getConfigByCode('bank_desc', '')),
                     'withdraw_desc' => format_content(ConfigService::make()->getConfigByCode('withdraw_desc', '')),
+                    'goods_disclaimer' => format_content(ConfigService::make()->getConfigByCode('goods_disclaimer', '')),
                     'wxpay_open' => ConfigService::make()->getConfigByCode('wxpay_open', 0),
                     'bank_limit_num' => ConfigService::make()->getConfigByCode('bank_limit_num', 5),
                     'withdraw_open' => ConfigService::make()->getConfigByCode('withdraw_open', 0),

app/Http/Controllers/Api/v1/MemberController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\v1;
 use App\Http\Controllers\Api\webApp;
 use App\Http\Validator\MemberValidator;
 use App\Services\Api\MemberService;
+use App\Services\Api\OrderService;
 use App\Services\MpService;
 
 /**
@@ -20,12 +21,42 @@ class MemberController extends webApp
      */
     public function teamList()
     {
-        $params = request()->all();
-        $datas = MemberService::make()->getTeamList($this->userId,$params);
-        if ($datas) {
-            return showJson(1010, true, $datas);
-        } else {
-            return showJson(1004, false);
+        try {
+            $params = request()->all();
+            $userId = isset($params['pid']) && $params['pid']>0?$params['pid']:0;
+            $datas = MemberService::make()->getTeamList($userId?$userId:$this->userId,$params);
+            if ($datas) {
+                return showJson(1010, true, $datas);
+            } else {
+                return showJson(1004, false);
+            }
+        } catch (\Exception $exception){
+            $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
+            return showJson(1046, false, $error);
+        }
+    }
+
+    /**
+     * 团队成员佣金订单
+     * @return array
+     */
+    public function bill()
+    {
+        try {
+            $params = request()->all();
+            $userId = isset($params['id']) && $params['id']>0?$params['id']:0;
+            if(!MemberService::make()->checkTeamPermission($this->userId, $userId)){
+                return showJson(MemberService::make()->getError(), false);
+            }
+
+            if ($datas = OrderService::make()->getCommissionBill($userId?$userId:$this->userId,$params)) {
+                return showJson(1010, true, $datas);
+            } else {
+                return showJson(1004, false);
+            }
+        } catch (\Exception $exception){
+            $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
+            return showJson(1046, false, $error);
         }
     }
 
@@ -35,7 +66,8 @@ class MemberController extends webApp
      */
     public function info()
     {
-        $userId = request()->post('user_id', 0);
+        $params = request()->all();
+        $userId = isset($params['user_id']) && $params['user_id']?$params['user_id']:0;
         $info = MemberService::make()->getInfo($userId ? $userId : $this->userId);
         if ($info) {
             return showJson(1010, true, $info);

app/Http/Controllers/Api/v1/TestController.php

@@ -26,4 +26,6 @@ class TestController extends webApp
 
         return showJson('操作成功', true, $result);
     }
+
+
 }

app/Models/ConfigModel.php

@@ -42,7 +42,7 @@ class ConfigModel extends BaseModel
                     $v = explode('=', $v);
                     $key = isset($v[0])? $v[0] : '';
                     $name = isset($v[1])? $v[1] : '';
-                    if($key && $name){
+                    if($name){
                         $options[] = [
                             'label'=> $name,
                             'value'=> $key

app/Models/OrderCommissionModel.php

@@ -0,0 +1,63 @@
+<?php
+// +----------------------------------------------------------------------
+// | LARAVEL8.0 框架 [ LARAVEL ][ RXThinkCMF ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 LARAVEL研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: laravel开发员 <laravel.qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Models;
+
+/**
+ * 佣金订单管理-模型
+ * @author laravel开发员
+ * @since 2020/11/11
+ * @package App\Models
+ */
+class OrderCommissionModel extends BaseModel
+{
+    // 设置数据表
+    protected $table = 'order_commission';
+
+    protected $appends = ['state_text'];
+
+    // 状态
+    public function getStateTextAttribute()
+    {
+        return $this->state>0?'已到账':'冻结中';
+    }
+
+    /**
+     * 佣金用户
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function user()
+    {
+        return $this->hasOne(MemberModel::class, 'id', 'user_id')
+            ->select(['id','openid', 'mobile', 'nickname', 'realname', 'status']);
+    }
+
+    /**
+     * 下单用户
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function orderUser()
+    {
+        return $this->hasOne(MemberModel::class, 'id', 'order_user_id')
+            ->select(['id','openid', 'mobile', 'nickname', 'realname', 'status']);
+    }
+
+    /**
+     * 佣金订单
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function order()
+    {
+        return $this->hasOne(OrderModel::class, 'id', 'order_id')
+            ->with(['orderGoods'])
+            ->select(['id', 'order_no', 'user_id','total','pay_total','status']);
+    }
+}

app/Services/Api/ArticleService.php

@@ -123,14 +123,17 @@ class ArticleService extends BaseService
         if($status>0){
             $where['a.status'] = $status;
         }
-        if($type>0){
-            $where['a.type'] = $type;
-        }
 
         if($cateId>0){
             $where['a.cate_id'] = $cateId;
         }
 
+        if($type>0 && $cateId<=0){
+            $where['a.type'] = $type;
+        }
+
+
+
         return $this->model->with(['category'])->from('article as a')
             ->where($where)
             ->where(function ($query) use($params){
@@ -231,6 +234,7 @@ class ArticleService extends BaseService
         $datas = ArticleCateModel::where(['type'=> $type,'status'=>1,'mark'=>1])
             ->select(['id','name','sort','type'])
             ->orderBy('sort','desc')
+            ->orderBy('id','desc')
             ->get();
         $datas = $datas? $datas->toArray() : [];
         if($datas){

app/Services/Api/MemberService.php

@@ -700,6 +700,25 @@ class MemberService extends BaseService
         }
     }
 
+    /**
+     * 验证操作用户权限
+     * @param $userId
+     * @param $actId
+     * @return bool
+     */
+    public function checkTeamPermission($userId, $actId)
+    {
+        $parents = $this->model->where(['id'=>$actId])->value('parents');
+        $parents = $parents? explode(',',$parents) : [];
+        if(!in_array($userId,$parents)){
+            $this->error = '信息错误，权限不足';
+            return false;
+        }
+
+        $this->error = '验证成功';
+        return true;
+    }
+
 
     /**
      * 账号注销

app/Services/Api/OrderService.php

@@ -16,6 +16,7 @@ use App\Models\GoodsSkuModel;
 use App\Models\MeetingModel;
 use App\Models\MeetingRecordsModel;
 use App\Models\MemberModel;
+use App\Models\OrderCommissionModel;
 use App\Models\OrderGoodsModel;
 use App\Models\OrderModel;
 use App\Models\StoreModel;
@@ -111,6 +112,47 @@ class OrderService extends BaseService
     }
 
     /**
+     * 用户佣金订单列表
+     * @param $userId
+     * @param $params date-数组日期范围
+     * @return array
+     */
+    public function getCommissionBill($userId, $params)
+    {
+        $pageSize = isset($params['pageSize'])&&$params['pageSize']?$params['pageSize']:10;
+        $query = OrderCommissionModel::where(['user_id'=>$userId])
+            ->with(['user','order'])
+            ->where(function($query) use($params){
+                // 日期
+                $date = isset($params['date']) ? $params['date'] : [];
+                $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00');
+                $end = isset($date[1]) && $date[1]? $date[1] : date('Y-m-d 23:59:59');
+                $end = $start>=$end? '' : $end;
+                if ($start) {
+                    $query->where('created_at','>=', $start);
+                }
+                if($end){
+                    $query->where('created_at','<=', $end);
+                }
+            });
+
+        // 统计
+        $query1 = clone $query;
+        $amount = $query1->sum('commission');
+
+        $list = $query->orderBy('created_at', 'desc')
+            ->paginate($pageSize > 0 ? $pageSize : 9999999);
+        $list = $list ? $list->toArray() : [];
+
+        return [
+            'pageSize' => $pageSize,
+            'amount'=>$amount,
+            'total' => isset($list['total']) ? $list['total'] : 0,
+            'list' => isset($list['data']) ? $list['data'] : []
+        ];
+    }
+
+    /**
      * 查询条件
      * @param $params
      * @return mixed

app/Services/Common/ArticleService.php

@@ -136,7 +136,7 @@ class ArticleService extends BaseService
 
         $data['author'] = isset($data['author']) && $data['author']?$data['author'] : \App\Services\ConfigService::make()->getConfigByCode('app_name');
         $data['cover'] = $data['cover']? get_image_path($data['cover']) : '';
-        $data['publish_at'] = $data['publish_at']? datetime($data['publish_at']) : date('Y-m-d H:i:s');
+        $data['publish_at'] = !empty($data['publish_at'])? datetime($data['publish_at']) : date('Y-m-d H:i:s');
 
         // 设置日志标题
         ActionLogModel::setTitle("编辑文章信息");

app/Services/Common/GoodsService.php

@@ -110,10 +110,8 @@ class GoodsService extends BaseService
         $statusMap = [
             1 => '已发布',
             2 => '待发布',
-            3 => '待审核',
-            4 => '审核失败'
         ];
-        return isset($statusMap[$status]) ? $statusMap[$status] : '未知';
+        return isset($statusMap[$status]) ? $statusMap[$status] : '待发布';
     }
 
     /**
@@ -232,8 +230,8 @@ class GoodsService extends BaseService
         if (!isset($data['sku_type'])) {
             $data['sku_type'] = 1; // 默认单规格
         }
-        if (!isset($data['status'])) {
-            $data['status'] = 3; // 默认待审核
+        if (!isset($data['status']) || $data['status'] == 3) {
+            $data['status'] = 2; // 默认待审核
         }
         if (!isset($data['sort'])) {
             $data['sort'] = 0;
@@ -303,6 +301,10 @@ class GoodsService extends BaseService
             return message('请填写商品单价', false);
         }
 
+        if (!isset($data['status']) || $data['status'] == 3) {
+            $data['status'] = 2; // 默认
+        }
+
         if (!is_numeric($data['price'])) {
             return message('商品单价格式不正确', false);
         }

app/Services/Common/MemberService.php

@@ -78,6 +78,8 @@ class MemberService extends BaseService
                 $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
                 if ($mobile) {
                     $query->where('member.mobile', 'like', "%{$mobile}%");
+                }else{
+                    $query->where('member.mobile', '>', 0);
                 }
 
                 // 推荐人ID
@@ -149,6 +151,8 @@ class MemberService extends BaseService
                 $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
                 if ($mobile) {
                     $query->where('a.mobile', 'like', "%{$mobile}%");
+                }else{
+                    $query->where('member.mobile','>',0);
                 }
             })
             ->select(['a.*']);
@@ -330,6 +334,7 @@ class MemberService extends BaseService
             }
         })
             ->where(function ($query) use ($userId) {
+                $query->where('mobile', '>',0);
                 if ($userId) {
                     $query->whereNotIn('id', [$userId]);
                 }

app/Services/Common/StoreService.php

@@ -45,6 +45,7 @@ class StoreService extends BaseService
     {
         // 分页查询
         $list = $this->model
+            ->with(['member'])
             ->where(['type'=>2,'mark'=>1])
             ->where(function ($query) use ($params) {
 

app/Services/PaymentService.php

@@ -12,6 +12,7 @@
 namespace App\Services;
 
 use App\Models\AccountLogModel;
+use App\Models\AccountStatisticsModel;
 use App\Models\OrderModel;
 use App\Models\PaymentModel;
 use Illuminate\Support\Facades\DB;
@@ -545,6 +546,7 @@ class PaymentService extends BaseService
             switch ($scene) {
                 case 'store': //
                     $userInfo = isset($orderInfo['user'])?$orderInfo['user']:[];
+                    $orderTotal = isset($orderInfo['pay_money'])?$orderInfo['pay_money']:0;
                     $orderGoods = isset($orderInfo['orderGoods'])?$orderInfo['orderGoods']:[];
                     $balance = isset($userInfo['balance'])? $userInfo['balance'] : 0;
                     $goodsName = isset($orderGoods[0]['goods_name'])?$orderGoods[0]['goods_name']:'';
@@ -564,6 +566,25 @@ class PaymentService extends BaseService
                         Db::rollBack();
                         $this->error = '付款处理失败';
                     }
+
+                    // 统计总消费
+                    $id = AccountStatisticsModel::where(['user_id'=>$orderUserId])->orderBy('id','desc')->value('id');
+                    $updateData = [
+                        'expend'=>DB::raw("expend + {$payTotal}"),
+                        'updated_at'=>date('Y-m-d H:i:s')
+                    ];
+                    if($id && !AccountStatisticsModel::where(['id'=>$id])->update($updateData)){
+                        Db::rollBack();
+                        $this->error = '统计处理失败';
+                    }else{
+                        $updateData['expend'] = $payTotal;
+                        $updateData['user_id'] = $orderUserId;
+                        $updateData['created_at'] = date('Y-m-d H:i:s');
+                        if(!AccountStatisticsModel::insertGetId($updateData)){
+                            Db::rollBack();
+                            $this->error = '统计处理失败';
+                        }
+                    }
                     break;
                 default:
                     break;

routes/api.php

@@ -66,6 +66,7 @@ Route::prefix('v1')->middleware('web.login')->group(function() {
     Route::post('/user/modify', [\App\Http\Controllers\Api\v1\MemberController::class, 'modify']);
     Route::post('/user/auth', [\App\Http\Controllers\Api\v1\MemberController::class, 'auth']);
     Route::post('/user/teamList', [\App\Http\Controllers\Api\v1\MemberController::class, 'teamList']);
+    Route::post('/user/bill', [\App\Http\Controllers\Api\v1\MemberController::class, 'bill']);
     Route::post('/user/setting', [\App\Http\Controllers\Api\v1\MemberController::class, 'setting']);
     Route::post('/user/logOff', [\App\Http\Controllers\Api\v1\MemberController::class, 'logOff']);