1

application/api_broker/service/StoreFeeService.php

@@ -283,7 +283,7 @@ class StoreFeeService
         foreach ($storeSettingInfo as $key => $item) {
 
             $applyForFeeArr      = $this->getApplyForFee($item["store_id"], $setting_date);
-            $site_id             = $applyForFeeArr[0]["site_id"];
+            $site_id             = $item["site_id"];
             $store_id            = $item["store_id"];
             $districtNum         = $districtAttendanceNum[$site_id]["num"];//区域考勤人数
             $attendance_num      = $item["attendance_num"];//门店参与考勤人数
@@ -506,10 +506,10 @@ class StoreFeeService
     private function getStoreData($setting_date)
     {
         $storeDataModel           = new FStoreData();
-        $field                  = "id,store_id,setting_date,is_discounts,social_security_fee,attendance_num,official_receipts,
-        last_official_receipts,deduct,transfer_charge,create_time";
-        $params["is_del"]       = 0;
-        $params["setting_date"] = $setting_date;
+        $field                    = "a.id,a.store_id,a.setting_date,a.is_discounts,a.social_security_fee,a.attendance_num,a.official_receipts,
+        a.last_official_receipts,a.deduct,a.transfer_charge,a.create_time,b.site_id";
+        $params["a.is_del"]       = 0;
+        $params["a.setting_date"] = $setting_date;
         return $storeDataModel->selectStoreFee($field, $params);
     }
 

application/model/FStoreData.php

@@ -71,6 +71,8 @@ class FStoreData extends BaseModel
     public function selectStoreFee($field,$params){
         return $this->db_
             ->field($field)
+            ->alias("a")
+            ->join("a_store b","a.store_id=b.id","left")
             ->where($params)
             ->select();
     }