Quellcode durchsuchen

feat(order): 添加订单自提关联关系

- 在 StoreOrder 模型中新增 pickUp 关联方法
- 将 pickUp 关联加入到 StoreOrderRepository 的查询中
- 实现订单与其自提信息的关联查询功能
shichen vor 4 Monaten
Ursprung
Commit
8fbf953fe3

+ 5 - 0
app/common/model/store/order/StoreOrder.php

@@ -88,4 +88,9 @@ class StoreOrder extends BaseModel
88 88
             ->where('type', '=', SharedProsperityRewardRecordEnum::TYPE['PV']['code'])
89 89
             ->where('pm', '=', SharedProsperityRewardRecordEnum::PM['INCOME']['code']);
90 90
     }
91
+
92
+    public function pickUp()
93
+    {
94
+        return $this->hasOne(PickUp::class, 'id', 'pick_ud_id');
95
+    }
91 96
 }

+ 1 - 1
app/common/repositories/store/order/StoreOrderRepository.php

@@ -2718,7 +2718,7 @@ class StoreOrderRepository extends BaseRepository
2718 2718
 //        if ($uid) $where['uid'] = $uid;
2719 2719
 
2720 2720
         $data = $this->dao->search($where)->where('order_sn', $id)->where('is_del', 0)->with([
2721
-            'orderProduct', 'merchant' => function ($query) {
2721
+            'orderProduct','pickUp', 'merchant' => function ($query) {
2722 2722
                 return $query->field('mer_id,mer_name,mer_avatar,business_id');
2723 2723
             }
2724 2724
         ])