bug修改

@@ -265,8 +265,11 @@ class AfterToBefore extends Api
             $add_money = 0;
             $add_money = 0;
         }
         }
         // 社保基数
         // 社保基数
-        $social_top = config('site.social_top'); //社保封顶金额
-        $social_bottom = config('site.social_bottom'); //社保保底金额
+        $social_top = config('site.social_top_after'); //社保封顶金额
+        $social_bottom = config('site.social_bottom_after'); //社保保底金额
+        // 公积金基数
+        $housing_fund_top = config('site.housing_fund_top_after'); //公积金封顶金额
+        $housing_fund_bottom = config('site.housing_fund_bottom_after'); //公积金保底金额
         // 公积金缴存比例5%-7%
         // 公积金缴存比例5%-7%
         $social_rate_user = Db::name('social_insurance_rate')->where('id',1)->find();
         $social_rate_user = Db::name('social_insurance_rate')->where('id',1)->find();
         $social_rate_company = Db::name('social_insurance_rate')->where('id',2)->find();
         $social_rate_company = Db::name('social_insurance_rate')->where('id',2)->find();
@@ -496,7 +499,7 @@ class AfterToBefore extends Api
         // 社保汇缴基数
         // 社保汇缴基数
         $social_base = $salary_average > $social_top ? $social_top : ($salary_average < $social_bottom ? $social_bottom : $salary_average);
         $social_base = $salary_average > $social_top ? $social_top : ($salary_average < $social_bottom ? $social_bottom : $salary_average);
         // 公积金汇缴基数
         // 公积金汇缴基数
-        $housing_fund_base = $social_base;
+        $housing_fund_base = $salary_average > $housing_fund_top ? $housing_fund_top : ($salary_average < $housing_fund_bottom ? $housing_fund_bottom : $salary_average);
         $this->success('请求成功',compact('param','salary_average','social_user','social_user_money','social_company','social_company_money','person_fee_average','company_cost','user_go','company_go','social_base','housing_fund_base'));
         $this->success('请求成功',compact('param','salary_average','social_user','social_user_money','social_company','social_company_money','person_fee_average','company_cost','user_go','company_go','social_base','housing_fund_base'));
 
 
     }
     }

@@ -46,4 +46,8 @@ return array (
   'social_bottom' => '4927',
   'social_bottom' => '4927',
   'housing_fund_top' => '28017',
   'housing_fund_top' => '28017',
   'housing_fund_bottom' => '2480',
   'housing_fund_bottom' => '2480',
+  'social_top_after' => '28017',
+  'social_bottom_after' => '4927',
+  'housing_fund_top_after' => '28017',
+  'housing_fund_bottom_after' => '4927',
 );
 );