Merge branch 'develop'

app/Http/Controllers/V1/ShopController.php

@@ -15,7 +15,6 @@ use App\Shop;
 use App\ShopAccount;
 use App\Transformers\ShopsTransformer;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use League\Fractal\Manager;
@@ -23,6 +22,8 @@ use League\Fractal\Resource\Item;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use Tymon\JWTAuth\Facades\JWTAuth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class ShopController extends Controller {
 
@@ -164,20 +165,33 @@ class ShopController extends Controller {
         if ($validator->fails()) {
             return $this->response->error($validator->errors()->first(), 500);
         }
-        $res = Shop::where(['shop_id'=>$data['shop_id']])->update(['status'=>$data['status']]);
-        if($res){
-            //下架商家所有商品
-            if($data['status'] == 0){
-                $product = new ProductRepository();
-                $upStatus = $product->upProductStatus($data['shop_id']);
-                dd($upStatus);
-                if($upStatus['status_code'] == 200){
-                    return  ['message'  => '成功','status_code'   => 200];
+        DB::beginTransaction();
+        try {
+            $res = Shop::where(['shop_id'=>$data['shop_id']])->update(['status'=>$data['status']]);
+            if($res){
+                //下架商家所有商品
+                if($data['status'] == 0){
+                    $product = new ProductRepository();
+                    $upStatus = $product->upProductStatus($data['shop_id']);
+                    if(isset($upStatus['status_code']) && $upStatus['status_code'] == 200){
+                        DB::commit();
+                        Log::info('商家id'.$data['shop_id'].'商品禁售成功');
+                        return  ['message'  => '成功','status_code'   => 200];
+                    }else{
+                        Log::info('商家id'.$data['shop_id'].'商品禁售失败');
+                        return  ['message'  => '商品禁售失败','status_code'   => 500];
+                    }
                 }
+                DB::commit();
+                return  ['message'  => '成功','status_code'   => 200];
+            }else{
+                return $this->response->error("失败", 500);
             }
-        }else{
+        } catch (\Exception $e) {
+            DB::rollBack();
             return $this->response->error("失败", 500);
         }
+
     }
     /**
      * @param Request $request

app/Repositories/ProductRepository.php

@@ -8,17 +8,20 @@
 
 namespace App\Repositories;
 use Tymon\JWTAuth\Facades\JWTAuth;
+use Illuminate\Support\Facades\Log;
 
 class ProductRepository {
 
     public function upProductStatus($shop_id) {
         try {
             //$sign = generateSign(['shop_id'=>$shop_id], config('customer.app_secret'));
-            $url = config("customer.app_service_url").'/operate/product/shop_status';
+            $url = config("customer.manage_service_url").'/product/operate/product/shop_status';
+            Log::info('禁售商户商品请求参数url'.$url.'商品禁售成功');
             //$url = 'http://localhost:8080/userInfo';
             $array = [
                 'json' => ['shop_id'=>$shop_id], 'query' => [], 'http_errors' => false,'headers'=>['Authorization'=>"Bearer ".JWTAuth::getToken()]
             ];
+            Log::info('禁售商户商品请求参数'.json_encode($array).'商品禁售成功');
             return http($url,$array,false,'put');
         } catch (\Exception $e) {
             return [];

bootstrap/app.php

@@ -30,6 +30,7 @@ $app->configure('auth');
 $app->configure('jwt');
 $app->configure('menu');
 $app->configure('database');
+$app->configure('customer');
 
 /*
 |--------------------------------------------------------------------------

composer.json

@@ -7,6 +7,7 @@
     "require": {
         "php": ">=7.1.3",
         "dingo/api": "^2.2",
+        "guzzlehttp/guzzle": "^6.3",
         "cviebrock/laravel-elasticsearch": "^3.5",
         "hhxsv5/laravel-s": "~3.4.0",
         "laravel/lumen-framework": "5.8.*",