Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

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
 {
     /**

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
 {
     /**

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()

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()

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;

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'];
             // 优惠券数据，当前订单可用个优惠券
@@ -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) {
 

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']];