Commit 786a5aea authored by clone's avatar clone

1

parent fa556790
......@@ -242,10 +242,10 @@ class StoreFeeService
public function verifyCheck($setting_date)
{
$settingLogModel = new FSettingLog();
$list = $settingLogModel->verifyCheck("id", ["setting_date" => $setting_date]);
if(count($list) == 5){
$list = $settingLogModel->verifyCheck("id", ["setting_date" => $setting_date]);
if (count($list) == 5) {
return true;
}else{
} else {
return false;
}
}
......@@ -298,7 +298,7 @@ class StoreFeeService
$companyAttendanceNum = $this->sumAttendanceNum(0, 1, $setting_date);
$districtAttendanceNum = $this->sumAttendanceNum(0, 2, $setting_date);
$discountsNum = $this->sumAttendanceNum(0, 4, $setting_date);
$is_ok = 0;
$is_ok = 0;
foreach ($storeSettingInfo as $key => $item) {
$applyForFeeArr = $this->getApplyForFee($item["store_id"], $setting_date);
......@@ -320,9 +320,9 @@ class StoreFeeService
$assume_fee = 0;
switch ($value["type"]) {
case 1://办公室成本
if($officeAttendanceNum > 0){
if ($officeAttendanceNum > 0) {
$assume_fee = ceil($attendance_num * 100 * $total_fee / $officeAttendanceNum) * 0.01;
}else{
} else {
$assume_fee = 0;
}
......@@ -344,14 +344,14 @@ class StoreFeeService
//门店租金
$storeModel = new AStore();
$rent = $storeModel->getStoreCost("b.id,b.rent", ["a.id" => $item["store_id"]]);
if($officeAttendanceNum > 0){
$assume_fee = ceil($attendance_num * 100 / $officeAttendanceNum * $rent["rent"]) * 0.01;
}else{
if ($officeAttendanceNum > 0) {
$assume_fee = ceil($attendance_num * 100 / $officeAttendanceNum * $rent["rent"]) * 0.01;
} else {
$assume_fee = 0;
}
array_push($insertArr, $this->storeCostExtBin($cost_id, $store_id, 1, 100, 0, $item["create_time"],
$rent["rent"], $attendance_num, $officeAttendanceNum, $districtNum, $companyAttendanceNum,$assume_fee
$rent["rent"], $attendance_num, $officeAttendanceNum, $districtNum, $companyAttendanceNum, $assume_fee
, ""
));
......@@ -362,10 +362,10 @@ class StoreFeeService
if ($item["is_discounts"] == 1) {
$attendance_discount = $attendance_num * $tree[0]["discounts"] * 0.01;
}
if(($companyAttendanceNum - $discountsNum) > 0){
if (($companyAttendanceNum - $discountsNum) > 0) {
$assume_fee1 = ceil($attendance_discount / ($companyAttendanceNum - $discountsNum) * $tree[0]["fixed_fee"] * 100) * 0.01;
$assume_fee2 = ceil($attendance_discount / ($companyAttendanceNum - $discountsNum) * $tree[0]["apply_for_fee"] * 100) * 0.01;
}else{
} else {
$assume_fee1 = 0;
$assume_fee2 = 0;
}
......@@ -407,10 +407,10 @@ class StoreFeeService
}
//分部
if($officeAttendanceNum > 0){
if ($officeAttendanceNum > 0) {
$disc_assume_fee1 = ceil($attendance_num / $officeAttendanceNum * $apply_for_fee * 100) * 0.01;
$disc_assume_fee2 = ceil($attendance_num / $officeAttendanceNum * $apply_for_fee * 100) * 0.01;
}else{
} else {
$disc_assume_fee1 = 0;
$disc_assume_fee2 = 0;
}
......@@ -639,7 +639,7 @@ class StoreFeeService
$storeDataModel = new FStoreData();
$storeDataInfo = $storeDataModel->findByOne("id,store_id,setting_date,official_receipts,last_official_receipts,
deduct", ["store_id" => $store_id,"setting_date"=>$setting_date]);
deduct", ["store_id" => $store_id, "setting_date" => $setting_date]);
if (!$storeDataInfo) {
return false;
}
......@@ -692,4 +692,15 @@ class StoreFeeService
return $num;
}
/**
* 判断是否提交过一键生成
* @param $setting_date
* @return array|false|\PDOStatement|string|\think\Model
*/
public function getCost($setting_date)
{
$fCostModel = new FStoreCost();
return $fCostModel->findByOne("id", ["setting_date" => $setting_date]);
}
}
\ No newline at end of file
......@@ -73,6 +73,26 @@ class StoreFee extends Basic
}
}
/**
* @return \think\Response
*/
public function getCost(){
$params = $this->params;
/* $params = array(
"setting_date" => "2019-06-01",
);*/
if (!$params["setting_date"]) {
return $this->response("101", "请求参数错误 ");
}
$setting_date = $params["setting_date"];
$result = $this->service_->getCost($setting_date);
if($result){
return $this->response("200","当月已提交过一键生成,是否重新提交覆盖原来的数据?");
}else{
return $this->response("101","暂未生成 $setting_date 数据");
}
}
/**
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
......@@ -97,10 +117,6 @@ class StoreFee extends Basic
}else{
return $this->response("101","暂未生成 $setting_date 数据");
}
}
/**
......
......@@ -527,6 +527,7 @@ Route::group('index', [
'getStoreList' => ['index/StoreFee/getStoreList', ['method' => 'POST|GET']],
'bindStore' => ['index/StoreFee/bindStore', ['method' => 'POST|GET']],
'selectStore' => ['index/StoreFee/selectStore', ['method' => 'POST|GET']],
'getCost' => ['index/StoreFee/getCost', ['method' => 'POST|GET']],
'getCostList' => ['index/Cost/getCostList', ['method' => 'GET']], //费用报销审核全部
'getCostListOne/:check_status' => ['index/Cost/getCostList', ['method' => 'GET'], ['check_status' => 0]], //费用报销未审核
'getCostListTwo/:check_status' => ['index/Cost/getCostList', ['method' => 'GET'], ['check_status' => 1]], //费用报销审核总监
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment