From 72a258ce5b1db594afa68083ec405cfa912a4146 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 18 May 2023 16:48:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=A6=E4=B8=8Acategory=5Fid=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9spec=5Ftype=3D=3D0=20=E6=9B=B4=E6=96=B0bar=5Fcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 1 +
 app/common/repositories/store/product/ProductRepository.php  | 3 +++
 app/controller/api/Auth.php                                  | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 517de878..602e8c20 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -37,6 +37,7 @@ use app\common\repositories\user\UserBrokerageRepository;
 use app\common\repositories\user\UserMerchantRepository;
 use app\common\repositories\user\UserRepository;
 use crmeb\jobs\PayGiveCouponJob;
+use crmeb\jobs\ProductImportJob;
 use crmeb\jobs\SendSmsJob;
 use crmeb\jobs\UserBrokerageLevelJob;
 use crmeb\services\CombinePayService;
diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 0c003b8b..8824dc7a 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -471,6 +471,9 @@ class ProductRepository extends BaseRepository
             'pay_limit' => $data['pay_limit'] ?? 0,
             'svip_price_type' => $data['svip_price_type'] ?? 0,
         ];
+        if($result['spec_type'] == 0){
+            $result['bar_code'] = $data['bar_code'] ?? '';
+        }
         if (isset($data['mer_id']))
             $result['mer_id'] = $data['mer_id'];
         if (isset($data['old_product_id']))
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 6e346531..8eb39a98 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -173,7 +173,7 @@ class Auth extends BaseController
         //这里有点小问题以后要修改
         $store_service = Db::name('store_service')->where('uid', $data['uid'])->find();
         if ($store_service) {
-            $mer_arr = Db::name('merchant')->where('mer_id', $store_service['mer_id'])->where('is_del', 0)->where('status', 1)->field('type_id,mer_avatar,mer_banner,mer_info,service_phone,mer_address,uid,mer_name')->find();
+            $mer_arr = Db::name('merchant')->where('mer_id', $store_service['mer_id'])->where('is_del', 0)->where('status', 1)->field('type_id,mer_avatar,mer_banner,mer_info,category_id,service_phone,mer_address,uid,mer_name')->find();
             if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
                 $data['is_wsxx'] = 1;
             }

From 7c9e089b708148421dd43ebb0862e84c2544f932 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 18 May 2023 23:09:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Common.php | 8 ++++++++
 route/api.php                 | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php
index 561464df..02938c65 100644
--- a/app/controller/api/Common.php
+++ b/app/controller/api/Common.php
@@ -491,4 +491,12 @@ class Common extends BaseController
         $select=Db::name('geo_village')->where('street_code',$street_code)->field('village_id id,village_code code,village_name name')->select();
         return app('json')->success($select);
     }
+
+    //获取云店铺
+    public function get_cloud_shop($street_code){
+        $find=DB::name('merchant')->alias('m')->where('m.type_id',11)->where('m.is_del',0)->where('m.status',1)
+        ->join('merchant_address a','a.mer_id=m.mer_id and a.street_id='.$street_code)
+        ->field('m.mer_id')->find();
+        return app('json')->success($find??[]);
+    }
 }
diff --git a/route/api.php b/route/api.php
index ab7aea78..0f21917c 100644
--- a/route/api.php
+++ b/route/api.php
@@ -574,6 +574,7 @@ Route::group('api/', function () {
     Route::get('city/get_area', 'api.Common/get_area');
     Route::get('city/get_street', 'api.Common/get_street');
     Route::get('city/get_village', 'api.Common/get_village');
+    Route::get('city/get_cloud_shop', 'api.Common/get_cloud_shop');
     //经纬度转位置信息
     Route::get('lbs/geocoder', 'api.Common/lbs_geocoder');
     //获取支付宝支付链接