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

app/common/model/ActivityZone.php

@@ -18,6 +18,8 @@ class ActivityZone extends BaseModel
     use SoftDelete;
     protected $name = 'activity_zone';
     protected $deleteTime = 'delete_time';
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
     
     public function product()
     {

app/common/model/ActivityZoneForm.php

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

app/common/model/Config.php

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

app/common/model/OperationLog.php

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

app/common/model/app_update/AppUpdate.php

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

app/common/model/auth/Admin.php

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

app/common/model/auth/AdminDept.php

@@ -18,6 +18,8 @@ use app\common\model\BaseModel;
 
 class AdminDept extends BaseModel
 {
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
     /**
      * @notes 删除用户关联部门
      * @param $adminId

app/common/model/auth/AdminJobs.php

@@ -18,6 +18,8 @@ use app\common\model\BaseModel;
 
 class AdminJobs extends BaseModel
 {
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
     /**
      * @notes 删除用户关联岗位
      * @param $adminId

app/common/model/auth/AdminRole.php

@@ -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();
     }
-
 }

app/common/model/auth/AdminSession.php

@@ -18,6 +18,8 @@ use app\common\model\BaseModel;
 
 class AdminSession extends BaseModel
 {
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
     /**
      * @notes 关联管理员表
      * @return \think\model\relation\HasOne

app/common/model/auth/SystemMenu.php

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

app/common/model/auth/SystemRole.php

@@ -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';

app/common/model/auth/SystemRoleMenu.php

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

app/common/model/beforehand_order/BeforehandOrder.php

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

app/common/model/beforehand_order_cart_info/BeforehandOrderCartInfo.php

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

app/common/model/beforehand_order_record/BeforehandOrderRecord.php

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

app/common/model/cate/Cate.php

@@ -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){

app/common/model/delivery_service/DeliveryService.php

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

app/common/model/dept/Dept.php

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

app/common/model/dept/Jobs.php

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

app/common/model/dict/DictData.php

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

app/common/model/dict/DictType.php

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

app/common/model/distribution/Distribution.php

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

app/common/model/file/File.php

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

app/common/model/file/FileCate.php

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

app/common/model/finance/CapitalFlow.php

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

app/common/model/finance/PayNotifyLog.php

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

app/common/model/financial_transfers/FinancialTransfers.php

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

app/common/model/geo/GeoArea.php

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

app/common/model/geo/GeoBrigade.php

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

app/common/model/geo/GeoCity.php

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

app/common/model/geo/GeoProvince.php

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

app/common/model/geo/GeoStreet.php

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

app/common/model/geo/GeoVillage.php

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

app/common/model/merchant/Merchant.php

@@ -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']);

app/common/model/order/Cart.php

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

app/common/model/pay/PayConfig.php

@@ -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'];
 

app/common/model/pay/PayNotify.php

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

app/common/model/pay/PayWay.php

@@ -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);

app/common/model/purchase_order/PurchaseOrder.php

@@ -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;
 }

app/common/model/purchase_order_info/PurchaseOrderInfo.php

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

app/common/model/purchase_product_offer/PurchaseProductOffer.php

@@ -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;
 

app/common/model/setting/Category.php

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

app/common/model/store_branch_product_attr_value/StoreBranchProductAttrValue.php

@@ -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']);

app/common/model/store_branch_product_exchange/StoreBranchProductExchange.php

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

app/common/model/store_cash_finance_flow/StoreCashFinanceFlow.php

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

app/common/model/store_category/StoreCategory.php

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

app/common/model/store_extract/StoreExtract.php

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

app/common/model/store_finance_flow/StoreFinanceFlow.php

@@ -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')

app/common/model/store_finance_flow_product/StoreFinanceFlowProduct.php

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

app/common/model/store_order/StoreOrder.php

@@ -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){
+        if ($data['store_id'] > 0) {
-            $name = SystemStore::where('id',$data['store_id'])->value('name');
+            $name = SystemStore::where('id', $data['store_id'])->value('name');
-        }else{
+        } 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){
+                if ($find) {
-                    channelLog(array_merge($find->toArray(), $where),'store_order','更新前');
+                    channelLog(array_merge($find->toArray(), $where), 'store_order', '更新前');
                 }
             }
         } catch (Throwable $e) {
@@ -116,11 +118,12 @@ class StoreOrder extends BaseModel
         }
     }
 
-    public static function onAfterWrite($data){
+    public static function onAfterWrite($data)
-        try{
+    {
-            channelLog($data->toArray(),'store_order','更新后');
+        try {
-        }catch(Throwable $e){
+            channelLog($data->toArray(), 'store_order', '更新后');
-            Log::error('store_order:更新后'.$e->getMessage());
+        } catch (Throwable $e) {
+            Log::error('store_order:更新后' . $e->getMessage());
         }
     }
 }

app/common/model/store_order_cart_info/StoreOrderCartInfo.php

@@ -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']);

app/common/model/store_order_transshipment_info/StoreOrderTransshipmentInfo.php

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

app/common/model/store_product_attr_value/StoreProductAttrValue.php

@@ -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')

app/common/model/store_product_cate/StoreProductCate.php

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

app/common/model/store_product_gift/StoreProductGift.php

@@ -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')

app/common/model/store_product_group_price/StoreProductGroupPrice.php

@@ -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');

app/common/model/store_product_log/StoreProductLog.php

@@ -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')

app/common/model/store_product_price/StoreProductPrice.php

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

app/common/model/store_product_unit/StoreProductUnit.php

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

app/common/model/store_visit/StoreVisit.php

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

app/common/model/supplier/Supplier.php

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

app/common/model/system_store/DeliveryService.php

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

app/common/model/system_store/SystemStore.php

@@ -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 {

app/common/model/system_store/SystemStoreMenu.php

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

app/common/model/system_store/SystemStoreStaff.php

@@ -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

app/common/model/system_store/SystemStoreStaffSession.php

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

app/common/model/tools/GenerateColumn.php

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

app/common/model/tools/GenerateTable.php

@@ -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

app/common/model/user/User.php

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

app/common/model/user/UserAddress.php

@@ -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();

app/common/model/user/UserAuth.php

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

app/common/model/user/UserFeedback.php

@@ -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) : '';
     }

app/common/model/user/UserRecharge.php

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

app/common/model/user/UserSession.php

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

app/common/model/user/UserVisit.php

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

app/common/model/user_bill/UserBill.php

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

app/common/model/user_create_log/UserCreateLog.php

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

app/common/model/user_label/UserLabel.php

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

app/common/model/user_product_storage/UserProductStorage.php

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

app/common/model/user_product_storage_log/UserProductStorageLog.php

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

app/common/model/user_recharge/UserRecharge.php

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

app/common/model/user_ship/UserShip.php

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

app/common/model/user_sign/UserSign.php

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

app/common/model/user_sign_log/UserSignLog.php

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

app/common/model/user_spread_log/UserSpreadLog.php

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

app/common/model/vip_flow/VipFlow.php

@@ -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')

app/common/model/warehouse/Warehouse.php

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

app/common/model/warehouse_order/WarehouseOrder.php

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

app/common/model/warehouse_product_return/WarehouseProductReturn.php

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