文字修改

application/index/controller/OfficeBargain.php

@@ -973,10 +973,10 @@ class OfficeBargain extends Basic
 
                     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']);  //核销红包
-                        }
+//                        if ($user_id) {
+//                            $service = new ConvertCouponService();
+//                            $service->convertCoupon($user_id, $bargain_data['report_id'], $this->params['bargain_id'], $bargain_data['order_id']);  //核销红包
+//                        }
                     }
                 }
                 $i++;

application/index/controller/OfficePayLog.php

@@ -2100,7 +2100,7 @@ class OfficePayLog extends Basic
             return '<script>alert("导出失败");window.close();</script>';
         }
         $export = new ExportExcelUntil();
-        $title  = [ '提交时间','退款ID','状态','订单ID','收款ID','退款金额','入账日期','退款类型','提交人','所属门店','商铺ID','商铺地址'];
+        $title  = [ '提交时间','退款ID','状态','订单ID','收款ID','退款金额','入账日期','退款类型','提交人','所属门店','楼盘房源ID','商铺地址'];
         $export->exportTable('退款审核明细表', $excel_data, 11, '退款审核明细表 （退款总计：'.$total_money.')', $title);
         return '';
     }
@@ -2134,8 +2134,8 @@ class OfficePayLog extends Basic
         $data = $refund_data[0];
 
         if ($data['agent_id']) {
-            $m_store = new AAgents();
-            $store_name = $m_store->getAgentsStoreById(['a.id'=>$data['agent_id']], 'a.name,b.store_name');
+            $redis = new RedisCacheService();
+            $store_name = $redis->getRedisCache(2, $data['agent_id']);
             $data['store_name'] = $store_name['store_name'];
             $data['agent_name'] = $store_name['name'];
         } else {