diff --git a/app/Controller/v3/GoodsController.php b/app/Controller/v3/GoodsController.php index 6faa017..1bd246d 100644 --- a/app/Controller/v3/GoodsController.php +++ b/app/Controller/v3/GoodsController.php @@ -42,10 +42,10 @@ class GoodsController extends BaseController //判断是普通商品还是特价商品 if(isset($params['activity']) && $params['activity'] == Goods::IS_ACTIVITY){ $res['detail'] = $this->goodsActivityService->detail($params['goods_id']); - $res['banner'] = $this->goodsActivityService->getBanner(1572); + $res['banner'] = $this->goodsActivityService->getBanner($params['goods_id']); }else{ $res['detail'] = $this->goodsService->detail($params['goods_id']); - $res['banner'] = $this->goodsService->getBanner(1572); + $res['banner'] = $this->goodsService->getBanner($params['goods_id']); } //如果没有banner数据,使用商品cover图 diff --git a/app/Controller/v3/HomeController.php b/app/Controller/v3/HomeController.php index bdab336..80ce4de 100644 --- a/app/Controller/v3/HomeController.php +++ b/app/Controller/v3/HomeController.php @@ -7,6 +7,7 @@ use App\Constants\v3\Banner; use App\Constants\v3\SsdbKeys; use App\Constants\v3\Tabs; use App\Controller\BaseController; +use App\Request\v3\StoreIndexRequest; use App\Request\v3\UserIndexRequest; use App\Service\v3\Interfaces\ActivityServiceInterface; use App\Service\v3\Interfaces\BannerServiceInterface; @@ -174,9 +175,10 @@ class HomeController extends BaseController * 商家入口详情 */ - public function storeIndex() + public function storeIndex(StoreIndexRequest $request) { - $data['detail'] = $this->storeService->detail(1); + $params = $request->validated(); + $data['detail'] = $this->storeService->detail($params['store_id']); $data['order_online'] = [ 'count' => 6549, 'total' => 12654.12 diff --git a/app/Model/v3/StoreWithdrawal.php b/app/Model/v3/StoreWithdrawal.php index 72d1654..edd350a 100644 --- a/app/Model/v3/StoreWithdrawal.php +++ b/app/Model/v3/StoreWithdrawal.php @@ -8,12 +8,24 @@ class StoreWithdrawal extends Model { protected $table = 'lanzu_store_withdrawal'; + protected $dateFormat = 'Y-m-d h:i:s'; + protected $appends = [ 'state_text', + 'check_time_text' ]; public function getStateTextAttribute() { return Withdrawal::getMessage($this->attributes['state']); } + + public function getCheckTimeTextAttribute() + { + if(empty($this->attributes['check_time'])){ + return ''; + }else { + return date('Y-m-d H:i:s', $this->attributes['check_time']); + } + } } \ No newline at end of file diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index a9db67a..bbce864 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -557,4 +557,9 @@ class OrderOnlineService implements OrderOnlineServiceInterface return $this->paymentService->undo($orderMain->global_order_id, $userId); } } + + public function countByStore($storeId) + { + $res['count'] = Order::query()->find(); + } } \ No newline at end of file diff --git a/app/Service/v3/Interfaces/OrderOnlineServiceInterface.php b/app/Service/v3/Interfaces/OrderOnlineServiceInterface.php index d396b1a..dfecb21 100644 --- a/app/Service/v3/Interfaces/OrderOnlineServiceInterface.php +++ b/app/Service/v3/Interfaces/OrderOnlineServiceInterface.php @@ -70,4 +70,11 @@ interface OrderOnlineServiceInterface * @return mixed */ public function doRefund($globalOrderId, $userId); + + /** + * 统计商户线上订单 + * @param $storeId + * @return mixed + */ + public function countByStore($storeId); } \ No newline at end of file