diff --git a/api/controllers/plan/Score.php b/api/controllers/plan/Score.php index 81e311bf..fd8c73cb 100644 --- a/api/controllers/plan/Score.php +++ b/api/controllers/plan/Score.php @@ -13,6 +13,7 @@ class Score extends HD_Controller $this->load->model('app/licheb/app_licheb_users_model'); $this->load->library('receiver/score_entity'); $this->load->model('receiver/receiver_score_day_model'); + $this->load->model("biz/biz_model"); } public function index() @@ -105,10 +106,12 @@ class Score extends HD_Controller if ($scoreDayRow) { $receiverScoreDayModel->update(['score' => $score, 'change_score' => $change_score], ['id' => $scoreDayRow['id']]); } else { + $biz = $this->biz_model->get(['id' => $item['biz_id']]); $addData = [ 'biz_id' => $item['biz_id'], 'uid' => $item['uid'], 'score' => $score, 'day' => $day, 'type' => Receiver_score_day_model::TYPE_USER, - 'change_score' => $change_score, 'c_time' => time() + 'change_score' => $change_score, 'c_time' => time(), + 'province_id' => $biz['province_id'] ?: 0, ]; $receiverScoreDayModel->add($addData); } @@ -173,6 +176,7 @@ class Score extends HD_Controller 'total_num' => $total_num, 'change_score' => $change_score ], ['id' => $scoreDayRow['id']]); } else { + $biz = $this->biz_model->get(['id' => $item['biz_id']]); $addData = [ 'biz_id' => $item['biz_id'], 'score' => $score, @@ -180,7 +184,8 @@ class Score extends HD_Controller 'total_num' => $total_num, 'day' => $day, 'type' => Receiver_score_day_model::TYPE_BIZ, - 'change_score' => $change_score, 'c_time' => time() + 'change_score' => $change_score, 'c_time' => time(), + 'province_id' => $biz['province_id'] ?: 0, ]; $receiverScoreDayModel->add($addData); } diff --git a/api/controllers/wxapp/licheb/Score.php b/api/controllers/wxapp/licheb/Score.php index e780fc17..b290f3ea 100644 --- a/api/controllers/wxapp/licheb/Score.php +++ b/api/controllers/wxapp/licheb/Score.php @@ -18,8 +18,6 @@ class Score extends Wxapp } /** - * 可怜楼上月裴回,应照离人妆镜台 - * 玉户帘中卷不去,捣衣砧上拂还来 * @return array */ protected function get() @@ -70,9 +68,9 @@ class Score extends Wxapp $score_list = []; if (!$day_type && !$show_biz) { //个人且非查看门店 $score_list = [ - ['name' => '基础分', 'value' => 10, 'operator' => ''], - ['name' => '线索分', 'value' => 2, 'operator' => '+'], - ['name' => '订单分', 'value' => 10, 'operator' => '+'], + ['name' => '基础分', 'value' => 0, 'operator' => ''], + ['name' => '线索分', 'value' => 0, 'operator' => '+'], + ['name' => '订单分', 'value' => 0, 'operator' => '+'], ['name' => '扣分项', 'value' => 0, 'operator' => '-'], ]; } diff --git a/common/models/receiver/Receiver_score_day_model.php b/common/models/receiver/Receiver_score_day_model.php index 0caf97a2..fe9e3229 100644 --- a/common/models/receiver/Receiver_score_day_model.php +++ b/common/models/receiver/Receiver_score_day_model.php @@ -30,6 +30,8 @@ class Receiver_score_day_model extends HD_Model $where = []; $where['day'] = $day; if ($type) { + $biz = (new Biz_model())->get(['id' => $biz_id]); + $where['province_id'] = $biz['province_id']; $where['type'] = self::TYPE_BIZ; } else { $where['biz_id'] = $biz_id;