1

application/index/controller/CostParameter.php

@@ -81,6 +81,7 @@ class CostParameter extends Basic
             $f_params['c.setting_date'] = $params['setting_date'];
             $f_params['c.is_del'] = 0;
             $store_data_res = $this->m_store->getStoreCostParameter($field,$f_params);
+
             if(!$store_data_res){
                 $transfer_charge = $this->getTransferCharge($v['id']);
                 $list[$k]['transfer_charge'] = $transfer_charge;//手续费
@@ -91,6 +92,7 @@ class CostParameter extends Basic
                 $list[$k]['last_official_receipts'] = 0;//当月守护者实收
                 $list[$k]['deduct'] = 0;//盈利不足2万扣除
             }else{
+                $list[$k]['is_discounts'] = $store_data_res['is_discounts'];
                 $list[$k]['transfer_charge'] = $store_data_res['transfer_charge'];//手续费
                 $list[$k]['social_security_fee'] = $store_data_res['social_security_fee'];//当月社保报销
                 $list[$k]['attendance_num'] = $store_data_res['attendance_num'];//当月考勤

application/model/AStore.php

@@ -390,6 +390,7 @@ class AStore extends BaseModel
             ->limit($pageSize)
             ->page($pageNo)
             ->select();
+        // big_log($this->getLastSql());
         return $result;
     }
 

application/model/FApplyForFee.php

@@ -49,7 +49,7 @@ class FApplyForFee extends BaseModel
             ->field($field)
             ->where($params)
             ->find();
-        big_log($this->getLastSql());
+        // big_log($this->getLastSql());
         return $result;
     }
 

application/model/FStoreData.php

@@ -56,7 +56,7 @@ class FStoreData extends BaseModel
     public function updateStoreData($params)
     {
         $return  = $this->db_->update($params);
-        big_log($this->getLastSql());
+        // big_log($this->getLastSql());
         return $return;
     }