2 Коміти a37d4a667d ... ef29065216

Автор SHA1 Опис Дата
  sunxbiao ef29065216 Merge remote-tracking branch 'origin/dev' into dev 4 місяців тому
  sunxbiao d8822abf60 平台后台-订单列表-增加PV关联查询 4 місяців тому

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

@@ -11,10 +11,14 @@
11
 namespace app\common\model\store\order;
11
 namespace app\common\model\store\order;
12
 
12
 
13
 
13
 
14
+use app\common\enum\CommonEnum;
15
+use app\common\enum\shared\SharedProsperityRewardRecordEnum;
14
 use app\common\model\BaseModel;
16
 use app\common\model\BaseModel;
17
+use app\common\model\shared\SharedProsperityRewardRecord;
15
 use app\common\model\store\service\StoreService;
18
 use app\common\model\store\service\StoreService;
16
 use app\common\model\system\merchant\Merchant;
19
 use app\common\model\system\merchant\Merchant;
17
 use app\common\model\user\User;
20
 use app\common\model\user\User;
21
+use app\common\model\user\UserPvLog;
18
 use app\common\repositories\store\MerchantTakeRepository;
22
 use app\common\repositories\store\MerchantTakeRepository;
19
 
23
 
20
 class StoreOrder extends BaseModel
24
 class StoreOrder extends BaseModel
@@ -71,4 +75,17 @@ class StoreOrder extends BaseModel
71
     {
75
     {
72
         return getModelTime($query, $value);
76
         return getModelTime($query, $value);
73
     }
77
     }
78
+
79
+    public function userPvLog()
80
+    {
81
+        return $this->hasOne(UserPvLog::class, 'order_id', 'order_id')->where('order_type', '=', CommonEnum::ORDER_TYPE['Platform']['code']);
82
+    }
83
+
84
+    public function sharedProsperityRewardRecord()
85
+    {
86
+        return $this->hasOne(SharedProsperityRewardRecord::class, 'order_sn', 'order_sn')
87
+            ->where('type_shop', '=', SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'])
88
+            ->where('type', '=', SharedProsperityRewardRecordEnum::TYPE['PV']['code'])
89
+            ->where('pm', '=', SharedProsperityRewardRecordEnum::PM['INCOME']['code']);
90
+    }
74
 }
91
 }

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

@@ -5180,7 +5180,7 @@ class StoreOrderRepository extends BaseRepository
5180
                     return $query->field('service_id,nickname');
5180
                     return $query->field('service_id,nickname');
5181
                 }, 'user' => function ($query) {
5181
                 }, 'user' => function ($query) {
5182
                     return $query->field('uid,phone,nickname');
5182
                     return $query->field('uid,phone,nickname');
5183
-                }
5183
+                }, 'userPvLog', 'sharedProsperityRewardRecord'
5184
             ]);
5184
             ]);
5185
         $query1 = clone ($query);
5185
         $query1 = clone ($query);
5186
         $query2 = clone ($query);
5186
         $query2 = clone ($query);