带上category_id

修改spec_type==0 更新bar_code

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;

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

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;
             }