diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php new file mode 100644 index 0000000..60bbb97 --- /dev/null +++ b/app/Models/BaseModel.php @@ -0,0 +1,15 @@ +setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s'); + } + +} diff --git a/app/Models/BillModel.php b/app/Models/BillModel.php index 1275372..c7c0a30 100644 --- a/app/Models/BillModel.php +++ b/app/Models/BillModel.php @@ -3,7 +3,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Modules\SystemUser\Models\SysUserModel; @@ -11,7 +10,7 @@ use Modules\SystemUser\Models\SysUserModel; /** * 门店账单模型(采购单完成后按门店生成;商品金额由订单汇总快照,生成后不可修改) */ -class BillModel extends Model +class BillModel extends BaseModel { use HasFactory; diff --git a/app/Models/CartModel.php b/app/Models/CartModel.php index 417ff0d..d98c05a 100644 --- a/app/Models/CartModel.php +++ b/app/Models/CartModel.php @@ -3,13 +3,12 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * 小程序购物车模型(门店订货车:按门店归属,同商品唯一行、加购合并数量) */ -class CartModel extends Model +class CartModel extends BaseModel { use HasFactory; diff --git a/app/Models/ContainerReturnModel.php b/app/Models/ContainerReturnModel.php index d0f3e79..ea484ce 100644 --- a/app/Models/ContainerReturnModel.php +++ b/app/Models/ContainerReturnModel.php @@ -3,7 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Modules\SystemUser\Models\SysUserModel; @@ -12,7 +12,7 @@ use Modules\SystemUser\Models\SysUserModel; * * 数量正数=压筐(附加金额),负数=回筐(抵扣金额);数量为 0 不写记录 */ -class ContainerReturnModel extends Model +class ContainerReturnModel extends BaseModel { use HasFactory; diff --git a/app/Models/CustomerLevelModel.php b/app/Models/CustomerLevelModel.php index 1adc553..5bd3e9e 100644 --- a/app/Models/CustomerLevelModel.php +++ b/app/Models/CustomerLevelModel.php @@ -3,7 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; use Modules\SystemTool\Models\SysFileModel; @@ -11,7 +11,7 @@ use Modules\SystemTool\Models\SysFileModel; /** * 客户等级模型(同一商品按等级上浮比例定价:售价 = 成本价 × (100 + percent) / 100) */ -class CustomerLevelModel extends Model +class CustomerLevelModel extends BaseModel { use HasFactory; diff --git a/app/Models/HomeBannerModel.php b/app/Models/HomeBannerModel.php index 45af9f4..4891aab 100644 --- a/app/Models/HomeBannerModel.php +++ b/app/Models/HomeBannerModel.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\HasOne; use Modules\SystemTool\Models\SysFileModel; /** * 小程序首页轮播图 */ -class HomeBannerModel extends Model +class HomeBannerModel extends BaseModel { /** 状态:停用 */ public const int STATUS_DISABLED = 0; diff --git a/app/Models/HomeNavModel.php b/app/Models/HomeNavModel.php index d86b9b3..067f676 100644 --- a/app/Models/HomeNavModel.php +++ b/app/Models/HomeNavModel.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\HasOne; use Modules\SystemTool\Models\SysFileModel; /** * 小程序首页宫格导航 */ -class HomeNavModel extends Model +class HomeNavModel extends BaseModel { /** 状态:停用 */ public const int STATUS_DISABLED = 0; diff --git a/app/Models/HomePromoModel.php b/app/Models/HomePromoModel.php index d910c33..9184083 100644 --- a/app/Models/HomePromoModel.php +++ b/app/Models/HomePromoModel.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\HasOne; use Modules\SystemTool\Models\SysFileModel; /** * 小程序首页促销推荐卡片 */ -class HomePromoModel extends Model +class HomePromoModel extends BaseModel { /** 状态:停用 */ public const int STATUS_DISABLED = 0; diff --git a/app/Models/HomeSpecialModel.php b/app/Models/HomeSpecialModel.php index c52f1b5..0a8cf9e 100644 --- a/app/Models/HomeSpecialModel.php +++ b/app/Models/HomeSpecialModel.php @@ -2,13 +2,13 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * 小程序首页特价推荐商品 */ -class HomeSpecialModel extends Model +class HomeSpecialModel extends BaseModel { /** 状态:停用 */ public const int STATUS_DISABLED = 0; diff --git a/app/Models/NoticeModel.php b/app/Models/NoticeModel.php index 60a4c79..8d18c0b 100644 --- a/app/Models/NoticeModel.php +++ b/app/Models/NoticeModel.php @@ -2,13 +2,13 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * 通知模型(小程序端消息:订单 / 价格变更 / 系统;store_id=0 为全员广播) */ -class NoticeModel extends Model +class NoticeModel extends BaseModel { /** 通知类型:订单 */ public const TYPE_ORDER = 'order'; diff --git a/app/Models/PaymentModel.php b/app/Models/PaymentModel.php index 5c8d172..cd3fccd 100644 --- a/app/Models/PaymentModel.php +++ b/app/Models/PaymentModel.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Modules\SystemTool\Models\SysFileModel; @@ -17,7 +17,7 @@ use Modules\SystemUser\Models\SysUserModel; * - 1 线下凭证支付:门店提交汇款凭证,后台审核通过后关联账单批量置已支付 * - 2 旺铺在线支付:调起微信/支付宝在线支付,网关回调(或主动查询)确认后自动结账 */ -class PaymentModel extends Model +class PaymentModel extends BaseModel { use HasFactory; diff --git a/app/Models/ProductCategoryModel.php b/app/Models/ProductCategoryModel.php index 5555c02..704397e 100644 --- a/app/Models/ProductCategoryModel.php +++ b/app/Models/ProductCategoryModel.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; /** * 商品分类模型(蔬菜/水果/其他,多级分类自关联) */ -class ProductCategoryModel extends Model +class ProductCategoryModel extends BaseModel { /** 状态:停用 */ public const int STATUS_DISABLED = 0; diff --git a/app/Models/ProductModel.php b/app/Models/ProductModel.php index 16211da..a656a20 100644 --- a/app/Models/ProductModel.php +++ b/app/Models/ProductModel.php @@ -4,7 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\SoftDeletes; use Modules\SystemTool\Models\SysFileModel; @@ -12,7 +12,7 @@ use Modules\SystemTool\Models\SysFileModel; /** * 商品档案模型(品名/规格包规/供应商/成本价;售价按客户等级上浮比例换算) */ -class ProductModel extends Model +class ProductModel extends BaseModel { use SoftDeletes, HasFactory; diff --git a/app/Models/PurchaseItemCheckModel.php b/app/Models/PurchaseItemCheckModel.php index dda0871..bc2284b 100644 --- a/app/Models/PurchaseItemCheckModel.php +++ b/app/Models/PurchaseItemCheckModel.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Modules\SystemUser\Models\SysUserModel; /** * 采购单单品对账标记模型(商品明细「已对账」勾选,入库持久化;存在记录=已标记) */ -class PurchaseItemCheckModel extends Model +class PurchaseItemCheckModel extends BaseModel { protected $table = 'purchase_item_check'; protected $primaryKey = 'id'; diff --git a/app/Models/PurchaseOrderModel.php b/app/Models/PurchaseOrderModel.php index 0bd264c..d43a16a 100644 --- a/app/Models/PurchaseOrderModel.php +++ b/app/Models/PurchaseOrderModel.php @@ -3,7 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Modules\SystemUser\Models\SysUserModel; @@ -11,7 +11,7 @@ use Modules\SystemUser\Models\SysUserModel; /** * 采购单模型(按门店订单汇总生成;无独立明细表,明细直接溯源订货明细 store_order_item.purchase_id) */ -class PurchaseOrderModel extends Model +class PurchaseOrderModel extends BaseModel { use HasFactory; diff --git a/app/Models/StoreModel.php b/app/Models/StoreModel.php index 9996b03..1ae5e82 100644 --- a/app/Models/StoreModel.php +++ b/app/Models/StoreModel.php @@ -96,4 +96,9 @@ class StoreModel extends Authenticatable { return $this->hasMany(NoticeModel::class, 'store_id', 'id'); } + + protected function serializeDate(\DateTimeInterface $date) + { + return $date->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s'); + } } diff --git a/app/Models/StoreOrderItemModel.php b/app/Models/StoreOrderItemModel.php index f491450..ba2e885 100644 --- a/app/Models/StoreOrderItemModel.php +++ b/app/Models/StoreOrderItemModel.php @@ -4,14 +4,14 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * 门店订单明细模型(下单时快照商品档案:品名/规格/单位/供应商/图文/成本价 + 等级单价, * 商品调价或档案变更不影响历史单据) */ -class StoreOrderItemModel extends Model +class StoreOrderItemModel extends BaseModel { use HasFactory; diff --git a/app/Models/StoreOrderModel.php b/app/Models/StoreOrderModel.php index 8da6ae9..bdb16c2 100644 --- a/app/Models/StoreOrderModel.php +++ b/app/Models/StoreOrderModel.php @@ -3,7 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * 门店订单模型(小程序下单,快照等级价;软删除,仅已取消订单可由后台删除) */ -class StoreOrderModel extends Model +class StoreOrderModel extends BaseModel { use HasFactory, SoftDeletes; diff --git a/app/Models/SupplierModel.php b/app/Models/SupplierModel.php index c32e194..88f6f1e 100644 --- a/app/Models/SupplierModel.php +++ b/app/Models/SupplierModel.php @@ -3,14 +3,14 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; + use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; /** * 供应商模型(采购单接收方) */ -class SupplierModel extends Model +class SupplierModel extends BaseModel { use SoftDeletes, HasFactory;