谷养正道商城积分改造

src/api/his/guCoinGoods.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询谷币商品列表
+export function listGuCoinGoods(query) {
+  return request({
+    url: '/his/guCoinGoods/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询谷币商品详细
+export function getGuCoinGoods(goodsId) {
+  return request({
+    url: '/his/guCoinGoods/' + goodsId,
+    method: 'get'
+  })
+}
+
+// 新增谷币商品
+export function addGuCoinGoods(data) {
+  return request({
+    url: '/his/guCoinGoods',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改谷币商品
+export function updateGuCoinGoods(data) {
+  return request({
+    url: '/his/guCoinGoods',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除谷币商品
+export function delGuCoinGoods(goodsIds) {
+  return request({
+    url: '/his/guCoinGoods/' + goodsIds,
+    method: 'delete'
+  })
+}

src/api/his/guCoinOrder.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询谷币订单列表
+export function listGuCoinOrder(query) {
+  return request({
+    url: '/his/guCoinOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询谷币订单详细
+export function getGuCoinOrder(orderId) {
+  return request({
+    url: '/his/guCoinOrder/' + orderId,
+    method: 'get'
+  })
+}
+
+// 发货
+export function sendGuCoinGoods(data) {
+  return request({
+    url: '/his/guCoinOrder/sendGoods',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改谷币订单
+export function updateGuCoinOrder(data) {
+  return request({
+    url: '/his/guCoinOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除谷币订单
+export function delGuCoinOrder(orderIds) {
+  return request({
+    url: '/his/guCoinOrder/' + orderIds,
+    method: 'delete'
+  })
+}

src/api/his/packageOrder.js

@@ -137,6 +137,24 @@ export function exportCourseReport(query) {
   })
 }
 
+// 飞书看课统计报表
+export function feiShuCourseReport(query) {
+  return request({
+    url: '/company/statistics/feiShuCourseReport',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出飞书看课统计报表
+export function exportFeiShuCourseReport(query) {
+  return request({
+    url: '/company/statistics/exportFeiShuCourseReport',
+    method: 'get',
+    params: query
+  })
+}
+
 export function userReport(query) {
   return request({
     url: '/company/statistics/userReport',

src/api/his/user.js

@@ -134,6 +134,15 @@ export function addPoint(data) {
   })
 }
 
+// 添加谷币
+export function addGuCoin(data) {
+  return request({
+    url: '/his/userGuCoinLogs/addGuCoin',
+    method: 'post',
+    data: data
+  })
+}
+
 export function listUserByProject(query) {
   return request({
     url: '/his/user/listProject',

src/views/course/courseTrafficLog/index.vue

@@ -166,8 +166,7 @@ export default {
         pageSize: 10,
         companyId: null,
         project: null,
-        courseId: null,
-        typeFlag:0
+        courseId: null
       }
     };
   },

src/views/his/guCoinGoods/index.vue

@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商品名称" prop="goodsName">
+        <el-input
+          v-model="queryParams.goodsName"
+          placeholder="请输入商品名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品分类" prop="goodsType">
+        <el-select v-model="queryParams.goodsType" placeholder="请选择商品分类" clearable size="small">
+          <el-option
+            v-for="dict in goodsTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['his:guCoinGoods:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['his:guCoinGoods:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['his:guCoinGoods:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="guCoinGoodsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="封面图" align="center" prop="imgUrl">
+        <template slot-scope="scope">
+          <el-popover placement="right" title="" trigger="hover">
+            <img slot="reference" :src="scope.row.imgUrl" width="100">
+            <img :src="scope.row.imgUrl" style="max-width: 150px;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品名称" align="center" prop="goodsName" />
+      <el-table-column label="原价" align="center" prop="otPrice" />
+      <el-table-column label="商品分类" align="center" prop="goodsType">
+        <template slot-scope="scope">
+          <dict-tag :options="goodsTypeOptions" :value="scope.row.goodsType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所需谷币" align="center" prop="guCoin" />
+      <el-table-column label="需支付金额" align="center" prop="cash" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="库存" align="center" prop="stock" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['his:guCoinGoods:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['his:guCoinGoods:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改谷币商品对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="商品名称" prop="goodsName">
+          <el-input v-model="form.goodsName" placeholder="请输入商品名称" />
+        </el-form-item>
+        <el-form-item label="商品分类" prop="goodsType">
+          <el-select v-model="form.goodsType" placeholder="请选择商品分类">
+            <el-option
+              v-for="dict in goodsTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品图片" prop="imgUrl">
+          <Material v-model="imageArr" type="image" :num="1" :width="150" :height="150" />
+        </el-form-item>
+        <el-form-item label="轮播图" prop="images">
+          <Material v-model="photoArr" type="image" :num="10" :width="150" :height="150" />
+        </el-form-item>
+        <el-form-item label="原价" prop="otPrice">
+          <el-input-number v-model="form.otPrice" :precision="2" :step="0.1"></el-input-number>
+        </el-form-item>
+        <el-form-item label="所需谷币" prop="guCoin">
+          <el-input-number v-model="form.guCoin" :min="0" label="所需谷币"></el-input-number>
+        </el-form-item>
+        <el-form-item label="支付金额" prop="cash">
+          <el-input-number v-model="form.cash" :min="0" :precision="2" :step="0.1" label="需支付金额"></el-input-number>
+        </el-form-item>
+        <el-form-item label="商品编号" prop="barCode">
+          <el-input v-model="form.barCode" placeholder="请输入商品编号" style="width: 200px;"/>
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="form.sort" :min="0" label="排序"></el-input-number>
+        </el-form-item>
+        <el-form-item label="详情">
+          <Editor ref="myeditor" @on-text-change="updateText"/>
+        </el-form-item>
+        <el-form-item label="库存" prop="stock">
+          <el-input-number v-model="form.stock" :min="0" label="库存"></el-input-number>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="parseInt(dict.dictValue)"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGuCoinGoods, getGuCoinGoods, delGuCoinGoods, addGuCoinGoods, updateGuCoinGoods } from "@/api/his/guCoinGoods";
+import Material from '@/components/Material';
+import Editor from '@/components/Editor/wang';
+
+export default {
+  name: "GuCoinGoods",
+  components: { Material, Editor },
+  watch: {
+    imageArr: function(val) {
+      this.form.imgUrl = val.join(',')
+    },
+    photoArr: function(val) {
+      this.form.images = val.join(',')
+    }
+  },
+  data() {
+    return {
+      loading: true,
+      single: true,
+      multiple: true,
+      showSearch: true,
+      total: 0,
+      guCoinGoodsList: [],
+      title: "",
+      open: false,
+      photoArr: [],
+      imageArr: [],
+      goodsTypeOptions: [],
+      statusOptions: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        goodsName: null,
+        goodsType: null,
+        status: null
+      },
+      form: {},
+      rules: {
+        imgUrl: [
+          { required: true, message: "封面图不能为空", trigger: "blur" }
+        ],
+        goodsName: [
+          { required: true, message: "商品名称不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_integral_goods_type").then(response => {
+      this.goodsTypeOptions = response.data;
+    });
+    this.getDicts("sys_company_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listGuCoinGoods(this.queryParams).then(response => {
+        this.guCoinGoodsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    updateText(text) {
+      this.form.descs = text;
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    reset() {
+      this.form = {
+        goodsId: null,
+        imgUrl: null,
+        images: null,
+        goodsName: null,
+        otPrice: null,
+        goodsType: null,
+        status: 0,
+        guCoin: null,
+        cash: null,
+        sort: null,
+        stock: null,
+        descs: null,
+        barCode: null,
+        tempId: null
+      };
+      this.imageArr = [];
+      this.photoArr = [];
+      this.resetForm("form");
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.goodsId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加谷币商品";
+      setTimeout(() => {
+        this.$refs.myeditor.setText("");
+      }, 500);
+    },
+    handleUpdate(row) {
+      this.reset();
+      const goodsId = row.goodsId || this.ids;
+      getGuCoinGoods(goodsId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改谷币商品";
+        if (this.form.imgUrl != null) {
+          this.imageArr = this.form.imgUrl.split(",");
+        }
+        if (this.form.images != null) {
+          this.photoArr = this.form.images.split(",");
+        }
+        setTimeout(() => {
+          if (this.form.descs == null) {
+            this.$refs.myeditor.setText("");
+          } else {
+            this.$refs.myeditor.setText(this.form.descs);
+          }
+        }, 1);
+      });
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.goodsId != null) {
+            updateGuCoinGoods(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGuCoinGoods(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    handleDelete(row) {
+      const goodsIds = row.goodsId || this.ids;
+      this.$confirm('是否确认删除谷币商品编号为"' + goodsIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delGuCoinGoods(goodsIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/his/guCoinOrder/index.vue

@@ -0,0 +1,360 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="订单编号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入订单编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员电话" prop="userPhone">
+        <el-input
+          v-model="queryParams.userPhone"
+          placeholder="请输入会员电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable size="small">
+          <el-option label="待支付" :value="4" />
+          <el-option label="待发货" :value="1" />
+          <el-option label="待收货" :value="2" />
+          <el-option label="已完成" :value="3" />
+          <el-option label="取消" :value="5" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付状态" prop="isPay">
+        <el-select v-model="queryParams.isPay" placeholder="请选择支付状态" clearable size="small">
+          <el-option label="未支付" :value="0" />
+          <el-option label="已支付" :value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['his:guCoinOrder:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" border :data="guCoinOrderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="orderCode" width="180" />
+      <el-table-column label="会员名称" align="center" prop="userName" />
+      <el-table-column label="会员电话" align="center" prop="userPhone" width="130" />
+      <el-table-column label="支付谷币" align="center" prop="guCoin" />
+      <el-table-column label="支付金额" align="center" prop="payMoney" />
+      <el-table-column label="支付状态" align="center" prop="isPay" width="90">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isPay === 1 ? 'success' : 'info'">
+            {{ scope.row.isPay === 1 ? '已支付' : '未支付' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付类型" align="center" prop="payType" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.payType === 1">谷币</span>
+          <span v-else-if="scope.row.payType === 2">现金</span>
+          <span v-else-if="scope.row.payType === 3">谷币+现金</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="status" width="90">
+        <template slot-scope="scope">
+          <el-tag :type="statusTagType(scope.row.status)">
+            {{ statusText(scope.row.status) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="快递公司" align="center" prop="deliveryName" />
+      <el-table-column label="快递单号" align="center" prop="deliverySn" width="150" />
+      <el-table-column label="下单时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
+            v-hasPermi="['his:guCoinOrder:query']"
+          >详情</el-button>
+          <el-button
+            v-if="scope.row.status === 1"
+            size="mini"
+            type="text"
+            icon="el-icon-s-promotion"
+            @click="handleSendGoods(scope.row)"
+            v-hasPermi="['his:guCoinOrder:sendGoods']"
+          >发货</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['his:guCoinOrder:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 订单详情对话框 -->
+    <el-dialog title="订单详情" :visible.sync="detailOpen" width="900px" append-to-body>
+      <div v-if="detailData">
+        <el-descriptions :column="3" border size="medium">
+          <el-descriptions-item label="订单编号">{{ detailData.orderCode }}</el-descriptions-item>
+          <el-descriptions-item label="订单状态">
+            <el-tag :type="statusTagType(detailData.status)" size="mini">{{ statusText(detailData.status) }}</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="支付状态">
+            <el-tag :type="detailData.isPay === 1 ? 'success' : 'info'" size="mini">{{ detailData.isPay === 1 ? '已支付' : '未支付' }}</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="会员名称">{{ detailData.userName }}</el-descriptions-item>
+          <el-descriptions-item label="会员电话">{{ detailData.userPhone }}</el-descriptions-item>
+          <el-descriptions-item label="支付类型">{{ payTypeText(detailData.payType) }}</el-descriptions-item>
+          <el-descriptions-item label="收货地址" :span="3">{{ detailData.userAddress }}</el-descriptions-item>
+          <el-descriptions-item label="总谷币">{{ detailData.totalGuCoin }}</el-descriptions-item>
+          <el-descriptions-item label="折扣谷币">{{ detailData.discountGuCoin }}</el-descriptions-item>
+          <el-descriptions-item label="实付谷币">{{ detailData.guCoin }}</el-descriptions-item>
+          <el-descriptions-item label="总金额">{{ detailData.totalMoney }}</el-descriptions-item>
+          <el-descriptions-item label="折扣金额">{{ detailData.discountMoney }}</el-descriptions-item>
+          <el-descriptions-item label="实付金额">{{ detailData.payMoney }}</el-descriptions-item>
+          <el-descriptions-item label="运费">{{ detailData.deliveryMoney }}</el-descriptions-item>
+          <el-descriptions-item label="支付时间">{{ detailData.payTime }}</el-descriptions-item>
+          <el-descriptions-item label="下单时间">{{ detailData.createTime }}</el-descriptions-item>
+          <el-descriptions-item label="快递公司">{{ detailData.deliveryName }}</el-descriptions-item>
+          <el-descriptions-item label="快递单号">{{ detailData.deliverySn }}</el-descriptions-item>
+          <el-descriptions-item label="发货时间">{{ detailData.deliveryTime }}</el-descriptions-item>
+          <el-descriptions-item label="备注" :span="3">{{ detailData.remark }}</el-descriptions-item>
+        </el-descriptions>
+
+        <div style="margin-top: 20px;">
+          <div style="font-weight: bold; margin-bottom: 10px; font-size: 15px; color: #303133;">商品明细</div>
+          <el-table border :data="itemList" size="small" show-summary :summary-method="getSummaries">
+            <el-table-column label="商品图片" align="center" width="90">
+              <template slot-scope="scope">
+                <el-popover v-if="scope.row.imgUrl" placement="right" title="" trigger="hover">
+                  <img slot="reference" :src="scope.row.imgUrl" width="50">
+                  <img :src="scope.row.imgUrl" style="max-width: 200px">
+                </el-popover>
+                <span v-else>-</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品名称" align="center" prop="goodsName" show-overflow-tooltip />
+            <el-table-column label="所需谷币" align="center" prop="guCoin" />
+            <el-table-column label="需支付金额" align="center" prop="cash">
+              <template slot-scope="scope">
+                <span v-if="scope.row.cash != null">{{ Number(scope.row.cash).toFixed(2) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" prop="num" width="70" />
+            <el-table-column label="谷币小计" align="center">
+              <template slot-scope="scope">
+                {{ (Number(scope.row.guCoin) || 0) * (Number(scope.row.num) || 1) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="金额小计" align="center">
+              <template slot-scope="scope">
+                {{ ((Number(scope.row.cash) || 0) * (Number(scope.row.num) || 1)).toFixed(2) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detailOpen = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 发货对话框 -->
+    <el-dialog title="订单发货" :visible.sync="sendOpen" width="500px" append-to-body>
+      <el-form ref="sendForm" :model="sendForm" :rules="sendRules" label-width="100px">
+        <el-form-item label="订单编号">
+          <span>{{ sendForm.orderCode }}</span>
+        </el-form-item>
+        <el-form-item label="快递公司" prop="deliveryName">
+          <el-input v-model="sendForm.deliveryName" placeholder="请输入快递公司" />
+        </el-form-item>
+        <el-form-item label="快递单号" prop="deliverySn">
+          <el-input v-model="sendForm.deliverySn" placeholder="请输入快递单号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSendGoods">确 定</el-button>
+        <el-button @click="sendOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGuCoinOrder, getGuCoinOrder, delGuCoinOrder, sendGuCoinGoods } from "@/api/his/guCoinOrder";
+
+export default {
+  name: "GuCoinOrder",
+  data() {
+    return {
+      loading: true,
+      single: true,
+      multiple: true,
+      showSearch: true,
+      total: 0,
+      guCoinOrderList: [],
+      detailOpen: false,
+      detailData: null,
+      itemList: [],
+      sendOpen: false,
+      sendForm: {
+        orderId: null,
+        orderCode: null,
+        deliveryName: null,
+        deliverySn: null
+      },
+      sendRules: {
+        deliveryName: [
+          { required: true, message: "请输入快递公司", trigger: "blur" }
+        ],
+        deliverySn: [
+          { required: true, message: "请输入快递单号", trigger: "blur" }
+        ]
+      },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderCode: null,
+        userPhone: null,
+        status: null,
+        isPay: null
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listGuCoinOrder(this.queryParams).then(response => {
+        this.guCoinOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    statusText(status) {
+      const map = { 4: '待支付', 1: '待发货', 2: '待收货', 3: '已完成', '5': '取消' };
+      return map[status] || '未知';
+    },
+    statusTagType(status) {
+      const map = { 4: 'warning', 1: 'danger', 2: '', 3: 'success', '5': 'info' };
+      return map[status] || 'info';
+    },
+    payTypeText(payType) {
+      const map = { 1: '谷币', 2: '现金', 3: '谷币+现金' };
+      return map[payType] || '-';
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    handleDetail(row) {
+      getGuCoinOrder(row.orderId).then(response => {
+        this.detailData = response.data;
+        this.itemList = [];
+        if (this.detailData && this.detailData.itemJson) {
+          try {
+            this.itemList = JSON.parse(this.detailData.itemJson) || [];
+          } catch (e) {
+            this.itemList = [];
+          }
+        }
+        this.detailOpen = true;
+      });
+    },
+    /** 商品明细合计行 */
+    getSummaries({ columns, data }) {
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        if (column.label === '谷币小计') {
+          sums[index] = data.reduce((sum, item) => sum + (Number(item.guCoin) || 0) * (Number(item.num) || 1), 0);
+        } else if (column.label === '金额小计') {
+          const total = data.reduce((sum, item) => sum + (Number(item.cash) || 0) * (Number(item.num) || 1), 0);
+          sums[index] = total.toFixed(2);
+        } else {
+          sums[index] = '';
+        }
+      });
+      return sums;
+    },
+    handleSendGoods(row) {
+      this.sendForm = {
+        orderId: row.orderId,
+        orderCode: row.orderCode,
+        deliveryName: row.deliveryName,
+        deliverySn: row.deliverySn
+      };
+      this.sendOpen = true;
+    },
+    submitSendGoods() {
+      this.$refs["sendForm"].validate(valid => {
+        if (valid) {
+          sendGuCoinGoods(this.sendForm).then(response => {
+            this.msgSuccess("发货成功");
+            this.sendOpen = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    handleDelete(row) {
+      const orderIds = row.orderId || this.ids;
+      this.$confirm('是否确认删除谷币订单编号为"' + orderIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delGuCoinOrder(orderIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/his/statistics/feishuCourseReport.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="公司名" prop="companyId">
+        <el-select filterable v-model="queryParams.companyId" placeholder="请选择公司名"
+                   clearable size="small">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="看课时间" prop="createTime">
+        <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                        @change="xdChange"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table height="500" v-loading="loading" border :data="reportList">
+      <el-table-column label="销售公司" align="center" prop="companyName" width="120px"/>
+      <el-table-column label="进线数" align="center" prop="accessCount"/>
+      <el-table-column label="待看课数" align="center" prop="pendingCount"/>
+      <el-table-column label="看课中数" align="center" prop="watchingCount"/>
+      <el-table-column label="看课率" align="center" prop="watchRate"/>
+      <el-table-column label="完课数" align="center" prop="finishedCount"/>
+      <el-table-column label="看课中断" align="center" prop="interruptedCount"/>
+      <el-table-column label="完课率" align="center" prop="finishRate"/>
+    </el-table>
+    <div class="total-summary">
+      <span class="total-title">总计：</span>
+      <span class="total-item">进线数: {{ calculatedTotalData.accessCount }}</span>
+      <span class="total-item">待看课数: {{ calculatedTotalData.pendingCount }}</span>
+      <span class="total-item">看课中数: {{ calculatedTotalData.watchingCount }}</span>
+      <span class="total-item">看课率: {{ calculatedTotalData.watchRate }}</span>
+      <span class="total-item">完课数: {{ calculatedTotalData.finishedCount }}</span>
+      <span class="total-item">看课中断: {{ calculatedTotalData.interruptedCount }}</span>
+      <span class="total-item">完课率: {{ calculatedTotalData.finishRate }}</span>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { feiShuCourseReport, exportFeiShuCourseReport } from "@/api/his/packageOrder";
+import { getCompanyList } from "@/api/company/company";
+
+export default {
+  name: "FeiShuCourseReport",
+  data() {
+    return {
+      // 总计数据
+      calculatedTotalData: {
+        accessCount: 0,
+        pendingCount: 0,
+        watchingCount: 0,
+        watchRate: '0%',
+        finishedCount: 0,
+        interruptedCount: 0,
+        finishRate: '0%'
+      },
+      companys: [],
+      loading: true,
+      exportLoading: false,
+      showSearch: true,
+      createTime: null,
+      total: 0,
+      reportList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        companyId: null,
+        sTime: null,
+        eTime: null,
+        dimension: 'company'
+      }
+    };
+  },
+  created() {
+    // 设置默认时间为前一天
+    const yesterday = new Date();
+    yesterday.setDate(yesterday.getDate() - 1);
+    const formatDate = (date) => {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    };
+    this.createTime = [formatDate(yesterday), formatDate(yesterday)];
+    this.queryParams.sTime = this.createTime[0];
+    this.queryParams.eTime = this.createTime[1];
+    getCompanyList().then(response => {
+      this.companys = response.data;
+      this.companys.push({ companyId: "-1", companyName: "无" });
+    });
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      feiShuCourseReport(this.queryParams).then(response => {
+        this.reportList = response.rows;
+        this.total = response.total;
+        this.calculateTotals();
+        this.loading = false;
+        this.$forceUpdate();
+      });
+    },
+    calculateTotals() {
+      this.calculatedTotalData = {
+        accessCount: 0,
+        pendingCount: 0,
+        watchingCount: 0,
+        watchRate: 0,
+        finishedCount: 0,
+        interruptedCount: 0,
+        finishRate: 0
+      };
+      this.reportList.forEach(item => {
+        this.calculatedTotalData.accessCount += Number(item.accessCount) || 0;
+        this.calculatedTotalData.pendingCount += Number(item.pendingCount) || 0;
+        this.calculatedTotalData.watchingCount += Number(item.watchingCount) || 0;
+        this.calculatedTotalData.finishedCount += Number(item.finishedCount) || 0;
+        this.calculatedTotalData.interruptedCount += Number(item.interruptedCount) || 0;
+      });
+      if (this.calculatedTotalData.accessCount > 0) {
+        const totalWatching = this.calculatedTotalData.watchingCount + this.calculatedTotalData.finishedCount;
+        this.calculatedTotalData.watchRate = (totalWatching / this.calculatedTotalData.accessCount * 100).toFixed(2) + '%';
+        this.calculatedTotalData.finishRate = (this.calculatedTotalData.finishedCount / this.calculatedTotalData.accessCount * 100).toFixed(2) + '%';
+      } else {
+        this.calculatedTotalData.watchRate = '0.00%';
+        this.calculatedTotalData.finishRate = '0.00%';
+      }
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.createTime = null;
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        companyId: null,
+        sTime: null,
+        eTime: null,
+        dimension: 'company'
+      };
+      this.getList();
+    },
+    xdChange() {
+      if (this.createTime != null) {
+        this.queryParams.sTime = this.createTime[0];
+        this.queryParams.eTime = this.createTime[1];
+      } else {
+        this.queryParams.sTime = null;
+        this.queryParams.eTime = null;
+      }
+    },
+    handleExport() {
+      this.$confirm('是否确认导出飞书看课统计报表', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportFeiShuCourseReport(this.queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style scoped>
+.total-summary {
+  margin-top: 15px;
+  padding: 15px 20px;
+  background: linear-gradient(135deg, #f5f7fa 0%, #e4e7f4 100%);
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.total-title {
+  font-weight: bold;
+  font-size: 16px;
+  color: #303133;
+  margin-right: 20px;
+  flex-shrink: 0;
+}
+
+.total-item {
+  margin-right: 25px;
+  padding: 5px 10px;
+  background: white;
+  border-radius: 3px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08);
+  display: inline-block;
+  margin-bottom: 5px;
+  font-size: 13px;
+  color: #606266;
+}
+
+.total-item::before {
+  content: "";
+  display: inline-block;
+  width: 3px;
+  height: 3px;
+  background: #409eff;
+  border-radius: 50%;
+  margin-right: 5px;
+  vertical-align: middle;
+}
+
+@media (max-width: 768px) {
+  .total-summary {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  .total-title {
+    margin-bottom: 10px;
+  }
+  .total-item {
+    margin-right: 10px;
+    margin-bottom: 8px;
+  }
+}
+</style>

src/views/his/user/index.vue

@@ -139,6 +139,7 @@
       </el-table-column>
       <el-table-column label="手机号码" align="center" prop="phone" width="150px" />
       <el-table-column label="用户积分" align="center" prop="integral" />
+      <el-table-column label="谷币" align="center" prop="guCoin" />
       <el-table-column label="可提现佣金" align="center" prop="mayWithdraw" />
       <el-table-column label="用户状态" align="center" prop="status" >
          <template slot-scope="scope">
@@ -168,7 +169,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="230px">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -195,6 +196,12 @@
             @click="handleAddPoint(scope.row)"
             v-hasPermi="['his:user:addPoint']"
           >添加积分</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleAddGuCoin(scope.row)"
+            v-hasPermi="['his:userGuCoinLogs:add']"
+          >添加谷币</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -307,6 +314,24 @@
         <el-button @click="cancelAddPoint">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="addGuCoinDialog.title" :visible.sync="addGuCoinDialog.open" width="500px" append-to-body>
+      <el-form ref="addGuCoinForm" :model="addGuCoinDialog.form" :rules="addGuCoinDialog.rules" label-width="100px">
+        <el-form-item label="谷币数量" prop="guCoin">
+          <el-input-number :min="1" :step="1" :precision="0" v-model="addGuCoinDialog.form.guCoin" placeholder="请输入谷币数量" />
+        </el-form-item>
+        <el-form-item label="消费金额" prop="consumeAmount">
+          <el-input-number :min="0" :precision="2" :step="0.01" v-model="addGuCoinDialog.form.consumeAmount" placeholder="请输入消费金额（选填）" />
+        </el-form-item>
+        <el-form-item label="发放备注" prop="remark">
+          <el-input type="textarea" v-model="addGuCoinDialog.form.remark" placeholder="请输入发放备注说明" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitAddGuCoinForm">确 定</el-button>
+        <el-button @click="cancelAddGuCoin">取 消</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="选择项目" :visible.sync="projectSelectDialogVisible" width="400px">
       <el-form :model="exportParams" style="margin-top: 15px;">
         <el-form-item label="选择项目" :label-width="100">
@@ -330,7 +355,7 @@
 
 <script>
 import axios from 'axios'
-import { listUser, getUser, delUser, addUser, updateUser, exportUser, addPoint,exportOpenId } from "@/api/his/user";
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, addPoint, addGuCoin, exportOpenId } from "@/api/his/user";
 import { getToken } from '@/utils/auth';
 import { getCompanyUserList, changeCompanyUser, getCompanyList } from '@/api/company/companyUser';
 import userDetails from '../../components/his/userDetails.vue';
@@ -441,7 +466,7 @@ export default {
             { required: true, message: "请输入积分", trigger: "blur" },
             { validator: (rule, value, callback) => {
                 if (Number(value) > 0) {
-                  callback(); // 验证通过
+                  callback();
                 } else {
                   callback(new Error("积分必须大于0"));
                 }
@@ -449,6 +474,29 @@ export default {
               trigger: "blur" }
           ]
         }
+      },
+      addGuCoinDialog: {
+        open: false,
+        title: "添加谷币",
+        form: {
+          userId: null,
+          guCoin: 1,
+          consumeAmount: null,
+          remark: ''
+        },
+        rules: {
+          guCoin: [
+            { required: true, message: "请输入谷币数量", trigger: "blur" },
+            { validator: (rule, value, callback) => {
+                if (Number(value) > 0) {
+                  callback();
+                } else {
+                  callback(new Error("谷币数量必须大于0"));
+                }
+              },
+              trigger: "blur" }
+          ]
+        }
       }
     };
   },
@@ -637,6 +685,35 @@ export default {
     cancelAddPoint() {
       this.addPointDialog.open = false;
     },
+    handleAddGuCoin(row) {
+      this.resetForm("addGuCoinForm");
+      this.addGuCoinDialog.form = {
+        userId: row.userId,
+        guCoin: 1,
+        consumeAmount: null,
+        remark: ''
+      };
+      this.addGuCoinDialog.open = true;
+    },
+    submitAddGuCoinForm() {
+      this.$refs["addGuCoinForm"].validate(valid => {
+        if (valid) {
+          addGuCoin(this.addGuCoinDialog.form).then(response => {
+            const { code } = response;
+            if (code !== 200) {
+              this.msgError(response.msg || '添加失败');
+              return;
+            }
+            this.msgSuccess("添加谷币成功");
+            this.addGuCoinDialog.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    cancelAddGuCoin() {
+      this.addGuCoinDialog.open = false;
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

src/views/index.vue

@@ -106,7 +106,7 @@
             <div class="property-card propertyline">
               <div class="property-title">
                 <i class="el-icon-money"></i>
-                润天余额（元）
+                余额（元）
               </div>
               <div class="card-value highlight">
                 <count-to :start-val="0" :end-val="runTianBalance" :duration="3600" class="card-panel-num" />
@@ -1179,7 +1179,7 @@ export default {
     /**
      * 计算余额预计可持续的天数
      * @param {number} balance - 当前账户余额
-     * @param {number} runTianBalance - 润天账户余额
+     * @param {number} runTianBalance - 账户余额
      * @param {number} todayConsumption - 今日消耗金额
      * @param {number} yesterdayConsumption - 昨日消耗金额
      * @return {Object} 包含天数和进度百分比的对象