feat(fsgx): 完成全部24项开发任务 Phase1-7
Phase1 后端核心:
- 新增 fsgx_v1.sql 迁移脚本(is_queue_goods/frozen_points/available_points/no_assess)
- SystemConfigServices 返佣设置扩展(周期人数/分档比例/范围/时机)
- StoreOrderCreateServices 周期循环佣金计算
- StoreOrderTakeServices 佣金发放后同步冻结积分
- StoreProductServices/StoreProduct 保存 is_queue_goods
Phase2 后端接口:
- GET /api/hjf/brokerage/progress 佣金周期进度
- GET /api/hjf/assets/overview 资产总览
- HjfPointsServices 每日 frozen_points 0.4‰ 释放定时任务
- PUT /adminapi/hjf/member/{uid}/no_assess 不考核接口
- GET /adminapi/hjf/points/release_log 积分日志接口
Phase3 前端清理:
- hjfCustom.js 路由精简(仅保留 points/log)
- hjfQueue.js/hjfMember.js API 清理/重定向至 CRMEB 原生接口
- pages.json 公排→推荐佣金/佣金记录/佣金规则
Phase4-5 前端改造:
- queue/status.vue 推荐佣金进度页整体重写
- 商品详情/订单确认/支付结果页文案与逻辑改造
- 个人中心/资产页/引导页/规则页文案改造
- HjfQueueProgress/HjfRefundNotice/HjfAssetCard 组件改造
- 推广中心嵌入佣金进度摘要
- hjfMockData.js 全量更新(公排字段→佣金字段)
Phase6 Admin 增强:
- 用户列表新增 frozen_points/available_points 列及不考核操作按钮
- hjfPoints.js USE_MOCK=false 对接真实积分日志接口
Phase7 配置文档:
- docs/fsgx-phase7-config-checklist.md 后台配置与全链路验收清单
Made-with: Cursor
This commit is contained in:
34
pro_v3.5.1_副本/app/dao/other/AgreementDao.php
Normal file
34
pro_v3.5.1_副本/app/dao/other/AgreementDao.php
Normal file
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\Agreement;
|
||||
|
||||
/**
|
||||
* Class AgreementDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class AgreementDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function setModel(): string
|
||||
{
|
||||
return Agreement::class;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
41
pro_v3.5.1_副本/app/dao/other/CacheDao.php
Normal file
41
pro_v3.5.1_副本/app/dao/other/CacheDao.php
Normal file
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\Cache;
|
||||
|
||||
/**
|
||||
* Class CacheDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class CacheDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function setModel(): string
|
||||
{
|
||||
return Cache::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除过期缓存
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function delectDeOverdueDbCache()
|
||||
{
|
||||
$this->getModel()->where('expire_time', '<>', 0)->where('expire_time', '<', time())->delete();
|
||||
}
|
||||
}
|
||||
100
pro_v3.5.1_副本/app/dao/other/CategoryDao.php
Normal file
100
pro_v3.5.1_副本/app/dao/other/CategoryDao.php
Normal file
@@ -0,0 +1,100 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\Category;
|
||||
|
||||
/**
|
||||
* 分类
|
||||
* Class CategoryDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class CategoryDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return Category::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $where
|
||||
* @param bool $search
|
||||
* @return \crmeb\basic\BaseModel
|
||||
* @throws \ReflectionException
|
||||
* @author 等风来
|
||||
* @email 136327134@qq.com
|
||||
* @date 2023/10/7
|
||||
*/
|
||||
public function search(array $where = [], bool $search = false)
|
||||
{
|
||||
return parent::search($where, $search)->when(isset($where['name']) && $where['name'], function ($query) use ($where) {
|
||||
$query->where(function ($q) use ($where) {
|
||||
$q->whereOr('id|name', 'like', '%' . $where['name'] . '%')
|
||||
->when(!empty($where['product_label']), function ($query) use ($where) {
|
||||
$query->whereOr('id', 'IN', function ($l) use ($where) {
|
||||
$l->name('store_product_label')->whereLike('id|label_name', '%' . $where['name'] . '%')->field('label_cate');
|
||||
});
|
||||
});
|
||||
});
|
||||
})->when(!empty($where['nowName']), function ($query) use ($where) {
|
||||
$query->where('name', $where['nowName']);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取分类
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @param array|string[] $field
|
||||
* @param array $with
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getCateList(array $where, int $page = 0, int $limit = 0, array $field = ['*'], array $with = [])
|
||||
{
|
||||
$other = false;
|
||||
if (isset($where['other'])) {
|
||||
$other = true;
|
||||
unset($where['other']);
|
||||
}
|
||||
return $this->search($where)->field($field)->when(count($with), function ($query) use ($with) {
|
||||
$query->with($with);
|
||||
})->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->when($other, function ($query) {
|
||||
$query->where('other', '<>', '');
|
||||
})->order('sort DESC,id DESC')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取全部标签分类
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getAll(array $where = [], array $with = [])
|
||||
{
|
||||
return $this->search($where)->when(count($with), function ($query) use ($with) {
|
||||
$query->with($with);
|
||||
})->order('sort DESC,id DESC')->select()->toArray();
|
||||
}
|
||||
}
|
||||
119
pro_v3.5.1_副本/app/dao/other/CityAreaDao.php
Normal file
119
pro_v3.5.1_副本/app/dao/other/CityAreaDao.php
Normal file
@@ -0,0 +1,119 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\CityArea;
|
||||
|
||||
/**
|
||||
* Class CityAreaDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class CityAreaDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return CityArea::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $where
|
||||
* @param bool $search
|
||||
* @return \crmeb\basic\BaseModel
|
||||
* @throws \ReflectionException
|
||||
* @author 等风来
|
||||
* @email 136327134@qq.com
|
||||
* @date 2023/10/7
|
||||
*/
|
||||
public function search(array $where = [], bool $search = false)
|
||||
{
|
||||
return parent::search($where, $search)->when(isset($where['pid']) && $where['pid'] !== '', function ($query) use ($where) {
|
||||
$query->where('parent_id', $where['pid']);
|
||||
})->when(isset($where['address']) && $where['address'] !== '', function ($query) use ($where) {
|
||||
$address = explode('/', trim($where['address'], '/'));
|
||||
if (isset($address[0]) && isset($address[1]) && $address[0] == $address[1]) {//直辖市:北京市北京市朝阳区
|
||||
array_shift($address);
|
||||
}
|
||||
$p = array_shift($address);
|
||||
// if (mb_strlen($p) - 1 === mb_strpos($p, '市')) {
|
||||
// $p = mb_substr($p, 0, -1);
|
||||
// } elseif (mb_strlen($p) - 1 === mb_strpos($p, '省')) {
|
||||
// $p = mb_substr($p, 0, -1);
|
||||
// } elseif (mb_strlen($p) - 3 === mb_strpos($p, '自治区')) {
|
||||
// $p = mb_substr($p, 0, -3);
|
||||
// $p = str_replace(['壮族', '回族', '维吾尔'], '', $p);
|
||||
// }
|
||||
$pcity = $this->getModel()->where('name', $p)->value('id');
|
||||
$path = ['', $pcity];
|
||||
$street = $p;
|
||||
$i = 0;
|
||||
foreach ($address as $item) {
|
||||
//县级市,只有三级地址;市和县相同
|
||||
if ($item == ($address[$i - 1] ?? '')) continue;
|
||||
$pcity = $this->getModel()->whereLike('path', implode('/', $path) . '/%')->where('name', $item)->value('id');
|
||||
if (!$pcity) {
|
||||
break;
|
||||
}
|
||||
$path[] = $pcity;
|
||||
$street = $item;
|
||||
$i++;
|
||||
}
|
||||
array_pop($path);
|
||||
$query->whereLike('path', implode('/', $path) . '/%')->where('name', $street);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 搜索某个地址
|
||||
* @param array $where
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function searchCity(array $where)
|
||||
{
|
||||
return $this->search($where)->order('id DESC')->find();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取地址
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param array $with
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getCityList(array $where, string $field = '*', array $with = [])
|
||||
{
|
||||
return $this->getModel()->where($where)->field($field)->with($with)->order('id asc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除上级城市和当前城市id
|
||||
* @param int $cityId
|
||||
* @return bool
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function deleteCity(int $cityId)
|
||||
{
|
||||
return $this->getModel()->where('id', $cityId)->whereOr('parent_id', $cityId)->delete();
|
||||
}
|
||||
}
|
||||
76
pro_v3.5.1_副本/app/dao/other/ExpressDao.php
Normal file
76
pro_v3.5.1_副本/app/dao/other/ExpressDao.php
Normal file
@@ -0,0 +1,76 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\Express;
|
||||
|
||||
/**
|
||||
* 物流信息
|
||||
* Class ExpressDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class ExpressDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return Express::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取物流列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getExpressList(array $where, string $field, int $page, int $limit)
|
||||
{
|
||||
return $this->search($where)->field($field)->order('sort DESC,id asc')
|
||||
->when($page > 0 && $limit > 0, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 指定的条件获取物流信息以数组返回
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param string $key
|
||||
* @return array
|
||||
*/
|
||||
public function getExpress(array $where, string $field, string $key)
|
||||
{
|
||||
return $this->search($where)->order('id DESC')->column($field, $key);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过code获取一条信息
|
||||
* @param string $code
|
||||
* @param string $field
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getExpressByCode(string $code, string $field = '*')
|
||||
{
|
||||
return $this->getModel()->field($field)->where('code', $code)->find();
|
||||
}
|
||||
}
|
||||
34
pro_v3.5.1_副本/app/dao/other/Import/ImportRecordDao.php
Normal file
34
pro_v3.5.1_副本/app/dao/other/Import/ImportRecordDao.php
Normal file
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other\Import;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\import\ImportRecord;
|
||||
|
||||
/**
|
||||
* 导入数据
|
||||
* Class ImportRecordDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class ImportRecordDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function setModel(): string
|
||||
{
|
||||
return ImportRecord::class;
|
||||
}
|
||||
|
||||
}
|
||||
34
pro_v3.5.1_副本/app/dao/other/Import/ImportRecordErrorDao.php
Normal file
34
pro_v3.5.1_副本/app/dao/other/Import/ImportRecordErrorDao.php
Normal file
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other\Import;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\import\ImportRecordError;
|
||||
|
||||
/**
|
||||
* 导入数据错误
|
||||
* Class ImportRecordDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class ImportRecordErrorDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function setModel(): string
|
||||
{
|
||||
return ImportRecordError::class;
|
||||
}
|
||||
|
||||
}
|
||||
59
pro_v3.5.1_副本/app/dao/other/QrcodeDao.php
Normal file
59
pro_v3.5.1_副本/app/dao/other/QrcodeDao.php
Normal file
@@ -0,0 +1,59 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
declare (strict_types=1);
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\Qrcode;
|
||||
|
||||
/**
|
||||
*
|
||||
* Class QrcodeDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class QrcodeDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return Qrcode::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取一条二维码
|
||||
* @param $id
|
||||
* @param string $type
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getQrcode($id, $type = 'id')
|
||||
{
|
||||
return $this->getModel()->where($type, $id)->find();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改二维码使用状态
|
||||
* @param $id
|
||||
* @param string $type
|
||||
* @return mixed
|
||||
*/
|
||||
public function scanQrcode($id, $type = 'id')
|
||||
{
|
||||
return $this->getModel()->where($type, $id)->inc('scan')->update();
|
||||
}
|
||||
}
|
||||
90
pro_v3.5.1_副本/app/dao/other/SystemCityDao.php
Normal file
90
pro_v3.5.1_副本/app/dao/other/SystemCityDao.php
Normal file
@@ -0,0 +1,90 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\SystemCity;
|
||||
|
||||
/**
|
||||
* 城市数据
|
||||
* Class SystemCityDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class SystemCityDao extends BaseDao
|
||||
{
|
||||
/**
|
||||
* 设置模型
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return SystemCity::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取城市数据列表
|
||||
* @param array $where
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getCityList(array $where, string $field = '*')
|
||||
{
|
||||
return $this->search($where)->field($field)->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取城市数据以数组形式返回
|
||||
* @param array $where
|
||||
* @param string $field
|
||||
* @param string $key
|
||||
* @return array
|
||||
*/
|
||||
public function getCityArray(array $where, string $field, string $key)
|
||||
{
|
||||
return $this->search($where)->column($field, $key);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除上级城市和当前城市id
|
||||
* @param int $cityId
|
||||
* @return bool
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function deleteCity(int $cityId)
|
||||
{
|
||||
return $this->getModel()->where('city_id', $cityId)->whereOr('parent_id', $cityId)->delete();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取city_id的最大值
|
||||
* @return mixed
|
||||
*/
|
||||
public function getCityIdMax()
|
||||
{
|
||||
return $this->getModel()->max('city_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取运费模板城市选择
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getShippingCity()
|
||||
{
|
||||
return $this->getModel()->with('children')->where('parent_id', 0)->order('id asc')->select()->toArray();
|
||||
}
|
||||
}
|
||||
108
pro_v3.5.1_副本/app/dao/other/queue/QueueAuxiliaryDao.php
Normal file
108
pro_v3.5.1_副本/app/dao/other/queue/QueueAuxiliaryDao.php
Normal file
@@ -0,0 +1,108 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other\queue;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\queue\QueueAuxiliary;
|
||||
|
||||
/**
|
||||
* 队列辅助
|
||||
* Class QueueAuxiliaryDao
|
||||
* @package app\dao\other\queue
|
||||
*/
|
||||
class QueueAuxiliaryDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
protected function setModel(): string
|
||||
{
|
||||
return QueueAuxiliary::class;
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加订单缓存记录
|
||||
* @param array $data
|
||||
* @return int|string
|
||||
*/
|
||||
public function saveOrderCacheLog(array $data)
|
||||
{
|
||||
return $this->getModel()->insertGetId($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取发货缓存数据列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getOrderExpreList(array $where, int $page = 0, int $limit = 0)
|
||||
{
|
||||
return $this->search($where)->when($page && $limit, function ($query) use ($page, $limit) {
|
||||
$query->page($page, $limit);
|
||||
})->order('add_time asc')->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单条订单缓存数据
|
||||
* @param array $where
|
||||
* @return array|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getOrderCacheOne(array $where)
|
||||
{
|
||||
return $this->search($where)->find();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取发货记录
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @param string $order
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function deliveryLogList(array $where, int $page = 0, int $limit = 0, string $order = '')
|
||||
{
|
||||
foreach ($where as $k => $v) {
|
||||
if ($v == "") unset($where[$k]);
|
||||
}
|
||||
return $this->search($where)
|
||||
->order(($order ? $order . ' ,' : '') . 'add_time desc')
|
||||
->page($page, $limit)->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某个队列的数据缓存
|
||||
* @param $bindingId
|
||||
* @param $type
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getCacheOidList($bindingId, $type)
|
||||
{
|
||||
return $this->search(['binding_id' => $bindingId, 'type' => $type])->select()->toArray();
|
||||
}
|
||||
}
|
||||
128
pro_v3.5.1_副本/app/dao/other/queue/QueueDao.php
Normal file
128
pro_v3.5.1_副本/app/dao/other/queue/QueueDao.php
Normal file
@@ -0,0 +1,128 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\dao\other\queue;
|
||||
|
||||
|
||||
use app\dao\BaseDao;
|
||||
use app\model\other\queue\Queue;
|
||||
|
||||
/**
|
||||
* 队列
|
||||
* Class QueueDao
|
||||
* @package app\dao\other
|
||||
*/
|
||||
class QueueDao extends BaseDao
|
||||
{
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function setModel(): string
|
||||
{
|
||||
return Queue::class;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 队列任务列表
|
||||
* @param array $where
|
||||
* @param int $page
|
||||
* @param int $limit
|
||||
* @param string $order
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getList(array $where, int $page = 0, int $limit = 0, string $order = '')
|
||||
{
|
||||
foreach ($where as $k => $v) {
|
||||
if ($v == "") unset($where[$k]);
|
||||
}
|
||||
return $this->search($where)
|
||||
->order(($order ? $order . ' ,' : '') . 'add_time desc')
|
||||
->page($page, $limit)->select()->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单个队列详情
|
||||
* @param array $where
|
||||
* @return array|bool|\think\Model|null
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function getQueueOne(array $where)
|
||||
{
|
||||
if (!$where) return false;
|
||||
return $this->search($where)->order('id desc')->find();
|
||||
}
|
||||
|
||||
/**
|
||||
* 加入队列数据表
|
||||
* @param string $queueName
|
||||
* @param int $queueDataNum
|
||||
* @param int $type
|
||||
* @param string $redisKey
|
||||
* @param string $source
|
||||
* @return mixed
|
||||
*/
|
||||
public function addQueueList(string $queueName, int $queueDataNum, int $type, string $redisKey, string $source = "admin")
|
||||
{
|
||||
$data = [
|
||||
'type' => $type,
|
||||
'source' => $source,
|
||||
'execute_key' => $redisKey ? $redisKey : '',
|
||||
'title' => $queueName,
|
||||
'status' => 0,
|
||||
'surplus_num' => $queueDataNum,
|
||||
'total_num' => $queueDataNum,
|
||||
'add_time' => time(),
|
||||
];
|
||||
return $this->getModel()->insertGetId($data);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 将队列置为正在执行状态
|
||||
* @param $queueInValue
|
||||
* @param $queueId
|
||||
* @return bool|mixed
|
||||
*/
|
||||
public function setQueueDoing($queueInValue, $queueId, bool $is_again = false)
|
||||
{
|
||||
$saveData['queue_in_value'] = is_array($queueInValue) ? json_encode($queueInValue) : $queueInValue;
|
||||
$saveData['status'] = 1;
|
||||
if ($is_again) {
|
||||
$saveData['again_time'] = time();
|
||||
} else {
|
||||
$saveData['first_time'] = time();
|
||||
}
|
||||
return $this->getModel()->update($saveData, ['id' => $queueId]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 停止队列
|
||||
* @param $queueId
|
||||
* @return \crmeb\basic\BaseModel
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
*/
|
||||
public function stopWrongQueue($queueId)
|
||||
{
|
||||
$queueInfo = $this->getModel()->where(['id' => $queueId])->find();
|
||||
if (!$queueInfo) return false;
|
||||
return $this->getModel()->update(['id' => $queueId], ['status' => 3]);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user