INT

application/index/controller/Finance.php

@@ -1552,6 +1552,14 @@ class Finance extends Basic
 
                     $add_arr[$j]['confirm_date']   = date("Y-m-d H:i:s", time());
                     $add_arr[$j]['confirm_status'] = 1;
+
+                    if (empty($user_id) && $this->params['report_id']) {
+                        $user_id = $m_report->getFieldValue('user_id',['id'=>$this->params['report_id']]);
+                        if ($user_id) {
+                            $service = new ConvertCouponService();
+                            $service->convertCoupon($user_id, $bargain_data['report_id'], $this->params['bargain_id'], $bargain_data['order_id']);  //核销红包
+                        }
+                    }
                 }
                 $j++;
 

application/index/service/HouseService.php

@@ -486,11 +486,13 @@ class HouseService
             }
 
             foreach ($agent_id_arr as $val) {
+                if ((int)$val > 0) {
                     $save_data[$count]['agents_id'] = $val;
                     $save_data[$count]['houses_id'] = $house_id;
                     $save_data[$count]['type'] = $type;
                     $count++;
                 }
+            }
             $this->agent_house->updateUserAll($save_data);
 
             if ($type == 2) {

application/index/service/ImageDepotService.php

@@ -22,9 +22,10 @@ class ImageDepotService
      * 获取随机图片
      * @param int $img_type 图片类型:0室外图 ，1室内图 ，2人群图
      * @param string $label 标签
+     * @param string $not_in_id  排除之前获取过的图片
      * @return array|false|\PDOStatement|string|\think\Collection
      */
-    public function getImageWidthRand($img_type=0,$label='商场美食',$not_in_id)
+    public function getImageWidthRand($img_type=0,$label='商场美食',$not_in_id = '')
     {
         $params_['img_status'] = 0;
         if (!empty($not_in_id)) {