|
|
@@ -124,15 +124,14 @@ class Auth extends BaseController
|
|
|
|
|
|
$AwardIntegralPriceDayDao->create(['day' => time(), 'all_add_price' => $rise, 'day_add_price' => $day_25_rise]); //保存今天增长的总价格和每日增长价格
|
|
|
}
|
|
|
- public function hexiao(){
|
|
|
+ public function hexiao(StoreOrderRepository $repository){
|
|
|
$data = $this->request->params(['data']);
|
|
|
$order_id = $this->request->params(['order_id']);
|
|
|
$user = $this->request->userInfo();
|
|
|
- var_dump($user);die();
|
|
|
// $num = $this->request->params(['num']);
|
|
|
// $merId = $this->request->merId();
|
|
|
// 根据订单ID、商家ID、验证码和订单类型查询订单，并连带查询订单产品信息
|
|
|
- $order = $this->repository->getWhere(['order_id' => $order_id, 'order_type' => 1], '*', ['orderProduct']);
|
|
|
+ $order = $repository->getWhere(['order_id' => $order_id, 'order_type' => 1], '*', ['orderProduct']);
|
|
|
// 如果订单不存在，则抛出验证异常
|
|
|
if (!$order) return app('json')->fail('订单不存在');
|
|
|
// 如果订单未支付，则抛出验证异常
|
|
|
@@ -149,7 +148,7 @@ class Auth extends BaseController
|
|
|
|
|
|
return app('json')->fail('不是服务中心不能进行核销');
|
|
|
}
|
|
|
- $this->repository->verifyPartOrder($order, $data,$user['uid']);
|
|
|
+ $repository->verifyPartOrder($order, $data,$user['uid']);
|
|
|
return app('json')->success('订单核销成功');
|
|
|
}
|
|
|
public function autoSend(){
|
