mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
lewis 2025-01-04 10:36:56 +08:00
commit 8ec78fe7d0
90 changed files with 210 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/model/ActivityZone.php
View File

@ -18,7 +18,9 @@ class ActivityZone extends BaseModel
use SoftDelete;
protected $name = 'activity_zone';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function product()
{
return $this->hasOne(StoreProduct::class, 'id', 'product_id')->bind(['store_name', 'unit']);

3
app/common/model/ActivityZoneForm.php
View File

@ -15,5 +15,6 @@ class ActivityZoneForm extends BaseModel
use SoftDelete;
protected $name = 'activity_zone_form';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/Config.php
View File

@ -6,5 +6,6 @@ namespace app\common\model;
class Config extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/OperationLog.php
View File

@ -7,5 +7,6 @@ namespace app\common\model;
class OperationLog extends BaseModel
{
// protected $json = ['params'];
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/app_update/AppUpdate.php
View File

@ -17,6 +17,7 @@ class AppUpdate extends BaseModel
use SoftDelete;
protected $name = 'app_update';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/auth/Admin.php
View File

@ -12,7 +12,8 @@ use think\model\concern\SoftDelete;
class Admin extends BaseModel
{
use SoftDelete;
// 不生成该表的日志
public $doNotRecordLog = true;
protected $deleteTime = 'delete_time';
protected $append = [

4
app/common/model/auth/AdminDept.php
View File

@ -18,6 +18,8 @@ use app\common\model\BaseModel;
class AdminDept extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 删除用户关联部门
* @param $adminId
@ -29,4 +31,4 @@ class AdminDept extends BaseModel
{
return self::where(['admin_id' => $adminId])->delete();
}
}
}

4
app/common/model/auth/AdminJobs.php
View File

@ -18,6 +18,8 @@ use app\common\model\BaseModel;
class AdminJobs extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 删除用户关联岗位
* @param $adminId
@ -29,4 +31,4 @@ class AdminJobs extends BaseModel
{
return self::where(['admin_id' => $adminId])->delete();
}
}
}

5
app/common/model/auth/AdminRole.php
View File

@ -19,6 +19,8 @@ use app\common\model\BaseModel;
class AdminRole extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 删除用户关联角色
* @param $adminId
@ -30,5 +32,4 @@ class AdminRole extends BaseModel
{
return self::where(['admin_id' => $adminId])->delete();
}
}
}

4
app/common/model/auth/AdminSession.php
View File

@ -18,6 +18,8 @@ use app\common\model\BaseModel;
class AdminSession extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 关联管理员表
* @return \think\model\relation\HasOne
@ -29,4 +31,4 @@ class AdminSession extends BaseModel
return $this->hasOne(Admin::class, 'id', 'admin_id')
->field('id,multipoint_login');
}
}
}

3
app/common/model/auth/SystemMenu.php
View File

@ -25,7 +25,8 @@ use app\common\model\BaseModel;
*/
class SystemMenu extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/auth/SystemRole.php
View File

@ -25,7 +25,8 @@ use think\model\concern\SoftDelete;
class SystemRole extends BaseModel
{
use SoftDelete;
// 不生成该表的日志
public $doNotRecordLog = true;
protected $deleteTime = 'delete_time';
protected $name = 'system_role';

3
app/common/model/auth/SystemRoleMenu.php
View File

@ -25,6 +25,7 @@ use app\common\model\BaseModel;
*/
class SystemRoleMenu extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/beforehand_order/BeforehandOrder.php
View File

@ -18,6 +18,7 @@ class BeforehandOrder extends BaseModel
protected $name = 'beforehand_order';
protected $deleteTime = 'delete_time';
protected $json = ['other_data'];
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/beforehand_order_cart_info/BeforehandOrderCartInfo.php
View File

@ -17,6 +17,7 @@ class BeforehandOrderCartInfo extends BaseModel
use SoftDelete;
protected $name = 'beforehand_order_cart_info';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/beforehand_order_record/BeforehandOrderRecord.php
View File

@ -17,6 +17,7 @@ class BeforehandOrderRecord extends BaseModel
use SoftDelete;
protected $name = 'beforehand_order_record';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/cate/Cate.php
View File

@ -17,7 +17,8 @@ class Cate extends BaseModel
use SoftDelete;
protected $name = 'store_category';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function getChildrenAttr($value)
{
if($value){

3
app/common/model/delivery_service/DeliveryService.php
View File

@ -17,6 +17,7 @@ class DeliveryService extends BaseModel
use SoftDelete;
protected $name = 'delivery_service';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/dept/Dept.php
View File

@ -29,7 +29,8 @@ class Dept extends BaseModel
use SoftDelete;
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 状态描述
* @param $value

3
app/common/model/dept/Jobs.php
View File

@ -28,7 +28,8 @@ class Jobs extends BaseModel
use SoftDelete;
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 状态描述
* @param $value

3
app/common/model/dict/DictData.php
View File

@ -30,7 +30,8 @@ class DictData extends BaseModel
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 状态描述
* @param $value

3
app/common/model/dict/DictType.php
View File

@ -29,7 +29,8 @@ class DictType extends BaseModel
use SoftDelete;
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 状态描述

3
app/common/model/distribution/Distribution.php
View File

@ -17,6 +17,7 @@ class Distribution extends BaseModel
use SoftDelete;
protected $name = 'distribution';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

4
app/common/model/file/File.php
View File

@ -21,4 +21,6 @@ class File extends BaseModel
{
use SoftDelete;
protected $deleteTime = 'delete_time';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

4
app/common/model/file/FileCate.php
View File

@ -22,4 +22,6 @@ class FileCate extends BaseModel
{
use SoftDelete;
protected $deleteTime = 'delete_time';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/finance/CapitalFlow.php
View File

@ -9,5 +9,6 @@ class CapitalFlow extends BaseModel
{
use SoftDelete;
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/finance/PayNotifyLog.php
View File

@ -6,7 +6,8 @@ use app\common\model\BaseModel;
class PayNotifyLog extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
const TYPE_ORDER = 1;
const TYPE_REFUND = 2;

3
app/common/model/financial_transfers/FinancialTransfers.php
View File

@ -20,7 +20,8 @@ class FinancialTransfers extends BaseModel
use SoftDelete;
protected $name = 'financial_transfers';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function store()
{

3
app/common/model/geo/GeoArea.php
View File

@ -12,5 +12,6 @@ class GeoArea extends BaseModel
{
protected $name = 'geo_area';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/geo/GeoBrigade.php
View File

@ -12,5 +12,6 @@ class GeoBrigade extends BaseModel
{
protected $name = 'geo_brigade';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/geo/GeoCity.php
View File

@ -12,5 +12,6 @@ class GeoCity extends BaseModel
{
protected $name = 'geo_city';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/geo/GeoProvince.php
View File

@ -12,5 +12,6 @@ class GeoProvince extends BaseModel
{
protected $name = 'geo_province';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/geo/GeoStreet.php
View File

@ -12,5 +12,6 @@ class GeoStreet extends BaseModel
{
protected $name = 'geo_street';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/geo/GeoVillage.php
View File

@ -12,5 +12,6 @@ class GeoVillage extends BaseModel
{
protected $name = 'geo_village';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/merchant/Merchant.php
View File

@ -19,7 +19,8 @@ class Merchant extends BaseModel
protected $ok = 'mer_id';
protected $name = 'merchant';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function realName()
{
return $this->hasOne(User::class,'id','uid')->bind(['mer_real_name'=>'real_name']);

3
app/common/model/order/Cart.php
View File

@ -17,6 +17,7 @@ class Cart extends BaseModel
use SoftDelete;
protected $name = 'store_cart';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/pay/PayConfig.php
View File

@ -11,7 +11,8 @@ use app\common\service\FileService;
class PayConfig extends BaseModel
{
protected $name = 'dev_pay_config';
// 不生成该表的日志
public $doNotRecordLog = true;
// 设置json类型字段
protected $json = ['config'];

4
app/common/model/pay/PayNotify.php
View File

@ -7,4 +7,6 @@ use app\common\model\BaseModel;
class PayNotify extends BaseModel
{
protected $name = 'pay_notify_log';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/pay/PayWay.php
View File

@ -22,7 +22,8 @@ use app\common\service\FileService;
class PayWay extends BaseModel
{
protected $name = 'dev_pay_way';
// 不生成该表的日志
public $doNotRecordLog = true;
public function getIconAttr($value,$data)
{
return FileService::getFileUrl($value);

7
app/common/model/purchase_order/PurchaseOrder.php
View File

@ -17,6 +17,7 @@ class PurchaseOrder extends BaseModel
use SoftDelete;
protected $name = 'purchase_order';
protected $deleteTime = 'delete_time';
protected $json = ['order_arr','store_arr'];
}
protected $json = ['order_arr', 'store_arr'];
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/purchase_order_info/PurchaseOrderInfo.php
View File

@ -17,6 +17,7 @@ class PurchaseOrderInfo extends BaseModel
use SoftDelete;
protected $name = 'purchase_order_info';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/purchase_product_offer/PurchaseProductOffer.php
View File

@ -18,7 +18,8 @@ class PurchaseProductOffer extends BaseModel
use SoftDelete;
protected $name = 'purchase_product_offer';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
protected $json = ['source_order_info'];
protected $jsonAssoc = true;

3
app/common/model/setting/Category.php
View File

@ -17,6 +17,7 @@ class Category extends BaseModel
use SoftDelete;
protected $name = 'category';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/store_branch_product_attr_value/StoreBranchProductAttrValue.php
View File

@ -19,7 +19,8 @@ class StoreBranchProductAttrValue extends BaseModel
use SoftDelete;
protected $name = 'store_branch_product_attr_value';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function attr()
{
return $this->hasOne(StoreBranchProduct::class, 'product_id', 'product_id')->bind(['image']);

3
app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php
View File

@ -20,5 +20,6 @@ class StoreBranchProductExchange extends BaseModel
use SoftDelete;
protected $name = 'store_branch_product_exchange';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

5
app/common/model/store_cash_finance_flow/StoreCashFinanceFlow.php
View File

@ -18,5 +18,6 @@ class StoreCashFinanceFlow extends BaseModel
protected $name = 'store_cash_finance_flow';
protected $deleteTime = 'delete_time';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

5
app/common/model/store_category/StoreCategory.php
View File

@ -21,5 +21,6 @@ class StoreCategory extends BaseModel
protected $json = ['price_rate'];
protected $jsonAssoc = true;
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/store_extract/StoreExtract.php
View File

@ -17,6 +17,7 @@ class StoreExtract extends BaseModel
use SoftDelete;
protected $name = 'store_extract';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/store_finance_flow/StoreFinanceFlow.php
View File

@ -21,7 +21,8 @@ class StoreFinanceFlow extends BaseModel
use SoftDelete;
protected $name = 'store_finance_flow';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function store()
{
return $this->hasOne(SystemStore::class, 'id','store_id')

4
app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php
View File

@ -18,4 +18,6 @@ class StoreFinanceFlowProduct extends BaseModel
use SoftDelete;
protected $name = 'store_finance_flow_product';
protected $deleteTime = 'delete_time';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

33
app/common/model/store_order/StoreOrder.php
View File

@ -23,6 +23,8 @@ class StoreOrder extends BaseModel
use SoftDelete;
protected $name = 'store_order';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
// public function getPayTimeAttr($value)
// {
// return $value?date('Y-m-d H:i:s', $value):'';
@ -40,9 +42,9 @@ class StoreOrder extends BaseModel
}
public function getSystemStoreNameTextAttr($value, $data)
{
if($data['store_id']>0){
$name = SystemStore::where('id',$data['store_id'])->value('name');
}else{
if ($data['store_id'] > 0) {
$name = SystemStore::where('id', $data['store_id'])->value('name');
} else {
$name = '无';
}
return $name;
@ -50,9 +52,9 @@ class StoreOrder extends BaseModel
public function getStatusNameTextAttr($value, $data)
{
if($data['status']==-1){
if ($data['status'] == -1) {
$status = OrderEnum::refundStatus($data['refund_status']) ?? '';
}else{
} else {
$status = OrderEnum::getOrderType($data['status']) ?? '';
}
return $status;
@ -72,7 +74,7 @@ class StoreOrder extends BaseModel
{
return $this->hasOne(SystemStoreStaff::class, 'id', 'staff_id')->bind(['staff_name']);
}
/**
/**
* 总销售额
* @param $time
* @return float
@ -92,7 +94,7 @@ class StoreOrder extends BaseModel
{
return $this->where($where)->where('paid', 1)->where('refund_status', '=', 0)->where(function ($query) use ($time) {
if ($time[0] == $time[1]) {
$query->whereDay('create_time', date('Y-m-d',$time[0]));
$query->whereDay('create_time', date('Y-m-d', $time[0]));
} else {
$time[1] = $time[1] + 86400;
$query->whereTime('create_time', 'between', $time);
@ -105,10 +107,10 @@ class StoreOrder extends BaseModel
{
try {
$where = $data->getWhere();
if($data){
if ($data) {
$find = self::where($where)->field(array_keys($data->toArray()))->find();
if($find){
channelLog(array_merge($find->toArray(), $where),'store_order','更新前');
if ($find) {
channelLog(array_merge($find->toArray(), $where), 'store_order', '更新前');
}
}
} catch (Throwable $e) {
@ -116,11 +118,12 @@ class StoreOrder extends BaseModel
}
}
public static function onAfterWrite($data){
try{
channelLog($data->toArray(),'store_order','更新后');
}catch(Throwable $e){
Log::error('store_order:更新后'.$e->getMessage());
public static function onAfterWrite($data)
{
try {
channelLog($data->toArray(), 'store_order', '更新后');
} catch (Throwable $e) {
Log::error('store_order:更新后' . $e->getMessage());
}
}
}

3
app/common/model/store_order_cart_info/StoreOrderCartInfo.php
View File

@ -15,7 +15,8 @@ class StoreOrderCartInfo extends BaseModel
protected $deleteTime = 'delete_time';
protected $json = ['cart_info'];
protected $jsonAssoc = true;
// 不生成该表的日志
public $doNotRecordLog = true;
public function goodsName()
{
return $this->hasOne(StoreBranchProduct::class,'id','product_id')->bind(['store_name','image','unit','price']);

4
app/common/model/store_order_transshipment_info/StoreOrderTransshipmentInfo.php
View File

@ -16,7 +16,5 @@ class StoreOrderTransshipmentInfo extends BaseModel
{
use SoftDelete;
protected $name = 'store_order_transshipment_info';
protected $deleteTime = 'delete_time';
protected $deleteTime = 'delete_time';
}

3
app/common/model/store_product_attr_value/StoreProductAttrValue.php
View File

@ -18,7 +18,8 @@ class StoreProductAttrValue extends BaseModel
use SoftDelete;
protected $name = 'store_product_attr_value';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function storeName()
{
return $this->belongsTo(StoreProduct::class, 'product_id', 'id')

3
app/common/model/store_product_cate/StoreProductCate.php
View File

@ -10,5 +10,6 @@ class StoreProductCate extends BaseModel
use SoftDelete;
protected $name = 'store_product_cate';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/store_product_gift/StoreProductGift.php
View File

@ -14,7 +14,8 @@ class StoreProductGift extends BaseModel
use SoftDelete;
protected $name = 'store_product_gift';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function store()
{
return $this->hasOne(SystemStore::class, 'id', 'store_id')

3
app/common/model/store_product_group_price/StoreProductGroupPrice.php
View File

@ -17,7 +17,8 @@ class StoreProductGroupPrice extends BaseModel
use SoftDelete;
protected $name = 'store_product_group_price';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public static function resetProductsPrice($productList, $userShip)
{
$productIds = array_column($productList, 'product_id');

3
app/common/model/store_product_log/StoreProductLog.php
View File

@ -18,7 +18,8 @@ class StoreProductLog extends BaseModel
use SoftDelete;
protected $name = 'store_product_log';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function store()
{
return $this->hasOne(SystemStore::class, 'id', 'store_id')

3
app/common/model/store_product_price/StoreProductPrice.php
View File

@ -20,5 +20,6 @@ class StoreProductPrice extends BaseModel
protected $json = ['price_config'];
protected $jsonAssoc = true;
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/store_product_unit/StoreProductUnit.php
View File

@ -17,6 +17,7 @@ class StoreProductUnit extends BaseModel
use SoftDelete;
protected $name = 'store_product_unit';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/store_visit/StoreVisit.php
View File

@ -17,6 +17,7 @@ class StoreVisit extends BaseModel
use SoftDelete;
protected $name = 'store_visit';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/supplier/Supplier.php
View File

@ -17,6 +17,7 @@ class Supplier extends BaseModel
use SoftDelete;
protected $name = 'supplier';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/system_store/DeliveryService.php
View File

@ -17,7 +17,8 @@ class DeliveryService extends BaseModel
protected $name = 'delivery_service';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 头像获取器 - 头像路径添加域名
* @param $value

3
app/common/model/system_store/SystemStore.php
View File

@ -18,7 +18,8 @@ class SystemStore extends BaseModel
use SoftDelete;
protected $name = 'system_store';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public static function onBeforeWrite($data)
{
try {

3
app/common/model/system_store/SystemStoreMenu.php
View File

@ -28,6 +28,7 @@ class SystemStoreMenu extends BaseModel
{
use SoftDelete;
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/system_store/SystemStoreStaff.php
View File

@ -18,7 +18,8 @@ class SystemStoreStaff extends BaseModel
use SoftDelete;
protected $name = 'system_store_staff';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 头像获取器 - 头像路径添加域名
* @param $value

3
app/common/model/system_store/SystemStoreStaffSession.php
View File

@ -10,5 +10,6 @@ class SystemStoreStaffSession extends BaseModel
protected $name = 'system_store_staff_session';
protected $createTime = false;
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/tools/GenerateColumn.php
View File

@ -25,7 +25,8 @@ use app\common\model\BaseModel;
*/
class GenerateColumn extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 关联table表
* @return \think\model\relation\BelongsTo

3
app/common/model/tools/GenerateTable.php
View File

@ -29,7 +29,8 @@ class GenerateTable extends BaseModel
protected $json = ['menu', 'tree', 'relations', 'delete'];
protected $jsonAssoc = true;
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* @notes 关联数据表字段
* @return \think\model\relation\HasMany

3
app/common/model/user/User.php
View File

@ -23,7 +23,8 @@ class User extends BaseModel
use SoftDelete;
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
//会员类型
public function userShip()
{

3
app/common/model/user/UserAddress.php
View File

@ -22,7 +22,8 @@ class UserAddress extends BaseModel
protected $pk = 'id';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public static function getDefaultAddress($uid)
{
$address = self::with(['area', 'street', 'village', 'brigade'])->where(['uid' => $uid, 'is_default' => 1])->find();

3
app/common/model/user/UserAuth.php
View File

@ -13,5 +13,6 @@ use app\common\model\BaseModel;
*/
class UserAuth extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user/UserFeedback.php
View File

@ -17,7 +17,8 @@ class UserFeedback extends BaseModel
use SoftDelete;
protected $name = 'user_feedback';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function getImagesAttr($value){
return !empty($value) ? json_decode($value,true) : '';
}

3
app/common/model/user/UserRecharge.php
View File

@ -17,5 +17,6 @@ class UserRecharge extends BaseModel
use SoftDelete;
protected $pk = 'id';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user/UserSession.php
View File

@ -11,5 +11,6 @@ use app\common\model\BaseModel;
*/
class UserSession extends BaseModel
{
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user/UserVisit.php
View File

@ -18,7 +18,8 @@ class UserVisit extends BaseModel
protected $pk = 'id';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* 用户趋势数据
* @param $time

3
app/common/model/user_bill/UserBill.php
View File

@ -17,6 +17,7 @@ class UserBill extends BaseModel
use SoftDelete;
protected $name = 'user_bill';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user_create_log/UserCreateLog.php
View File

@ -17,6 +17,7 @@ class UserCreateLog extends BaseModel
use SoftDelete;
protected $name = 'user_create_log';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user_label/UserLabel.php
View File

@ -17,6 +17,7 @@ class UserLabel extends BaseModel
use SoftDelete;
protected $name = 'user_label';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

4
app/common/model/user_product_storage/UserProductStorage.php
View File

@ -17,4 +17,6 @@ class UserProductStorage extends BaseModel
use SoftDelete;
protected $name = 'user_product_storage';
protected $deleteTime = 'delete_time';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

6
app/common/model/user_product_storage_log/UserProductStorageLog.php
View File

@ -16,5 +16,7 @@ class UserProductStorageLog extends BaseModel
{
use SoftDelete;
protected $name = 'user_product_storage_log';
protected $deleteTime = 'delete_time';
}
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user_recharge/UserRecharge.php
View File

@ -17,7 +17,8 @@ class UserRecharge extends BaseModel
use SoftDelete;
protected $name = 'user_recharge';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
/**
* 获取充值统计曲线
* @param $time

4
app/common/model/user_ship/UserShip.php
View File

@ -10,4 +10,6 @@ class UserShip extends BaseModel
use SoftDelete;
protected $name = 'user_ship';
protected $deleteTime = 'delete_time';
}
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user_sign/UserSign.php
View File

@ -17,5 +17,6 @@ class UserSign extends BaseModel
use SoftDelete;
protected $name = 'user_sign';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user_sign_log/UserSignLog.php
View File

@ -17,5 +17,6 @@ class UserSignLog extends BaseModel
use SoftDelete;
protected $name = 'user_sign_log';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/user_spread_log/UserSpreadLog.php
View File

@ -17,6 +17,7 @@ class UserSpreadLog extends BaseModel
use SoftDelete;
protected $name = 'user_spread_log';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/vip_flow/VipFlow.php
View File

@ -11,7 +11,8 @@ class VipFlow extends BaseModel
use SoftDelete;
protected $name = 'vip_flow';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function store()
{
return $this->hasOne(SystemStore::class, 'id','store_id')

3
app/common/model/warehouse/Warehouse.php
View File

@ -17,6 +17,7 @@ class Warehouse extends BaseModel
use SoftDelete;
protected $name = 'warehouse';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

3
app/common/model/warehouse_order/WarehouseOrder.php
View File

@ -17,6 +17,7 @@ class WarehouseOrder extends BaseModel
use SoftDelete;
protected $name = 'warehouse_order';
protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
}

2
app/common/model/warehouse_product_return/WarehouseProductReturn.php
View File

@ -17,6 +17,4 @@ class WarehouseProductReturn extends BaseModel
use SoftDelete;
protected $name = 'warehouse_product_return';
protected $deleteTime = 'delete_time';
}