From 77080f71b039c3c80485d8d67bf492f21f311ded Mon Sep 17 00:00:00 2001 From: fengxinyhyl Date: Fri, 15 Mar 2024 10:51:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/user/UserAssetsDao.php | 39 +++++++++++++++++++ app/common/dao/user/UserAssetsLogDao.php | 39 +++++++++++++++++++ app/common/model/user/UserAssets.php | 35 +++++++++++++++++ app/common/model/user/UserAssetsLog.php | 35 +++++++++++++++++ .../order/StoreOrderCreateRepository.php | 3 +- .../user/UserAssetsLogRepository.php | 39 +++++++++++++++++++ .../user/UserAssetsRepository.php | 39 +++++++++++++++++++ 7 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 app/common/dao/user/UserAssetsDao.php create mode 100644 app/common/dao/user/UserAssetsLogDao.php create mode 100644 app/common/model/user/UserAssets.php create mode 100644 app/common/model/user/UserAssetsLog.php create mode 100644 app/common/repositories/user/UserAssetsLogRepository.php create mode 100644 app/common/repositories/user/UserAssetsRepository.php diff --git a/app/common/dao/user/UserAssetsDao.php b/app/common/dao/user/UserAssetsDao.php new file mode 100644 index 0000000..e17ff31 --- /dev/null +++ b/app/common/dao/user/UserAssetsDao.php @@ -0,0 +1,39 @@ + +// +---------------------------------------------------------------------- + + +namespace app\common\dao\user; + + +use app\common\dao\BaseDao; +use app\common\model\BaseModel; +use app\common\model\user\UserSpreadLog; + +class UserAssetsDao extends BaseDao +{ + + protected function getModel(): string + { + return UserSpreadLog::class; + } + + public function add($uid, $spread_uid, $old_spread_uid, $admin_id = 0) + { + $this->create(compact('uid', 'spread_uid', 'admin_id', 'old_spread_uid')); + } + + public function search($where) + { + return UserSpreadLog::getDB()->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) { + $query->where('uid', $where['uid']); + })->order('create_time DESC'); + } +} diff --git a/app/common/dao/user/UserAssetsLogDao.php b/app/common/dao/user/UserAssetsLogDao.php new file mode 100644 index 0000000..1f0391a --- /dev/null +++ b/app/common/dao/user/UserAssetsLogDao.php @@ -0,0 +1,39 @@ + +// +---------------------------------------------------------------------- + + +namespace app\common\dao\user; + + +use app\common\dao\BaseDao; +use app\common\model\BaseModel; +use app\common\model\user\UserSpreadLog; + +class UserAssetsLogDao extends BaseDao +{ + + protected function getModel(): string + { + return UserSpreadLog::class; + } + + public function add($uid, $spread_uid, $old_spread_uid, $admin_id = 0) + { + $this->create(compact('uid', 'spread_uid', 'admin_id', 'old_spread_uid')); + } + + public function search($where) + { + return UserSpreadLog::getDB()->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) { + $query->where('uid', $where['uid']); + })->order('create_time DESC'); + } +} diff --git a/app/common/model/user/UserAssets.php b/app/common/model/user/UserAssets.php new file mode 100644 index 0000000..88736ce --- /dev/null +++ b/app/common/model/user/UserAssets.php @@ -0,0 +1,35 @@ + +// +---------------------------------------------------------------------- + + +namespace app\common\model\user; + + +use app\common\model\BaseModel; + +class UserAssets extends BaseModel +{ + + public static function tablePk(): ?string + { + return 'uid'; + } + + public static function tableName(): string + { + return 'user_assets'; + } + + public function user() + { + return $this->hasOne(User::class, 'uid', 'uid'); + } +} diff --git a/app/common/model/user/UserAssetsLog.php b/app/common/model/user/UserAssetsLog.php new file mode 100644 index 0000000..464b8b2 --- /dev/null +++ b/app/common/model/user/UserAssetsLog.php @@ -0,0 +1,35 @@ + +// +---------------------------------------------------------------------- + + +namespace app\common\model\user; + + +use app\common\model\BaseModel; + +class UserAssetsLog extends BaseModel +{ + + public static function tablePk(): ?string + { + return 'id'; + } + + public static function tableName(): string + { + return 'user_assets_log'; + } + + public function user() + { + return $this->hasOne(User::class, 'uid', 'uid'); + } +} diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 0e8cb82..8a5bf80 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -1121,7 +1121,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository 'give_integral' => $orderInfo['order_total_give_integral'], ]; event('order.create.before', compact('groupOrder', 'orderList')); - $group = Db::transaction(function () use ($ex, $user, $topUid, $spreadUid, $uid, $receipt_data, $cartIds, $allUseCoupon, $groupOrder, $orderList, $orderInfo) { + $group = Db::transaction(function () use ($ex, $user, $topUid, $spreadUid, $uid, $receipt_data, $cartIds, $allUseCoupon, $groupOrder, $orderList, $orderInfo, $address) { $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class); $storeCartRepository = app()->make(StoreCartRepository::class); $attrValueRepository = app()->make(ProductAttrValueRepository::class); @@ -1214,6 +1214,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $cartInfo = $order['cartInfo']; unset($order['cartInfo']); //创建子订单 + $order['district_id'] = $address['district_id'] ?? 0; $_order = $this->dao->create($order); if ($order['integral'] > 0) { diff --git a/app/common/repositories/user/UserAssetsLogRepository.php b/app/common/repositories/user/UserAssetsLogRepository.php new file mode 100644 index 0000000..bb6876c --- /dev/null +++ b/app/common/repositories/user/UserAssetsLogRepository.php @@ -0,0 +1,39 @@ + +// +---------------------------------------------------------------------- + + +namespace app\common\repositories\user; + + +use app\common\dao\user\UserSpreadLogDao; +use app\common\repositories\BaseRepository; + +/** + * @mixin UserSpreadLogDao + */ +class UserAssetsLogRepository extends BaseRepository +{ + public function __construct(UserSpreadLogDao $dao) + { + $this->dao = $dao; + } + + public function getList(array $where, $page, $limit) + { + $query = $this->dao->search($where); + $count = $query->count(); + $list = $query->page($page, $limit)->with(['spread' => function ($query) { + $query->field('uid,nickname,avatar'); + }])->select(); + + return compact('count', 'list'); + } +} diff --git a/app/common/repositories/user/UserAssetsRepository.php b/app/common/repositories/user/UserAssetsRepository.php new file mode 100644 index 0000000..a2a8b72 --- /dev/null +++ b/app/common/repositories/user/UserAssetsRepository.php @@ -0,0 +1,39 @@ + +// +---------------------------------------------------------------------- + + +namespace app\common\repositories\user; + + +use app\common\dao\user\UserSpreadLogDao; +use app\common\repositories\BaseRepository; + +/** + * @mixin UserSpreadLogDao + */ +class UserAssetsRepository extends BaseRepository +{ + public function __construct(UserSpreadLogDao $dao) + { + $this->dao = $dao; + } + + public function getList(array $where, $page, $limit) + { + $query = $this->dao->search($where); + $count = $query->count(); + $list = $query->page($page, $limit)->with(['spread' => function ($query) { + $query->field('uid,nickname,avatar'); + }])->select(); + + return compact('count', 'list'); + } +}