From 0bfe088ffa5888ea0ab16726ed0d2a099cda7bd5 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 15:38:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=90=9C=E6=90=9C?= =?UTF-8?q?=E3=80=81=E5=B8=82=E5=9C=BA=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/Implementations/LocationService.php | 32 ++++++++++++++++--- .../v3/Implementations/SearchService.php | 1 - 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/Service/v3/Implementations/LocationService.php b/app/Service/v3/Implementations/LocationService.php index 89ff26c..1a19c7b 100644 --- a/app/Service/v3/Implementations/LocationService.php +++ b/app/Service/v3/Implementations/LocationService.php @@ -31,16 +31,38 @@ class LocationService implements LocationServiceInterface $cityIds = Market::query()->pluck('city_id'); $res = Area::query()->with('markets')->whereIn('id',$cityIds)->get(); foreach ($res as &$v){ + + if(!empty($lng) && !empty($lat)) { + $v->distance_num = $this->getDistance($v->lng, $v->lat, $lng, $lat); + $v->distance = $v->distance_num . ' km'; + } else { + $v->distance_num = 0; + $v->distance = ''; + } + foreach ($v->markets as &$m) { if(!empty($lng) && !empty($lat)){ - $m->Distance = ($this->getDistance($m->lng,$m->lat,$lng,$lat)).' km'; + $m->distance_num = $this->getDistance($m->lng, $m->lat, $lng, $lat); + $m->distance = $m->distance_num.' km'; }else{ - $m->Distance = ''; + $m->distance_num = 0; + $m->distance = ''; } } } - return $res; + + $res = collect($res->toArray())->sortBy(function ($area, $key) { + return $area['distance_num']; + }); + + $res = collect($res->all())->map(function ($area, $key) { + $markets = collect($area['markets'])->sortBy('distance_num'); + $area['markets'] = $markets->values()->all(); + return $area; + }); + + return $res->all(); } public function searchMarket($keywords,$lng,$lat,$cityId = 2163) @@ -52,9 +74,9 @@ class LocationService implements LocationServiceInterface ->get(); foreach ($res as &$v){ if(!empty($lng) && !empty($lat)){ - $v->Distance = ($this->getDistance($v->lng,$v->lat,$lng,$lat)).' km'; + $v->distance = ($this->getDistance($v->lng,$v->lat,$lng,$lat)).' km'; }else{ - $v->Distance = ''; + $v->distance = ''; } } return $res; diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php index 82f85f5..6127c98 100644 --- a/app/Service/v3/Implementations/SearchService.php +++ b/app/Service/v3/Implementations/SearchService.php @@ -104,7 +104,6 @@ class SearchService implements SearchServiceInterface } } - $builder->select(['id', 'logo', 'name']); $paginate = $builder->paginate($params['pagesize']); $stores = $paginate->toArray(); return ['has_more_pages' => $paginate->hasMorePages(), 'stores' => $stores['data']]; From 03c8b66dd38d31ba507e9badb61a1d3f68c5b5d9 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 15:50:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/OrderOnlineService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index 36e1bf4..2fc42ae 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -123,7 +123,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface // 用户收货地址 // 获取配送费用 $userAddrAndDPrice = $this->userAddressService->getAddressAndDistributionPrice($userAddrId, $marketId); - $userAddr = $userAddrAndDPrice['address']; + $userAddr = $userAddrAndDPrice['address']['address']; $deliveryAmount = $userAddrAndDPrice['distribution_price']; $deliveryDistance = $userAddrAndDPrice['delivery_distance']; // 优惠券数据，当前订单可用个优惠券 From 3efbcc50f354eb015265cc42eee7560b3930b955 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 16:23:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89mq=E5=92=8Ccartnum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Amqp/Consumer/DevicOrderConsumer.php | 6 +++--- app/Amqp/Consumer/couponRebateConsumer.php | 6 +++--- app/Model/v3/Goods.php | 5 +++-- app/Model/v3/GoodsActivity.php | 5 +++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/Amqp/Consumer/DevicOrderConsumer.php b/app/Amqp/Consumer/DevicOrderConsumer.php index 08a2d1c..39c6b37 100644 --- a/app/Amqp/Consumer/DevicOrderConsumer.php +++ b/app/Amqp/Consumer/DevicOrderConsumer.php @@ -14,9 +14,9 @@ use Hyperf\DbConnection\Db; use PhpAmqpLib\Message\AMQPMessage; use Hyperf\Di\Annotation\Inject; -/** - * @Consumer(exchange="devicOrder", routingKey="devicOrder", queue="devicOrder", nums=4) - */ +// /** +// * @Consumer(exchange="devicOrder", routingKey="devicOrder", queue="devicOrder", nums=4) +// */ class DevicOrderConsumer extends ConsumerMessage { /** diff --git a/app/Amqp/Consumer/couponRebateConsumer.php b/app/Amqp/Consumer/couponRebateConsumer.php index 3417e2a..4c949fc 100644 --- a/app/Amqp/Consumer/couponRebateConsumer.php +++ b/app/Amqp/Consumer/couponRebateConsumer.php @@ -15,9 +15,9 @@ use App\Service\CouponRebateServiceInterface; use Hyperf\Di\Annotation\Inject; -/** - * @Consumer(exchange="deviceCouponRebate", routingKey="deviceCouponRebate", queue="deviceCouponRebate", name ="couponRebateConsumer", nums=1) - */ +// /** +// * @Consumer(exchange="deviceCouponRebate", routingKey="deviceCouponRebate", queue="deviceCouponRebate", name ="couponRebateConsumer", nums=1) +// */ class couponRebateConsumer extends ConsumerMessage { /** diff --git a/app/Model/v3/Goods.php b/app/Model/v3/Goods.php index 5f529bc..f4aa2aa 100644 --- a/app/Model/v3/Goods.php +++ b/app/Model/v3/Goods.php @@ -101,8 +101,9 @@ class Goods extends Model public function getCartNumAttribute() { - $userId = $this->request->user->id ?? 0; - return $userId ? (integer)$this->shopCartService->check($userId, $this->id,1) : 0; + return 0; + // $userId = $this->request->user->id ?? 0; + // return $userId ? (integer)$this->shopCartService->check($userId, $this->id,1) : 0; } public function getIsEffectiveAttribute() diff --git a/app/Model/v3/GoodsActivity.php b/app/Model/v3/GoodsActivity.php index 26b1128..f341712 100644 --- a/app/Model/v3/GoodsActivity.php +++ b/app/Model/v3/GoodsActivity.php @@ -69,8 +69,9 @@ class GoodsActivity extends Model public function getCartNumAttribute() { - $userId = $this->request->user->id ?? 0; - return $userId ? (integer)$this->shopCartService->check($userId, $this->id,1) : 0; + return 0; + // $userId = $this->request->user->id ?? 0; + // return $userId ? (integer)$this->shopCartService->check($userId, $this->id,1) : 0; } public function getIsEffectiveAttribute() From ea1f2f86fe0f2852b200d65caea842046387cb50 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 16:36:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=80=E9=87=8F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/OrderOnlineService.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index 2fc42ae..e77c471 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -473,6 +473,8 @@ class OrderOnlineService implements OrderOnlineServiceInterface } } + Db::commit(); + // 月销流水 $statistics = []; foreach ($orders as $key => &$order) { @@ -482,7 +484,6 @@ class OrderOnlineService implements OrderOnlineServiceInterface 'store_id' => $order['store_id'], 'market_id' => $orderMain->market_id, 'order_id' => $order['id'], - 'createtime' => $orderMain->pay_time, ]; // 商户月销 @@ -497,8 +498,6 @@ class OrderOnlineService implements OrderOnlineServiceInterface $inSalesStatistics = OrderSalesStatistic::query()->insert($statistics); } - Db::commit(); - return true; } catch (Exception $e) {