Merge branch 'master' into Dev

app/Http/Controllers/Api/SupplierApiController.php

@@ -706,14 +706,14 @@ class SupplierApiController extends Controller
         $channelModel = new SupplierChannelModel();
         //先找出原来的状态
         $redis = new RedisModel();
-        $previousStatus = $redis->hget('supplier_status_before_disable', $supplierId);
+        // $previousStatus = $redis->hget('supplier_status_before_disable', $supplierId);
         $result = $channelModel->where('supplier_id', $supplierId)->update([
-            'status' => $previousStatus,
+            'status' => SupplierChannelModel::STATUS_PENDING,
             'update_time' => time(),
         ]);
         if ($result) {
             //删除redis状态
-            $redis->hdel('supplier_status_before_disable', $supplierId);
+            // $redis->hdel('supplier_status_before_disable', $supplierId);
             $logService = new LogService();
             SupplierChannelModel::where('supplier_id', $supplierId)->update([
                 'disable_reason' => '',

app/Http/Services/SkuService.php

@@ -34,6 +34,14 @@ class SkuService extends BaseService
         $url = env('ES_SKU_URL', '');
         $map['show_status'] = 1;
         $map['no_rule'] = 1122;
+        $map['admin'] = 1;
+        if (array_get($map, "debug") == 1) {
+            print_r($url);
+            print_r("<br/>");
+            print_r(json_encode($map));
+            print_r("<br/>");
+            die();
+        }
         try {
             // $return = curl($url, $map, 1);
             $url = base64_encode($url . '?' . http_build_query($map));

app/Http/Validators/ReceiptValidator.php

@@ -25,7 +25,7 @@ class ReceiptValidator
         ];
         if ($receipt['receipt_type'] == 2) {
             $rules["swift_code"] = 'required';
-            $rules["account_adderss"] = 'required';
+            $rules["account_adderss"] = 'required|max:70';
             $rules["account_name"] = 'required';
             $rules["bank_adderss"] = 'required';
             $rules["nation_id"] = 'required';
@@ -63,6 +63,7 @@ class ReceiptValidator
             'account_name.required' => '账户名称 不能为空',
             'certificate.required' => '银行信息凭证 不能为空',
             'account_adderss.required' => '银行地址 不能为空',
+            'account_adderss.max' => '银行地址 最多输入70个字符',
             'nation_id.required' => '国家/地区 不能为空',
         ];
     }

resources/views/web/AddSupplier.blade.php

@@ -343,7 +343,7 @@
                                                           id="bank_address_require_span">*</span>银行地址 : </label>
                     <div class="layui-input-block block-42">
                         <input type="text" name="account_adderss" id="account_adderss"
-                               placeholder="请输入银行具体地址或银行所在国家" class="layui-input"
+                               placeholder="请输入银行具体地址或银行所在国家,不得超过70个字符" class="layui-input"
                                value="">
                     </div>
                 </div>

resources/views/web/AddSupplierReceipt.blade.php

@@ -65,7 +65,7 @@
                     银行地址 : </label>
                 <div class="layui-input-block block-42">
                     <input type="text" name="account_adderss" id="account_adderss"
-                           placeholder="请输入银行具体地址或银行所在国家" class="layui-input"
+                           placeholder="请输入银行具体地址或银行所在国家,不得超过70个字符" class="layui-input"
                            value="{{$receipt['account_adderss'] or ''}}">
                 </div>
             </div>