地区修改

app/adminapi/lists/AreaLists.php

@@ -81,7 +81,7 @@ class AreaLists extends BaseAdminDataLists implements ListsSearchInterface, List
     public function lists(): array
     {
 
-        $lists = SpecialArea::field('id,name,free_shipping_money,shipping_fee,is_show,is_show as is_show_desc,sort,create_time')
+        $lists = SpecialArea::field('id,name,reduce_shipping_money,reduce_shipping_fee,free_shipping_money,shipping_fee,is_show,is_show as is_show_desc,sort,create_time')
             ->where($this->searchWhere)
             ->order('sort desc,id desc')
             ->limit($this->limitOffset, $this->limitLength)

app/adminapi/logic/AreaLogic.php

@@ -40,6 +40,8 @@ class AreaLogic extends BaseLogic
 
         $data = [
             'name' => $params['name'],
+            'reduce_shipping_money' => $params['reduce_shipping_money']??0,
+            'reduce_shipping_fee' => $params['reduce_shipping_fee']??0,
             'free_shipping_money' => $params['free_shipping_money']??0,
             'shipping_fee' => $params['shipping_fee'] ?? 0,
             'sort' => $params['sort'] ?? 0,
@@ -59,7 +61,7 @@ class AreaLogic extends BaseLogic
      */
     public static function detail($params)
     {
-        return SpecialArea::field('id,name,free_shipping_money,shipping_fee,sort,is_show,is_show as is_show_desc')->findOrEmpty($params['id'])->toArray();
+        return SpecialArea::field('id,name,reduce_shipping_money,reduce_shipping_fee,free_shipping_money,shipping_fee,sort,is_show,is_show as is_show_desc')->findOrEmpty($params['id'])->toArray();
     }
 
     /**
@@ -74,6 +76,8 @@ class AreaLogic extends BaseLogic
         $data = [
             'id' => $params['id'],
             'name' => $params['name'],
+            'reduce_shipping_money' => $params['reduce_shipping_money']??0,
+            'reduce_shipping_fee' => $params['reduce_shipping_fee']??0,
             'free_shipping_money' => $params['free_shipping_money']??0,
             'shipping_fee' => $params['shipping_fee'] ?? 0,
             'sort' => $params['sort'] ?? 0,

app/adminapi/validate/AreaValidate.php

@@ -28,6 +28,7 @@ class AreaValidate extends BaseValidate
         'id' => 'require',
         'name' => 'require|checkName',
         'is_show' => 'in:0,1',
+        'free_shipping_money'=> 'checkFreeShipFee'
     ];
 
     protected $message = [
@@ -103,4 +104,13 @@ class AreaValidate extends BaseValidate
         }
         return true;
     }
+    //free_shipping_money  reduce_shipping_money
+    public function checkFreeShipFee($value,$rule,$data){
+        if(isset($data['reduce_shipping_money'])){
+            if($value < $data['reduce_shipping_money']){
+                return '包邮门槛和减免运费门槛规则错误！';
+            }
+        }
+        return true;
+    }
 }