fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化提交

Browse Source
This commit is contained in:
wong
2025-04-17 17:18:35 +08:00
parent 4f838149e9
commit 9c33603c04
19 changed files with 1657 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Cunkebao/app/workspace/auto-like/components/device-selection-dialog.tsx
View File

@@ -60,11 +60,12 @@ export function DeviceSelectionDialog({ open, onOpenChange, selectedDevices, onS
if (response.code === 200 && response.data.list) {
const transformedDevices: Device[] = response.data.list.map(device => ({
id: device.id,
name: device.memo || device.imei || '',
name: device.memo || '设备_' + device.id,
imei: device.imei || '',
wxid: device.wechatId || '',
wxid: device.alias || device.wechatId || '',
status: device.alive === 1 ? "online" : "offline",
totalFriend: device.totalFriend || 0
totalFriend: device.totalFriend || 0,
nickname: device.nickname || ''
}))
setDevices(transformedDevices)
} else {
@@ -175,7 +176,7 @@ export function DeviceSelectionDialog({ open, onOpenChange, selectedDevices, onS
</div>
<div className="text-sm text-gray-500 mt-1">
<div>IMEI: {device.imei || '--'}</div>
<div>微信号: {device.wxid || '--'}</div>
<div>微信号: {device.wxid || '--'}（{device.nickname || ''}）</div>
</div>
</div>
</label>

234
Cunkebao/app/workspace/moments-sync/components/device-selection-dialog.tsx
View File

@@ -1,51 +1,58 @@
"use client"
import { useState, useEffect } from "react"
import { Search, RefreshCw, Loader2 } from "lucide-react"
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog"
import { Input } from "@/components/ui/input"
import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area"
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
import { Checkbox } from "@/components/ui/checkbox"
import { Label } from "@/components/ui/label"
import { Badge } from "@/components/ui/badge"
import { Search, RefreshCw, Loader2 } from "lucide-react"
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
import { ScrollArea } from "@/components/ui/scroll-area"
import { Checkbox } from "@/components/ui/checkbox"
import { api } from "@/lib/api"
import { showToast } from "@/lib/toast"
interface ServerDevice {
id: number
imei: string
memo: string
wechatId: string
alive: number
totalFriend: number
}
interface Device {
id: string
id: number
name: string
imei: string
wechatId: string
memo?: string
alive: number
usedInPlans: number
lastActiveTime: string
wxid: string
status: "online" | "offline"
totalFriend: number
}
interface DeviceSelectionDialogProps {
open: boolean
onOpenChange: (open: boolean) => void
selectedDevices: string[]
onSelect: (devices: string[]) => void
selectedDevices: number[]
onSelect: (devices: number[]) => void
}
export function DeviceSelectionDialog({
open,
onOpenChange,
selectedDevices,
onSelect,
}: DeviceSelectionDialogProps) {
export function DeviceSelectionDialog({ open, onOpenChange, selectedDevices, onSelect }: DeviceSelectionDialogProps) {
const [searchQuery, setSearchQuery] = useState("")
const [statusFilter, setStatusFilter] = useState("all")
const [loading, setLoading] = useState(false)
const [devices, setDevices] = useState<Device[]>([])
const [tempSelected, setTempSelected] = useState<string[]>([])
const [loading, setLoading] = useState(false)
const [tempSelectedDevices, setTempSelectedDevices] = useState<number[]>(selectedDevices)
useEffect(() => {
if (open) {
setTempSelectedDevices(selectedDevices)
fetchDevices()
}
}, [open, selectedDevices])
// 获取设备列表
const fetchDevices = async () => {
setLoading(true)
const loadingToast = showToast("正在加载设备列表...", "loading", true);
try {
setLoading(true)
const response = await api.get<{code: number, msg: string, data: {list: ServerDevice[], total: number}}>('/v1/devices?page=1&limit=100')
@@ -53,86 +60,78 @@ export function DeviceSelectionDialog({
if (response.code === 200 && response.data.list) {
const transformedDevices: Device[] = response.data.list.map(device => ({
id: device.id,
name: device.memo || "未命名设备",
name: device.memo || '设备_' + device.id,
imei: device.imei || '',
wxid: device.wechatId || '',
wxid: device.alias || device.wechatId || '',
status: device.alive === 1 ? "online" : "offline",
totalFriend: device.totalFriend || 0
totalFriend: device.totalFriend || 0,
nickname: device.nickname || ''
}))
setDevices(transformedDevices)
} else {
showToast(response.msg || "获取设备列表失败", "error")
}
} catch (error: any) {
console.error("获取设备列表失败:", error)
console.error('获取设备列表失败:', error)
showToast(error?.message || "请检查网络连接", "error")
} finally {
loadingToast.remove();
setLoading(false)
}
}
useEffect(() => {
if (open) {
fetchDevices()
setTempSelected(selectedDevices)
}
}, [open, searchQuery, selectedDevices])
const handleRefresh = () => {
fetchDevices()
}
const filteredDevices = devices.filter(device => {
const matchesSearch = !searchQuery ||
device.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
device.imei.toLowerCase().includes(searchQuery.toLowerCase()) ||
device.wechatId.toLowerCase().includes(searchQuery.toLowerCase())
const matchesStatus = statusFilter === "all" ||
(statusFilter === "online" && device.alive === 1) ||
(statusFilter === "offline" && device.alive === 0)
const handleDeviceToggle = (deviceId: number, checked: boolean) => {
if (checked) {
setTempSelectedDevices(prev => [...prev, deviceId])
} else {
setTempSelectedDevices(prev => prev.filter(id => id !== deviceId))
}
}
const handleConfirm = () => {
onSelect(tempSelectedDevices)
onOpenChange(false)
}
const handleCancel = () => {
setTempSelectedDevices(selectedDevices)
onOpenChange(false)
}
const filteredDevices = devices.filter((device) => {
const searchLower = searchQuery.toLowerCase()
const matchesSearch =
(device.name || '').toLowerCase().includes(searchLower) ||
(device.imei || '').toLowerCase().includes(searchLower) ||
(device.wxid || '').toLowerCase().includes(searchLower)
const matchesStatus =
statusFilter === "all" ||
(statusFilter === "online" && device.status === "online") ||
(statusFilter === "offline" && device.status === "offline")
return matchesSearch && matchesStatus
})
const handleDialogOpenChange = (open: boolean) => {
if (!open) {
setTempSelected(selectedDevices)
}
onOpenChange(open)
}
const handleSelectAll = () => {
if (tempSelected.length === filteredDevices.length) {
setTempSelected([])
} else {
setTempSelected(filteredDevices.map(device => device.id))
}
}
const handleDeviceToggle = (deviceId: string) => {
setTempSelected(prev =>
prev.includes(deviceId)
? prev.filter(id => id !== deviceId)
: [...prev, deviceId]
)
}
return (
<Dialog open={open} onOpenChange={handleDialogOpenChange}>
<DialogContent className="max-w-2xl">
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
<DialogHeader>
<DialogTitle>选择设备</DialogTitle>
</DialogHeader>
<div className="flex items-center space-x-2 my-4">
<div className="flex items-center space-x-4 my-4">
<div className="relative flex-1">
<Search className="absolute left-3 top-2.5 h-4 w-4 text-gray-400" />
<Input
placeholder="搜索设备IMEI/备注/微信号"
className="pl-9"
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
className="pl-9"
/>
</div>
<Select value={statusFilter} onValueChange={setStatusFilter}>
@@ -150,75 +149,44 @@ export function DeviceSelectionDialog({
</Button>
</div>
<div className="flex justify-between items-center mb-2">
<div className="text-sm text-gray-500">
已选择 {tempSelected.length} 个设备
</div>
<div className="flex gap-2">
<Button
variant="outline"
size="sm"
onClick={handleSelectAll}
disabled={loading || filteredDevices.length === 0}
>
{tempSelected.length === filteredDevices.length ? "取消全选" : "全选"}
</Button>
</div>
</div>
<ScrollArea className="h-[400px] -mx-6 px-6">
<div className="space-y-2">
{loading ? (
<div className="flex items-center justify-center h-full text-gray-500">
加载中...
</div>
) : filteredDevices.length === 0 ? (
<div className="flex items-center justify-center h-full text-gray-500">
暂无数据
</div>
) : (
filteredDevices.map((device) => (
<Label
<ScrollArea className="flex-1 -mx-6 px-6" style={{overflowY: 'auto'}}>
{loading ? (
<div className="flex justify-center items-center py-8">
<Loader2 className="h-8 w-8 animate-spin text-blue-500" />
</div>
) : (
<div className="space-y-2">
{filteredDevices.map((device) => (
<label
key={device.id}
className="flex items-center justify-between p-4 rounded-lg border hover:bg-gray-50 cursor-pointer"
htmlFor={device.id}
className="flex items-center space-x-3 p-4 rounded-lg hover:bg-gray-50 cursor-pointer"
style={{paddingLeft: '0px',paddingRight: '0px'}}
>
<div className="flex items-center space-x-3 flex-1 min-w-0">
<Checkbox
id={device.id}
checked={tempSelected.includes(device.id)}
onCheckedChange={() => handleDeviceToggle(device.id)}
/>
<div className="min-w-0 flex-1">
<div className="font-medium truncate mb-1">{device.memo || device.imei}</div>
<div className="text-sm text-gray-500 truncate mb-1">IMEI: {device.imei}</div>
<div className="text-sm text-gray-500 truncate">{device.wechatId ? `微信号: ${device.wechatId}` : ''}</div>
{device.usedInPlans > 0 && (
<div className="text-sm text-orange-500 mt-1">
已用于 {device.usedInPlans} 个计划
</div>
)}
<Checkbox
checked={tempSelectedDevices.includes(device.id)}
onCheckedChange={(checked) => handleDeviceToggle(device.id, checked as boolean)}
className="h-5 w-5"
/>
<div className="flex-1">
<div className="flex items-center justify-between">
<span className="font-medium">{device.name}</span>
<Badge variant={device.status === "online" ? "default" : "secondary"}>
{device.status === "online" ? "在线" : "离线"}
</Badge>
</div>
<div className="text-sm text-gray-500 mt-1">
<div>IMEI: {device.imei || '--'}</div>
<div>微信号: {device.wxid || '--'}（{device.nickname || ''}）</div>
</div>
</div>
<Badge variant={device.alive === 1 ? "default" : "secondary"}>
{device.alive === 1 ? "在线" : "离线"}
</Badge>
</Label>
))
)}
</div>
</label>
))}
</div>
)}
</ScrollArea>
<DialogFooter className="mt-4">
{/* <Button variant="outline" onClick={() => handleDialogOpenChange(false)}>
取消
</Button> */}
<Button onClick={() => {
onSelect(tempSelected)
onOpenChange(false)
}}>
确定{tempSelected.length > 0 ? ` (${tempSelected.length})` : ''}
</Button>
<DialogFooter className="mt-4 flex gap-4 -mx-6 px-6">
<Button className="flex-1" onClick={handleConfirm}>确认</Button>
</DialogFooter>
</DialogContent>
</Dialog>

6
Server/application/api/controller/WebSocketController.php
View File

@@ -418,7 +418,7 @@ class WebSocketController extends BaseController
$momentEntity = $moment['momentEntity'] ?? [];
// 检查朋友圈数据是否已存在
$exists = Db::name('wechat_moments')
$exists = Db::table('s2_wechat_moments')
->where('snsId', $moment['snsId'])
->where('wechatAccountId', $wechatAccountId)
->find();
@@ -441,13 +441,13 @@ class WebSocketController extends BaseController
if ($exists) {
// 如果已存在，则更新数据
Db::name('wechat_moments')->where('id', $exists['id'])->update($dataToSave);
Db::table('s2_wechat_moments')->where('id', $exists['id'])->update($dataToSave);
} else {
// 如果不存在，则插入新数据
$dataToSave['wechatAccountId'] = $wechatAccountId;
$dataToSave['wechatFriendId'] = $wechatFriendId;
$dataToSave['create_time'] = time();
Db::name('wechat_moments')->insert($dataToSave);
Db::table('s2_wechat_moments')->insert($dataToSave);
}
}

5
Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
View File

@@ -70,9 +70,10 @@ class GetDeviceListV1Controller extends BaseController
protected function getDeviceList(array $where, int $page = 1, int $limit = 10): \think\Paginator
{
$query = DeviceModel::alias('d')
->field(['d.id', 'd.imei', 'd.memo', 'l.wechatId', 'd.alive', '0 totalFriend'])
->field(['d.id', 'd.imei', 'd.memo', 'l.wechatId', 'd.alive','wa.nickname','wa.alias', '0 totalFriend'])
->leftJoin('device_wechat_login l', 'd.id = l.deviceId')
->order('d.alive desc');
->leftJoin('wechat_account wa', 'l.wechatId = wa.wechatId')
->order('d.id desc');
foreach ($where as $key => $value) {
if (is_numeric($key) && is_array($value) && isset($value[0]) && $value[0] === 'exp') {

7
Server/application/store/config/route.php
View File

@@ -38,4 +38,11 @@ Route::group('v1/store', function () {
Route::get('customer-analysis', 'app\\store\\controller\\StatisticsController@getCustomerAnalysis'); // 获取客户分析数据
Route::get('interaction-analysis', 'app\\store\\controller\\StatisticsController@getInteractionAnalysis'); // 获取互动分析数据
});
// 供应商相关路由
Route::group('vendor', function () {
Route::get('list', 'app\\store\\controller\\VendorController@getList'); // 获取供应商列表
Route::get('detail', 'app\\store\\controller\\VendorController@detail'); // 获取供应商详情
Route::post('order', 'app\\store\\controller\\VendorController@createOrder'); // 创建订单
});
})->middleware(['jwt']);

97
Server/application/store/controller/StatisticsController.php
View File

@@ -19,7 +19,8 @@ class StatisticsController extends BaseController
try {
$companyId = $this->userInfo['companyId'];
$wechatAccountId = $this->device['wechatAccountId'];
$ownerWechatId = $this->device['wechatId'];
// 获取时间范围
$timeRange = $this->getTimeRange();
$startTime = $timeRange['start_time'];
@@ -27,40 +28,44 @@ class StatisticsController extends BaseController
$lastStartTime = $timeRange['last_start_time'];
$lastEndTime = $timeRange['last_end_time'];
// 1. 总客户数
$totalCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
$totalCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->whereTime('createTime', '>=', $startTime)
->whereTime('createTime', '<', $endTime)
->count();
// 上期总客户数
$lastTotalCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
$lastTotalCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->whereTime('createTime', '>=', $lastStartTime)
->whereTime('createTime', '<', $lastEndTime)
->count();
// 2. 新增客户数
$newCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
$newCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->whereTime('createTime', '>=', $startTime)
->whereTime('createTime', '<', $endTime)
->count();
// 上期新增客户数
$lastNewCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
$lastNewCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->whereTime('createTime', '>=', $lastStartTime)
->whereTime('createTime', '<', $lastEndTime)
->count();
//3. 互动次数
$interactionCount = WechatMessageModel::where(['wechatAccountId'=> $wechatAccountId])
->where('createTime', '>=', strtotime($startTime))
->where('createTime', '<', strtotime($endTime))
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->count();
// 上期互动次数
$lastInteractionCount = WechatMessageModel::where(['wechatAccountId'=> $wechatAccountId])
->where('createTime', '>=', strtotime($lastStartTime))
->where('createTime', '<', strtotime($lastEndTime))
->where('createTime', '>=', $lastStartTime)
->where('createTime', '<', $lastEndTime)
->count();
@@ -99,6 +104,11 @@ class StatisticsController extends BaseController
try {
$companyId = $this->userInfo['companyId'];
$wechatAccountId = $this->device['wechatAccountId'];
$ownerWechatId = $this->device['wechatId'];
// 获取时间范围
$timeRange = $this->getTimeRange();
@@ -106,34 +116,36 @@ class StatisticsController extends BaseController
$endTime = $timeRange['end_time'];
// 1. 客户增长趋势数据
$totalCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
$totalCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->whereTime('createTime', '<', $endTime)
->count();
$newCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
$newCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->whereTime('createTime', '>=', $startTime)
->whereTime('createTime', '<', $endTime)
->count();
// 计算流失客户数（假设超过30天未互动的客户为流失客户）
$lostCustomers = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])->where('createTime','>',0)
->whereTime('deleteTime', '<', date('Y-m-d', strtotime('-30 days')))
$thirtyDaysAgo = strtotime('-30 days');
$lostCustomers = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
->where('createTime', '>', 0)
->where('deleteTime', '<', $thirtyDaysAgo)
->count();
// 2. 客户来源分布数据
// 朋友推荐
$friendRecommend = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
->whereIn('addFrom', [17, 1000017])
$friendRecommend = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
// ->whereIn('addFrom', [17, 1000017])
->count();
// 微信搜索
$wechatSearch = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
->whereIn('addFrom', [3, 15, 1000003, 1000015])
$wechatSearch = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
// ->whereIn('addFrom', [3, 15, 1000003, 1000015])
->count();
// 微信群
$wechatGroup = WechatFriendModel::where(['ownerWechatId'=> $wechatAccountId])
->whereIn('addFrom', [14, 1000014])
$wechatGroup = WechatFriendModel::where(['ownerWechatId'=> $ownerWechatId])
// ->whereIn('addFrom', [14, 1000014])
->count();
// 其他渠道（总数减去已知渠道）
@@ -198,15 +210,15 @@ class StatisticsController extends BaseController
$startTime = $timeRange['start_time'];
$endTime = $timeRange['end_time'];
// 转换为时间戳
$startTimestamp = strtotime($startTime);
$endTimestamp = strtotime($endTime);
// 不再需要转换为时间戳，因为getTimeRange已经转换
// $startTimestamp = strtotime($startTime);
// $endTimestamp = strtotime($endTime);
// 1. 互动频率分析
// 高频互动用户数（每天3次以上）
$highFrequencyUsers = WechatMessageModel::where(['wechatAccountId' => $wechatAccountId])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->field('wechatFriendId, COUNT(*) as count')
->group('wechatFriendId')
->having('count > 3')
@@ -214,8 +226,8 @@ class StatisticsController extends BaseController
// 中频互动用户数（每天1-3次）
$midFrequencyUsers = WechatMessageModel::where(['wechatAccountId' => $wechatAccountId])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->field('wechatFriendId, COUNT(*) as count')
->group('wechatFriendId')
->having('count >= 1 AND count <= 3')
@@ -223,8 +235,8 @@ class StatisticsController extends BaseController
// 低频互动用户数（仅有1次）
$lowFrequencyUsers = WechatMessageModel::where(['wechatAccountId' => $wechatAccountId])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->field('wechatFriendId, COUNT(*) as count')
->group('wechatFriendId')
->having('count = 1')
@@ -236,8 +248,8 @@ class StatisticsController extends BaseController
'wechatAccountId' => $wechatAccountId,
'msgType' => 1
])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->count();
// 图片互动数量
@@ -245,8 +257,8 @@ class StatisticsController extends BaseController
'wechatAccountId' => $wechatAccountId,
'msgType' => 3
])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->count();
// 群聊互动数量
@@ -254,16 +266,16 @@ class StatisticsController extends BaseController
'wechatAccountId' => $wechatAccountId,
'type' => 2
])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->count();
// 产品咨询数量 (通过消息内容模糊查询)
$productInquiries = WechatMessageModel::where([
'wechatAccountId' => $wechatAccountId
])
->where('createTime', '>=', $startTimestamp)
->where('createTime', '<', $endTimestamp)
->where('createTime', '>=', $startTime)
->where('createTime', '<', $endTime)
->where('content', 'like', '%产品%')
->whereOr('content', 'like', '%价格%')
->whereOr('content', 'like', '%购买%')
@@ -304,8 +316,11 @@ class StatisticsController extends BaseController
/**
* 获取时间范围
*
* @param bool $toTimestamp 是否将日期转为时间戳，默认为true
* @return array 时间范围数组
*/
private function getTimeRange()
private function getTimeRange($toTimestamp = true)
{
// 可选：today, yesterday, this_week, last_week, this_month, this_quarter, this_year
$timeType = input('time_type', 'this_week');
@@ -371,6 +386,14 @@ class StatisticsController extends BaseController
$lastEndTime = $startTime;
}
// 如果需要转换为时间戳
if ($toTimestamp) {
$startTime = strtotime($startTime);
$endTime = strtotime($endTime);
$lastStartTime = strtotime($lastStartTime);
$lastEndTime = strtotime($lastEndTime);
}
return [
'start_time' => $startTime,
'end_time' => $endTime,

93
Server/application/store/controller/SystemConfigController.php
View File

@@ -29,9 +29,35 @@ class SystemConfigController extends BaseController
return $this->error('设备不存在');
}
// 获取已解析的配置
$config = json_decode($this->device['taskConfig'], true);
// 从新表中获取配置
$config = Db::name('device_taskconf')
->where('deviceId', $deviceId)
->field('id,autoLike,autoCustomerDev,groupMessageDeliver,autoGroup,contentSync,aiChat,autoReply,momentsSync')
->find();
// 如果没有找到配置，创建默认配置
if (empty($config)) {
$taskConfig = [
'deviceId' => $deviceId,
'autoLike' => 0,
'autoCustomerDev' => 0,
'groupMessageDeliver' => 0,
'autoGroup' => 0,
'contentSync' => 0,
'aiChat' => 0,
'autoReply' => 0,
'momentsSync' => 0,
'companyId' => $this->device['companyId'] ?? 0,
'createTime' => time(),
'updateTime' => time()
];
// 添加到数据库
Db::name('device_taskconf')->insert($taskConfig);
// 返回默认配置
return successJson($taskConfig);
}
// 返回开关状态
return successJson($config);
@@ -63,35 +89,58 @@ class SystemConfigController extends BaseController
}
// 验证开关名称是否有效
$validSwitches = ['autoLike', 'momentsSync', 'autoCustomerDev', 'groupMessageDeliver', 'autoGroup'];
$validSwitches = ['autoLike', 'autoCustomerDev', 'groupMessageDeliver', 'autoGroup', 'contentSync', 'aiChat', 'autoReply', 'momentsSync'];
if (!in_array($switchName, $validSwitches)) {
return errorJson('无效的开关名称');
}
// 获取当前配置并确保是数组
$taskConfig = json_decode($this->device['taskConfig'], true);
// 获取当前配置
$taskConfig = Db::name('device_taskconf')
->where('deviceId', $deviceId)
->find();
// 更新指定开关状态
$taskConfig[$switchName] = !$taskConfig[$switchName];
$taskConfig = json_encode($taskConfig);
// 更新数据库
$result = Db::table('s2_device')
->where('id', $deviceId)
->update([
'taskConfig' => $taskConfig,
// 如果没有找到配置，创建默认配置
if (empty($taskConfig)) {
$taskConfig = [
'deviceId' => $deviceId,
'autoLike' => 0,
'autoCustomerDev' => 0,
'groupMessageDeliver' => 0,
'autoGroup' => 0,
'contentSync' => 0,
'aiChat' => 0,
'autoReply' => 0,
'momentsSync' => 0,
'companyId' => $this->device['companyId'] ?? 0,
'createTime' => time(),
'updateTime' => time()
]);
];
if ($result === false) {
Log::error("更新设备{$switchName}开关状态失败，设备ID：{$deviceId}");
return errorJson('更新失败');
// 设置要更新的开关
$taskConfig[$switchName] = 1;
// 添加到数据库
Db::name('device_taskconf')->insert($taskConfig);
} else {
// 更新指定开关状态
$updateData = [
$switchName => !$taskConfig[$switchName],
'updateTime' => time()
];
// 更新数据库
$result = Db::name('device_taskconf')
->where('deviceId', $deviceId)
->update($updateData);
if ($result === false) {
Log::error("更新设备{$switchName}开关状态失败，设备ID：{$deviceId}");
return errorJson('更新失败');
}
}
// 清除缓存
$this->clearDeviceCache();
$this->clearDeviceCache();
return successJson([], '更新成功');
@@ -99,4 +148,4 @@ class SystemConfigController extends BaseController
return errorJson('系统错误'. $e->getMessage());
}
}
}
}

534
Server/application/store/controller/VendorController.php Normal file
View File

@@ -0,0 +1,534 @@
<?php
namespace app\store\controller;
use app\store\model\VendorPackageModel;
use app\store\model\VendorProjectModel;
use app\store\model\VendorOrderModel;
use think\facade\Log;
use think\Db;
/**
* 套餐控制器
*/
class VendorController extends BaseController
{
/**
* 获取套餐列表
*
* @return \think\response\Json
*/
public function getList()
{
try {
$page = $this->request->param('page', 1);
$limit = $this->request->param('limit', 10);
$keyword = $this->request->param('keyword', '');
$status = $this->request->param('status', '');
$where = [
['isDel', '=', 0]
];
// 关键词搜索
if (!empty($keyword)) {
$where[] = ['name', 'like', "%{$keyword}%"];
}
// 状态筛选
if ($status !== '') {
$where[] = ['status', '=', $status];
}
$list = VendorPackageModel::where($where)
->order('id', 'desc')
->page($page, $limit)
->select();
$total = VendorPackageModel::where($where)->count();
return json([
'code' => 200,
'msg' => '获取成功',
'data' => [
'list' => $list,
'total' => $total,
]
]);
} catch (\Exception $e) {
Log::error('获取套餐列表失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '获取失败：' . $e->getMessage()]);
}
}
/**
* 获取套餐详情
*
* @return \think\response\Json
*/
public function detail()
{
try {
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
// 查询套餐基本信息
$package = VendorPackageModel::where([
['id', '=', $id],
['isDel', '=', 0]
])->find();
if (empty($package)) {
return json(['code' => 404, 'msg' => '套餐不存在']);
}
// 查询项目列表
$projects = VendorProjectModel::where([
['packageId', '=', $id],
['isDel', '=', 0]
])->select();
$package['projects'] = $projects;
return json(['code' => 200, 'msg' => '获取成功', 'data' => $package]);
} catch (\Exception $e) {
Log::error('获取套餐详情失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '获取失败：' . $e->getMessage()]);
}
}
/**
* 添加套餐
*
* @return \think\response\Json
*/
public function add()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$param = $this->request->post();
// 参数验证
if (empty($param['name'])) {
return json(['code' => 400, 'msg' => '套餐名称不能为空']);
}
// 检查名称是否已存在
$exists = VendorPackageModel::where([
['name', '=', $param['name']],
['isDel', '=', 0]
])->find();
if ($exists) {
return json(['code' => 400, 'msg' => '该套餐名称已存在']);
}
Db::startTrans();
try {
// 创建套餐
$package = new VendorPackageModel;
$package->name = $param['name'];
$package->originalPrice = $param['originalPrice'] ?? 0;
$package->price = $param['price'] ?? 0;
$package->discount = $param['discount'] ?? 0;
$package->advancePayment = $param['advancePayment'] ?? 0;
$package->tags = $param['tags'] ?? '';
$package->description = $param['description'] ?? '';
$package->cover = $param['cover'] ?? '';
$package->status = $param['status'] ?? 1;
$package->createTime = time();
$package->updateTime = time();
$package->save();
// 处理项目信息
if (!empty($param['projects']) && is_array($param['projects'])) {
foreach ($param['projects'] as $projectData) {
if (empty($projectData['name'])) {
continue;
}
// 创建项目
$project = new VendorProjectModel;
$project->packageId = $package->id;
$project->name = $projectData['name'];
$project->originalPrice = $projectData['originalPrice'] ?? 0;
$project->price = $projectData['price'] ?? 0;
$project->duration = $projectData['duration'] ?? 0;
$project->image = $projectData['image'] ?? '';
$project->detail = $projectData['detail'] ?? '';
$project->createTime = time();
$project->updateTime = time();
$project->save();
}
}
Db::commit();
return json(['code' => 200, 'msg' => '添加成功', 'data' => ['id' => $package->id]]);
} catch (\Exception $e) {
Db::rollback();
Log::error('添加套餐失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '添加失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('添加套餐异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '添加异常：' . $e->getMessage()]);
}
}
/**
* 编辑套餐
*
* @return \think\response\Json
*/
public function edit()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$param = $this->request->post();
// 参数验证
if (empty($param['id'])) {
return json(['code' => 400, 'msg' => '参数错误']);
}
if (empty($param['name'])) {
return json(['code' => 400, 'msg' => '套餐名称不能为空']);
}
// 检查套餐是否存在
$package = VendorPackageModel::where([
['id', '=', $param['id']],
['isDel', '=', 0]
])->find();
if (!$package) {
return json(['code' => 404, 'msg' => '套餐不存在']);
}
// 检查名称是否已存在
$exists = VendorPackageModel::where([
['name', '=', $param['name']],
['id', '<>', $param['id']],
['isDel', '=', 0]
])->find();
if ($exists) {
return json(['code' => 400, 'msg' => '该套餐名称已存在']);
}
Db::startTrans();
try {
// 更新套餐
$package->name = $param['name'];
$package->originalPrice = $param['originalPrice'] ?? $package->originalPrice;
$package->price = $param['price'] ?? $package->price;
$package->discount = $param['discount'] ?? $package->discount;
$package->advancePayment = $param['advancePayment'] ?? $package->advancePayment;
$package->tags = $param['tags'] ?? $package->tags;
$package->description = $param['description'] ?? $package->description;
$package->cover = $param['cover'] ?? $package->cover;
$package->status = $param['status'] ?? $package->status;
$package->updateTime = time();
$package->save();
Db::commit();
return json(['code' => 200, 'msg' => '更新成功']);
} catch (\Exception $e) {
Db::rollback();
Log::error('更新套餐失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '更新失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('编辑套餐异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '编辑异常：' . $e->getMessage()]);
}
}
/**
* 删除套餐
*
* @return \think\response\Json
*/
public function delete()
{
try {
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
// 检查套餐是否存在
$package = VendorPackageModel::where([
['id', '=', $id],
['isDel', '=', 0]
])->find();
if (!$package) {
return json(['code' => 404, 'msg' => '套餐不存在']);
}
Db::startTrans();
try {
// 软删除套餐
$package->isDel = 1;
$package->updateTime = time();
$package->save();
// 软删除关联的项目
VendorProjectModel::where('packageId', $id)
->update([
'isDel' => 1,
'updateTime' => time()
]);
Db::commit();
return json(['code' => 200, 'msg' => '删除成功']);
} catch (\Exception $e) {
Db::rollback();
Log::error('删除套餐失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '删除失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('删除套餐异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '删除异常：' . $e->getMessage()]);
}
}
/**
* 添加项目
*
* @return \think\response\Json
*/
public function addProject()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$param = $this->request->post();
// 参数验证
if (empty($param['packageId'])) {
return json(['code' => 400, 'msg' => '套餐ID不能为空']);
}
if (empty($param['name'])) {
return json(['code' => 400, 'msg' => '项目名称不能为空']);
}
// 检查套餐是否存在
$package = VendorPackageModel::where([
['id', '=', $param['packageId']],
['isDel', '=', 0]
])->find();
if (!$package) {
return json(['code' => 404, 'msg' => '套餐不存在']);
}
try {
// 创建项目
$project = new VendorProjectModel;
$project->packageId = $param['packageId'];
$project->name = $param['name'];
$project->originalPrice = $param['originalPrice'] ?? 0;
$project->price = $param['price'] ?? 0;
$project->duration = $param['duration'] ?? 0;
$project->image = $param['image'] ?? '';
$project->detail = $param['detail'] ?? '';
$project->createTime = time();
$project->updateTime = time();
$project->save();
return json(['code' => 200, 'msg' => '添加成功', 'data' => ['id' => $project->id]]);
} catch (\Exception $e) {
Log::error('添加项目失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '添加失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('添加项目异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '添加异常：' . $e->getMessage()]);
}
}
/**
* 编辑项目
*
* @return \think\response\Json
*/
public function editProject()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$param = $this->request->post();
// 参数验证
if (empty($param['id'])) {
return json(['code' => 400, 'msg' => '项目ID不能为空']);
}
if (empty($param['name'])) {
return json(['code' => 400, 'msg' => '项目名称不能为空']);
}
// 检查项目是否存在
$project = VendorProjectModel::where([
['id', '=', $param['id']],
['isDel', '=', 0]
])->find();
if (!$project) {
return json(['code' => 404, 'msg' => '项目不存在']);
}
try {
// 更新项目
$project->name = $param['name'];
$project->originalPrice = $param['originalPrice'] ?? $project->originalPrice;
$project->price = $param['price'] ?? $project->price;
$project->duration = $param['duration'] ?? $project->duration;
$project->image = $param['image'] ?? $project->image;
$project->detail = $param['detail'] ?? $project->detail;
$project->updateTime = time();
$project->save();
return json(['code' => 200, 'msg' => '更新成功']);
} catch (\Exception $e) {
Log::error('更新项目失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '更新失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('编辑项目异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '编辑异常：' . $e->getMessage()]);
}
}
/**
* 删除项目
*
* @return \think\response\Json
*/
public function deleteProject()
{
try {
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
// 检查项目是否存在
$project = VendorProjectModel::where([
['id', '=', $id],
['isDel', '=', 0]
])->find();
if (!$project) {
return json(['code' => 404, 'msg' => '项目不存在']);
}
try {
// 软删除项目
$project->isDel = 1;
$project->updateTime = time();
$project->save();
return json(['code' => 200, 'msg' => '删除成功']);
} catch (\Exception $e) {
Log::error('删除项目失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '删除失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('删除项目异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '删除异常：' . $e->getMessage()]);
}
}
/**
* 创建订单
*
* @return \think\response\Json
*/
public function createOrder()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$param = $this->request->post();
// 参数验证
if (empty($param['packageId'])) {
return json(['code' => 400, 'msg' => '套餐ID不能为空']);
}
// 检查套餐是否存在
$package = VendorPackageModel::where([
['id', '=', $param['packageId']],
['isDel', '=', 0],
['status', '=', 1]
])->find();
if (!$package) {
return json(['code' => 404, 'msg' => '套餐不存在或已下架']);
}
// 获取当前用户信息
$userId = $this->request->userInfo['id'];
if (empty($userId)) {
return json(['code' => 401, 'msg' => '请先登录']);
}
Db::startTrans();
try {
// 生成订单
$order = new VendorOrderModel;
$order->orderNo = VendorOrderModel::generateOrderNo();
$order->userId = $userId;
$order->packageId = $package->id;
$order->packageName = $package->name;
$order->totalAmount = $package->price;
$order->payAmount = $package->price;
$order->advancePayment = $package->advancePayment;
$order->status = VendorOrderModel::STATUS_UNPAID;
$order->remark = $param['remark'] ?? '';
$order->createTime = time();
$order->updateTime = time();
$order->save();
Db::commit();
return json([
'code' => 200,
'msg' => '订单创建成功',
'data' => [
'orderId' => $order->id,
'orderNo' => $order->orderNo
]
]);
} catch (\Exception $e) {
Db::rollback();
Log::error('创建订单失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '创建订单失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('创建订单异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '创建订单异常：' . $e->getMessage()]);
}
}
}

229
Server/application/store/controller/VendorOrderController.php Normal file
View File

@@ -0,0 +1,229 @@
<?php
namespace app\store\controller;
use app\store\model\VendorPackageModel;
use app\store\model\VendorProjectModel;
use app\store\model\VendorOrderModel;
use think\facade\Log;
use think\Db;
/**
* 订单控制器
*/
class VendorOrderController extends BaseController
{
/**
* 获取订单列表
*
* @return \think\response\Json
*/
public function getList()
{
try {
$page = $this->request->param('page', 1);
$limit = $this->request->param('limit', 10);
$status = $this->request->param('status', '');
$keyword = $this->request->param('keyword', '');
// 获取当前用户信息
$userId = $this->request->userInfo['id'];
$where = [
['userId', '=', $userId]
];
// 关键词搜索
if (!empty($keyword)) {
$where[] = ['orderNo|packageName', 'like', "%{$keyword}%"];
}
// 状态筛选
if ($status !== '') {
$where[] = ['status', '=', $status];
}
$list = VendorOrderModel::with(['package'])
->where($where)
->order('id', 'desc')
->page($page, $limit)
->select();
$total = VendorOrderModel::where($where)->count();
return json([
'code' => 200,
'msg' => '获取成功',
'data' => [
'list' => $list,
'total' => $total,
'page' => $page,
'limit' => $limit
]
]);
} catch (\Exception $e) {
Log::error('获取订单列表失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '获取失败：' . $e->getMessage()]);
}
}
/**
* 获取订单详情
*
* @return \think\response\Json
*/
public function detail()
{
try {
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
// 获取当前用户信息
$userId = $this->request->userInfo['id'];
// 查询订单
$order = VendorOrderModel::with(['package'])
->where([
['id', '=', $id],
['userId', '=', $userId]
])->find();
if (empty($order)) {
return json(['code' => 404, 'msg' => '订单不存在']);
}
// 查询套餐项目
if (!empty($order['package'])) {
$projects = VendorProjectModel::where([
['packageId', '=', $order['packageId']],
['isDel', '=', 0]
])->select();
$order['package']['projects'] = $projects;
}
return json(['code' => 200, 'msg' => '获取成功', 'data' => $order]);
} catch (\Exception $e) {
Log::error('获取订单详情失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '获取失败：' . $e->getMessage()]);
}
}
/**
* 更新订单状态
*
* @return \think\response\Json
*/
public function updateStatus()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$param = $this->request->post();
// 参数验证
if (empty($param['id'])) {
return json(['code' => 400, 'msg' => '订单ID不能为空']);
}
if (!isset($param['status'])) {
return json(['code' => 400, 'msg' => '订单状态不能为空']);
}
// 检查订单是否存在
$order = VendorOrderModel::where('id', $param['id'])->find();
if (!$order) {
return json(['code' => 404, 'msg' => '订单不存在']);
}
// 检查状态是否有效
$validStatus = [
VendorOrderModel::STATUS_UNPAID,
VendorOrderModel::STATUS_PAID,
VendorOrderModel::STATUS_COMPLETED,
VendorOrderModel::STATUS_CANCELED
];
if (!in_array($param['status'], $validStatus)) {
return json(['code' => 400, 'msg' => '无效的订单状态']);
}
// 更新订单状态
$updateData = [
'status' => $param['status'],
'updateTime' => time()
];
// 如果订单状态为已支付，记录支付时间
if ($param['status'] == VendorOrderModel::STATUS_PAID) {
$updateData['payTime'] = time();
}
try {
$order->save($updateData);
return json(['code' => 200, 'msg' => '更新成功']);
} catch (\Exception $e) {
Log::error('更新订单状态失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '更新失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('更新订单状态异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '更新异常：' . $e->getMessage()]);
}
}
/**
* 取消订单
*
* @return \think\response\Json
*/
public function cancel()
{
try {
if (!$this->request->isPost()) {
return json(['code' => 400, 'msg' => '请求方式错误']);
}
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
// 获取当前用户信息
$userId = $this->request->userInfo['id'];
// 检查订单是否存在
$order = VendorOrderModel::where([
['id', '=', $id],
['userId', '=', $userId],
['status', '=', VendorOrderModel::STATUS_UNPAID]
])->find();
if (!$order) {
return json(['code' => 404, 'msg' => '订单不存在或状态不允许取消']);
}
try {
// 更新订单状态为已取消
$order->status = VendorOrderModel::STATUS_CANCELED;
$order->updateTime = time();
$order->save();
return json(['code' => 200, 'msg' => '取消成功']);
} catch (\Exception $e) {
Log::error('取消订单失败：' . $e->getMessage());
return json(['code' => 500, 'msg' => '取消失败：' . $e->getMessage()]);
}
} catch (\Exception $e) {
Log::error('取消订单异常：' . $e->getMessage());
return json(['code' => 500, 'msg' => '取消异常：' . $e->getMessage()]);
}
}
}

34
Server/application/store/model/VendorModel.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
namespace app\store\model;
use think\Model;
/**
* 供应商模型
*/
class VendorModel extends Model
{
// 设置表名
protected $table = 's2_vendor';
// 主键
protected $pk = 'id';
// 自动写入时间戳
protected $autoWriteTimestamp = true;
protected $createTime = 'createTime';
protected $updateTime = 'updateTime';
// 隐藏字段
protected $hidden = ['isDel'];
/**
* 与套餐的关联
*/
public function packages()
{
return $this->hasMany('VendorPackageModel', 'vendorId', 'id')
->where('isDel', 0);
}
}

45
Server/application/store/model/VendorOrderModel.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
namespace app\store\model;
use think\Model;
/**
* 订单模型
*/
class VendorOrderModel extends Model
{
// 设置表名
protected $table = 'ck_vendor_order';
// 主键
protected $pk = 'id';
// 自动写入时间戳
protected $autoWriteTimestamp = true;
protected $createTime = 'createTime';
protected $updateTime = 'updateTime';
// 状态常量
const STATUS_UNPAID = 0; // 待支付
const STATUS_PAID = 1; // 已支付
const STATUS_COMPLETED = 2; // 已完成
const STATUS_CANCELED = 3; // 已取消
/**
* 与套餐的关联
*/
public function package()
{
return $this->belongsTo('VendorPackageModel', 'packageId', 'id');
}
/**
* 生成唯一订单号
* @return string
*/
public static function generateOrderNo()
{
return date('YmdHis') . rand(1000, 9999);
}
}

50
Server/application/store/model/VendorPackageModel.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
namespace app\store\model;
use think\Model;
/**
* 套餐模型
*/
class VendorPackageModel extends Model
{
// 设置表名
protected $table = 'ck_vendor_package';
// 主键
protected $pk = 'id';
// 自动写入时间戳
protected $autoWriteTimestamp = true;
protected $createTime = 'createTime';
protected $updateTime = 'updateTime';
// 隐藏字段
protected $hidden = ['isDel'];
/**
* 与项目的关联
*/
public function projects()
{
return $this->hasMany('VendorProjectModel', 'packageId', 'id')
->where('isDel', 0);
}
/**
* 标签获取器
*/
public function getTagsAttr($value)
{
return $value ? explode(',', $value) : [];
}
/**
* 标签修改器
*/
public function setTagsAttr($value)
{
return is_array($value) ? implode(',', $value) : $value;
}
}

33
Server/application/store/model/VendorProjectModel.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
namespace app\store\model;
use think\Model;
/**
* 套餐项目模型
*/
class VendorProjectModel extends Model
{
// 设置表名
protected $table = 'ck_vendor_project';
// 主键
protected $pk = 'id';
// 自动写入时间戳
protected $autoWriteTimestamp = true;
protected $createTime = 'createTime';
protected $updateTime = 'updateTime';
// 隐藏字段
protected $hidden = ['isDel'];
/**
* 与套餐的关联
*/
public function package()
{
return $this->belongsTo('VendorPackageModel', 'packageId', 'id');
}
}

41
Store_vue/api/modules/supply.js Normal file
View File

@@ -0,0 +1,41 @@
import { request, requestWithRetry } from '../config'
// 供应链相关API
export const supplyApi = {
// 获取供应商列表
getVendorList: (page, pageSize) => {
return request({
url: '/v1/store/vendor/list',
method: 'GET',
data: {
page: page || 1,
page_size: pageSize || 10
}
})
},
// 获取供应商详情
getVendorDetail: (id) => {
return request({
url: '/v1/store/vendor/detail',
method: 'GET',
data: {
id: id
}
})
},
// 提交订单
submitOrder: (packageId) => {
return request({
url: '/v1/store/vendor/order',
method: 'POST',
header: {
'content-type': 'application/x-www-form-urlencoded'
},
data: {
packageId: packageId
}
})
}
}

15
Store_vue/components/PackageDetail.vue
View File

@@ -3,11 +3,11 @@
<!-- 头部 -->
<view class="header">
<view class="back-icon" @tap="closePage">
<u-icon name="arrow-left" color="#333" size="26"></u-icon>
<text class="uni-icons-arrow-left" style="font-size: 26px; color: #333;">&#xe6db;</text>
</view>
<view class="title">{{packageData.name}}</view>
<view class="close-icon" @tap="closePage">
<u-icon name="close" color="#333" size="24"></u-icon>
<text class="uni-icons-close" style="font-size: 24px; color: #333;">&#xe607;</text>
</view>
</view>
@@ -216,17 +216,6 @@
background-color: #f5f7fa;
z-index: 10000;
overflow-y: auto;
transform-origin: right;
animation: slideInFromRight 0.3s ease;
}
@keyframes slideInFromRight {
from {
transform: translateX(100%);
}
to {
transform: translateX(0);
}
}
.header {

14
Store_vue/components/SideMenu.vue
View File

@@ -3,7 +3,7 @@
<view class="side-menu-mask" @tap="closeSideMenu"></view>
<view class="side-menu">
<view class="side-menu-header">
<text class="side-menu-title">艺施赋能</text>
<text class="side-menu-title">美业赋能</text>
<text class="close-icon" @tap="closeSideMenu">
<u-icon name="close" color="#333" size="24"></u-icon>
</text>
@@ -488,18 +488,6 @@
z-index: 2;
display: flex;
flex-direction: column;
animation: slideIn 0.3s ease;
overflow-y: auto;
transition: transform 0.3s ease;
}
@keyframes slideIn {
from {
transform: translateX(-100%);
}
to {
transform: translateX(0);
}
}
.side-menu-header {

339
Store_vue/components/SupplyChainPurchase.vue
View File

@@ -4,16 +4,29 @@
<!-- 头部 -->
<view class="header">
<view class="back-icon" @tap="closePage">
<u-icon name="arrow-left" color="#333" size="26"></u-icon>
<text class="uni-icons-arrow-left" style="font-size: 26px; color: #333;">&#xe6db;</text>
</view>
<view class="title">供应链采购</view>
<view class="close-icon" @tap="closePage">
<u-icon name="close" color="#333" size="24"></u-icon>
<text class="uni-icons-close" style="font-size: 24px; color: #333;">&#xe607;</text>
</view>
</view>
<!-- 加载状态 -->
<view v-if="loading && packages.length === 0" class="loading-container">
<u-loading size="34" mode="circle" color="#CA8A04"></u-loading>
<text class="loading-text">加载中...</text>
</view>
<!-- 错误提示 -->
<view v-else-if="error" class="error-container">
<u-icon name="error-circle" size="40" color="#ff4d4f"></u-icon>
<text class="error-text">{{error}}</text>
<button class="retry-button" @tap="fetchVendorList">重试</button>
</view>
<!-- 套餐卡片区域 -->
<view class="package-list">
<view v-else class="package-list">
<view
v-for="item in packages"
:key="item.id"
@@ -29,7 +42,7 @@
<view class="package-info">
<view class="package-name">
{{item.name}}
<text v-if="item.specialTag" class="special-tag">{{item.specialTag}}</text>
<text v-if="item.tags && item.tags.length > 0" class="special-tag">{{item.tags[0]}}</text>
</view>
<view class="package-price">
<text class="price-value">¥{{item.price}}</text>
@@ -37,9 +50,24 @@
</view>
<view class="advance-payment" v-if="item.advancePayment">预付款: ¥{{item.advancePayment}}</view>
</view>
<view class="discount-tag" v-if="item.discount">{{item.discount}}</view>
<view class="discount-tag" v-if="item.discount">{{(parseFloat(item.discount) * 10).toFixed(2)}}折</view>
</view>
</view>
<!-- 加载更多 -->
<view class="load-more" v-if="hasMore">
<u-loadmore
:status="loadMoreStatus"
@loadmore="loadMore"
icon-type="flower"
color="#CA8A04"
></u-loadmore>
</view>
<!-- 无数据提示 -->
<view v-if="packages.length === 0 && !loading" class="no-data">
<u-empty text="暂无供应商数据" mode="data"></u-empty>
</view>
</view>
</view>
@@ -54,6 +82,7 @@
<script>
import SupplyItemDetail from './SupplyItemDetail.vue';
import { supplyApi } from '../api/modules/supply';
export default {
name: 'SupplyChainPurchase',
@@ -69,163 +98,28 @@
data() {
return {
// 套餐数据
packages: [
{
id: 1,
name: '基础套餐',
price: '2980',
originalPrice: '3725',
discount: '8折',
specialTag: '',
advancePayment: '745',
services: [
{
name: '头部护理SPA',
price: '598',
originalPrice: '718',
duration: '60分钟',
image: '/static/spa1.png'
},
{
name: '臂油SPA',
price: '618',
originalPrice: '838',
duration: '90分钟',
image: '/static/spa2.png'
},
{
name: '法/LAWF型颜度护理',
price: '1580',
originalPrice: '1896',
duration: '120分钟',
image: '/static/spa3.png'
}
],
details: [
{ label: '采购额度', value: '3000元' },
{ label: '套餐时长', value: '30天' },
{ label: '采购种类', value: '标准品类' }
],
privileges: [
'标准采购价格',
'7天内发货',
'基础供应商渠道'
]
},
{
id: 2,
name: '进级套餐',
price: '6980',
originalPrice: '9971',
discount: '7折',
specialTag: '',
advancePayment: '',
services: [
{
name: '进阶头部护理SPA',
price: '898',
originalPrice: '1218',
duration: '90分钟',
image: '/static/spa1.png'
},
{
name: '全身SPA',
price: '1618',
originalPrice: '2138',
duration: '120分钟',
image: '/static/spa2.png'
},
{
name: '高级LAWF型颜度护理',
price: '2880',
originalPrice: '3596',
duration: '150分钟',
image: '/static/spa3.png'
},
{
name: '肌肤管理',
price: '1290',
originalPrice: '1590',
duration: '60分钟',
image: '/static/spa4.png'
}
],
details: [
{ label: '采购额度', value: '7000元' },
{ label: '套餐时长', value: '30天' },
{ label: '采购种类', value: '全部品类' }
],
privileges: [
'优惠采购价格',
'3天内发货',
'优质供应商渠道',
'专属采购顾问'
]
},
{
id: 3,
name: '尊享套餐',
price: '19800',
originalPrice: '33000',
discount: '6折',
specialTag: '品优惠',
advancePayment: '',
services: [
{
name: '尊享头部护理SPA',
price: '1298',
originalPrice: '1818',
duration: '120分钟',
image: '/static/spa1.png'
},
{
name: '尊享全身SPA',
price: '2618',
originalPrice: '3738',
duration: '180分钟',
image: '/static/spa2.png'
},
{
name: '奢华LAWF型颜度护理',
price: '4880',
originalPrice: '6996',
duration: '210分钟',
image: '/static/spa3.png'
},
{
name: '尊享肌肤管理',
price: '2490',
originalPrice: '3290',
duration: '90分钟',
image: '/static/spa4.png'
},
{
name: '私人定制美容方案',
price: '5990',
originalPrice: '8990',
duration: '全天候',
image: '/static/spa5.png'
}
],
details: [
{ label: '采购额度', value: '20000元' },
{ label: '套餐时长', value: '30天' },
{ label: '采购种类', value: '全部品类(含限定)' }
],
privileges: [
'最优采购价格',
'24小时内发货',
'顶级供应商渠道',
'一对一专属顾问',
'供应链优化方案',
'库存管理系统'
]
}
],
packages: [],
// 套餐详情页面
showPackageDetail: false,
// 当前选中的套餐
currentPackage: null
currentPackage: null,
// 分页相关
currentPage: 1,
pageSize: 10,
total: 0,
hasMore: true,
// 加载状态
loading: false,
loadMoreStatus: 'loading', // 'loading', 'nomore', 'loadmore'
// 错误信息
error: null
}
},
watch: {
show(newVal) {
if (newVal && this.packages.length === 0) {
this.fetchVendorList();
}
}
},
methods: {
@@ -240,6 +134,72 @@
// 关闭套餐详情
closePackageDetail() {
this.showPackageDetail = false;
},
// 获取供应商套餐数据
async fetchVendorList(isLoadMore = false) {
if (this.loading) return;
this.loading = true;
if (!isLoadMore) this.error = null;
if (!isLoadMore) {
uni.showLoading({
title: '加载中...',
mask: true
});
}
try {
const response = await supplyApi.getVendorList(this.currentPage, this.pageSize);
if (response.code === 200) {
// 处理返回的数据，注意接口返回的数据有嵌套的list字段
const list = response.data.list || [];
const newPackages = list.map(item => ({
id: item.id,
userId: item.userId,
companyId: item.companyId,
name: item.name,
price: parseFloat(item.price).toFixed(2),
originalPrice: parseFloat(item.originalPrice).toFixed(2),
discount: item.discount,
advancePayment: item.advancePayment ? parseFloat(item.advancePayment).toFixed(2) : '',
tags: item.tags,
description: item.description,
cover: item.cover,
status: item.status,
createTime: item.createTime,
updateTime: item.updateTime
}));
if (isLoadMore) {
this.packages = [...this.packages, ...newPackages];
} else {
this.packages = newPackages;
}
// 更新分页信息
this.total = response.data.total || 0;
this.hasMore = this.packages.length < this.total;
this.loadMoreStatus = this.hasMore ? 'loadmore' : 'nomore';
} else {
this.error = response.msg || '获取数据失败';
}
} catch (err) {
this.error = '获取供应商数据失败，请稍后重试';
console.error('获取供应商数据错误:', err);
} finally {
this.loading = false;
if (!isLoadMore) uni.hideLoading();
}
},
// 加载更多
loadMore() {
if (!this.hasMore || this.loading) return;
this.loadMoreStatus = 'loading';
this.currentPage++;
this.fetchVendorList(true);
}
}
}
@@ -255,17 +215,6 @@
background-color: #fff;
z-index: 10000;
overflow-y: auto;
transform-origin: right;
animation: slideInFromRight 0.3s ease;
}
@keyframes slideInFromRight {
from {
transform: translateX(100%);
}
to {
transform: translateX(0);
}
}
.header {
@@ -421,4 +370,54 @@
width: 100%;
height: 100%;
}
/* 加载状态 */
.loading-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 60px 0;
}
.loading-text {
margin-top: 15px;
font-size: 14px;
color: #666;
}
/* 错误提示 */
.error-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 60px 0;
}
.error-text {
margin: 15px 0;
font-size: 14px;
color: #ff4d4f;
}
.retry-button {
padding: 6px 20px;
font-size: 14px;
color: #fff;
background-color: #CA8A04;
border-radius: 4px;
}
/* 加载更多 */
.load-more {
padding: 10px 0;
text-align: center;
}
/* 无数据提示 */
.no-data {
padding: 40px 0;
text-align: center;
}
</style>

341
Store_vue/components/SupplyItemDetail.vue
View File

@@ -4,73 +4,134 @@
<!-- 头部 -->
<view class="header">
<view class="back-icon" @tap="closePage">
<u-icon name="arrow-left" color="#333" size="26"></u-icon>
<text class="uni-icons-arrow-left" style="font-size: 26px; color: #333;">&#xe6db;</text>
</view>
<view class="title">{{packageData.name}}</view>
<view class="title">{{detailData.name || packageData.name}}</view>
<view class="close-icon" @tap="closePage">
<u-icon name="close" color="#333" size="24"></u-icon>
<text class="uni-icons-close" style="font-size: 24px; color: #333;">&#xe607;</text>
</view>
</view>
<!-- 套餐价格信息 -->
<view class="price-card">
<view class="price-title">套餐价格</view>
<view class="price-info">
<view class="current-price">
<text class="price-symbol">¥</text>
<text class="price-value">{{packageData.price}}</text>
<!-- 加载状态 -->
<view v-if="loading" class="loading-container">
<u-loading size="34" mode="circle" color="#FF6600"></u-loading>
<text class="loading-text">加载中...</text>
</view>
<!-- 错误提示 -->
<view v-else-if="error" class="error-container">
<u-icon name="error-circle" size="40" color="#ff4d4f"></u-icon>
<text class="error-text">{{error}}</text>
<button class="retry-button" @tap="fetchVendorDetail">重试</button>
</view>
<template v-else>
<!-- 套餐价格信息 -->
<view class="price-card">
<view class="price-title">套餐价格</view>
<view class="price-info">
<view class="current-price">
<text class="price-symbol">¥</text>
<text class="price-value">{{detailData.price || packageData.price}}</text>
</view>
<view class="original-price" v-if="(detailData.originalPrice || packageData.originalPrice) !== (detailData.price || packageData.price)">¥{{detailData.originalPrice || packageData.originalPrice}}</view>
</view>
<view class="advance-info" v-if="detailData.advancePayment || packageData.advancePayment">
预付款: ¥{{detailData.advancePayment || packageData.advancePayment}}
</view>
<!-- 标签 -->
<view class="tags-container" v-if="detailData.tags && detailData.tags.length > 0">
<view class="tag-item" v-for="(tag, index) in detailData.tags" :key="index">
{{tag}}
</view>
</view>
<!-- 描述信息 -->
<view class="description" v-if="detailData.description">
{{detailData.description}}
</view>
<view class="original-price" v-if="packageData.originalPrice !== packageData.price">¥{{packageData.originalPrice}}</view>
</view>
<view class="advance-info" v-if="packageData.advancePayment">
预付款: ¥{{packageData.advancePayment}}
</view>
</view>
<!-- 套餐内容 -->
<view class="service-section">
<view class="section-title">套餐内容</view>
<view class="service-count">共{{packageData.services ? packageData.services.length : 0}}服务</view>
<!-- 服务列表 -->
<view class="service-list">
<view
v-for="(service, index) in packageData.services"
:key="index"
class="service-item"
>
<view class="service-left">
<view class="service-icon">
<u-icon name="heart" color="#FF6600" size="24"></u-icon>
<!-- 项目列表 -->
<view class="service-section" v-if="detailData.projects && detailData.projects.length > 0">
<view class="section-title">项目列表</view>
<view class="service-count">共{{detailData.projects.length}}个项目</view>
<!-- 项目列表 -->
<view class="service-list">
<view
v-for="(project, index) in detailData.projects"
:key="project.id"
class="service-item"
>
<view class="service-left">
<image v-if="project.image" :src="project.image" mode="aspectFill" class="service-image"></image>
<view v-else class="service-icon">
<u-icon name="heart" color="#FF6600" size="24"></u-icon>
</view>
</view>
</view>
<view class="service-right">
<view class="service-name">{{service.name}}</view>
<view class="service-price">
<text class="price-symbol">¥</text>
<text class="service-price-value">{{service.price}}</text>
<text class="service-original-price" v-if="service.originalPrice">¥{{service.originalPrice}}</text>
<view class="service-right">
<view class="service-name">{{project.name}}</view>
<view class="service-price">
<text class="price-symbol">¥</text>
<text class="service-price-value">{{project.price}}</text>
<text class="service-original-price" v-if="project.originalPrice">¥{{project.originalPrice}}</text>
</view>
<view class="service-duration" v-if="project.duration">{{project.duration}}分钟</view>
<view class="service-detail" v-if="project.detail">{{project.detail}}</view>
</view>
<view class="service-duration">{{service.duration}}</view>
</view>
</view>
</view>
</view>
<!-- 购买按钮 -->
<view class="buy-button-container">
<button class="buy-button" @tap="handleBuy">立即购买</button>
</view>
<!-- 购买说明 -->
<view class="buy-notice">
<text class="notice-text">订单将由操作人处理，详情请联系客服</text>
</view>
<!-- 原始服务列表 (如果没有项目列表，则显示原有的服务列表) -->
<view class="service-section" v-else-if="packageData.services && packageData.services.length > 0">
<view class="section-title">套餐内容</view>
<view class="service-count">共{{packageData.services.length}}个服务</view>
<!-- 服务列表 -->
<view class="service-list">
<view
v-for="(service, index) in packageData.services"
:key="index"
class="service-item"
>
<view class="service-left">
<view class="service-icon">
<u-icon name="heart" color="#FF6600" size="24"></u-icon>
</view>
</view>
<view class="service-right">
<view class="service-name">{{service.name}}</view>
<view class="service-price">
<text class="price-symbol">¥</text>
<text class="service-price-value">{{service.price}}</text>
<text class="service-original-price" v-if="service.originalPrice">¥{{service.originalPrice}}</text>
</view>
<view class="service-duration">{{service.duration}}</view>
</view>
</view>
</view>
</view>
<!-- 购买按钮 -->
<view class="buy-button-container">
<button class="buy-button" @tap="handleBuy">立即购买</button>
</view>
<!-- 购买说明 -->
<view class="buy-notice">
<text class="notice-text">订单将由操作人处理，详情请联系客服</text>
</view>
</template>
</view>
</view>
</template>
<script>
import { supplyApi } from '../api/modules/supply';
export default {
name: 'SupplyItemDetail',
props: {
@@ -113,28 +174,100 @@
})
}
},
data() {
return {
// 详情数据
detailData: {},
// 加载状态
loading: false,
// 错误信息
error: null
}
},
watch: {
show(newVal) {
if (newVal && this.packageData && this.packageData.id) {
this.fetchVendorDetail();
}
},
'packageData.id'(newVal) {
if (newVal && this.show) {
this.fetchVendorDetail();
}
}
},
methods: {
closePage() {
this.$emit('close');
},
// 获取供应商详情
async fetchVendorDetail() {
if (this.loading || !this.packageData || !this.packageData.id) return;
this.loading = true;
this.error = null;
try {
const response = await supplyApi.getVendorDetail(this.packageData.id);
if (response.code === 200) {
this.detailData = response.data;
} else {
this.error = response.msg || '获取详情失败';
console.error('获取详情失败:', response.msg);
}
} catch (err) {
this.error = '获取详情失败，请稍后重试';
console.error('获取详情错误:', err);
} finally {
this.loading = false;
}
},
handleBuy() {
uni.showLoading({
title: '处理中...'
});
// 模拟购买流程
setTimeout(() => {
uni.hideLoading();
// 获取packageId
const packageId = this.detailData.id || this.packageData.id;
if (!packageId) {
uni.showToast({
title: '购买成功',
icon: 'success'
title: '参数错误',
icon: 'none'
});
uni.hideLoading();
return;
}
// 提交订单
supplyApi.submitOrder(packageId)
.then(response => {
uni.hideLoading();
if (response.code === 200) {
uni.showToast({
title: '购买成功',
icon: 'success'
});
// 延迟关闭页面
setTimeout(() => {
this.closePage();
}, 1500);
} else {
uni.showToast({
title: response.msg || '购买失败',
icon: 'none'
});
}
})
.catch(err => {
uni.hideLoading();
console.error('订单提交错误:', err);
uni.showToast({
title: '购买失败，请稍后重试',
icon: 'none'
});
});
// 延迟关闭页面
setTimeout(() => {
this.closePage();
}, 1500);
}, 2000);
}
}
}
@@ -150,17 +283,6 @@
background-color: #f5f7fa;
z-index: 10000;
overflow-y: auto;
transform-origin: right;
animation: slideInFromRight 0.3s ease;
}
@keyframes slideInFromRight {
from {
transform: translateX(100%);
}
to {
transform: translateX(0);
}
}
.header {
@@ -242,11 +364,35 @@
color: #666;
}
.tags-container {
display: flex;
flex-wrap: wrap;
margin-top: 10px;
}
.tag-item {
background-color: #FCF0E3;
color: #FF6600;
font-size: 12px;
padding: 3px 8px;
border-radius: 4px;
margin-right: 8px;
margin-bottom: 8px;
}
.description {
margin-top: 10px;
font-size: 14px;
color: #666;
line-height: 1.5;
}
.service-section {
margin: 15px;
background-color: #fff;
border-radius: 10px;
overflow: hidden;
position: relative;
}
.section-title {
@@ -258,7 +404,7 @@
.service-count {
position: absolute;
right: 30px;
right: 15px;
top: 15px;
font-size: 12px;
color: #666;
@@ -298,6 +444,12 @@
align-items: center;
}
.service-image {
width: 100%;
height: 100%;
object-fit: cover;
}
.service-right {
flex: 1;
}
@@ -331,6 +483,13 @@
.service-duration {
font-size: 12px;
color: #999;
margin-bottom: 5px;
}
.service-detail {
font-size: 12px;
color: #666;
line-height: 1.5;
}
.buy-button-container {
@@ -365,4 +524,42 @@
width: 100%;
height: 100%;
}
/* 加载状态 */
.loading-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 60px 0;
}
.loading-text {
margin-top: 15px;
font-size: 14px;
color: #666;
}
/* 错误提示 */
.error-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 60px 0;
}
.error-text {
margin: 15px 0;
font-size: 14px;
color: #ff4d4f;
}
.retry-button {
padding: 6px 20px;
font-size: 14px;
color: #fff;
background-color: #FF6600;
border-radius: 4px;
}
</style>

11
Store_vue/components/TrafficPurchase.vue
View File

@@ -285,17 +285,6 @@
background-color: #f5f7fa;
z-index: 10000;
overflow-y: auto;
transform-origin: right;
animation: slideInFromRight 0.3s ease;
}
@keyframes slideInFromRight {
from {
transform: translateX(100%);
}
to {
transform: translateX(0);
}
}
.header {