add

application/api_broker/service/OfficePayLogService.php

@@ -2,6 +2,7 @@
 
 namespace app\api_broker\service;
 
+use app\model\OfficeOImg;
 use app\model\OfficeOPayLogAdjustment;
 use app\model\OfficeOPayLogModel;
 use app\model\OfficeORefundModel;
@@ -85,9 +86,8 @@ class OfficePayLogService
         if (count($pay_log_arr) < 0) {
             return -1;
         }
-        $oPayLogAdjustment = new OPayLogAdjustment();
         $where_ = $this->adjustmentBin($new_pay_id, $pay_id, $money, $type, $agent_id, $pay_log_arr[0]["type"]);
-        $oPayLogAdjustment->addAdjustment($where_);
+        $this->payLogAdjustmentModel->addAdjustment($where_);
     }
 
     /**
@@ -271,7 +271,7 @@ class OfficePayLogService
      */
     private function addOImg($id, $type, $transfer_img)
     {
-        $oImgModel = new OImg();
+        $oImgModel = new OfficeOImg();
         $oImgModel->addImgAll($id, $type, $transfer_img);
     }
 
@@ -283,7 +283,7 @@ class OfficePayLogService
     private function getOImg($id, $img_type)
     {
         //查询图片
-        $oImgModel = new OImg();
+        $oImgModel = new OfficeOImg();
         $params["img_id"] = $id;
         $params["img_type"] = $img_type;
         $img_arr = $oImgModel->getImgList($params);
@@ -295,7 +295,7 @@ class OfficePayLogService
      * @param $del_img
      */
     private function delOImg($type, $del_img){
-        $oImgModel = new OImg();
+        $oImgModel = new OfficeOImg();
         $ids = rtrim($del_img, ",");
         $where_["id"] = array("in",$ids);
         $where_["img_type"] = $type;

application/index/controller/Finance.php

@@ -26,6 +26,7 @@ use app\model\OBargainLogModel;
 use app\model\OBargainModel;
 use app\model\ODaily;
 use app\model\OfficeOImg;
+use app\model\OfficeOPayLogModel;
 use app\model\OImg;
 use app\model\OMarchInModel;
 use app\model\OPayLogAdjustment;
@@ -3526,7 +3527,6 @@ class Finance extends Basic
         }
     }
 
-
     /**
      * 收款列表记录上传图片
      * 朱伟 2018-07-04
@@ -3565,44 +3565,6 @@ class Finance extends Basic
         }
     }
 
-    /**
-     * 收款列表记录上传图片
-     * 朱伟 2018-07-04
-     */
-    public function addReceiptOfficeImg(){
-        $params = $this->params;
-        $result = 0;
-        /*$params = array(
-             "img_id"       => 1,
-             "img_name"     => 123,
-         );*/
-
-        if(!isset($params["img_id"])){
-            return $this->response("101","请求参数错误");
-        }
-        if(!isset($params["img_name"])){
-            return $this->response("101","请求参数错误");
-        }
-        $order = new OfficeOImg();
-
-        foreach (explode(',',$params["img_name"]) as $k => $v){
-            $time = date("Y-m-d H:i:s", time());
-            $save_data["img_id"]       = $params["img_id"];//id根据img_type区分是收款还是进场还是其他'
-            $save_data["img_type"]     = 2 ;//图片类型:1进场，2收款
-            $save_data["img_name"]     = $v;//图片名称
-            $save_data["img_status"]   = 0 ;//删除状态 0正常 1删除
-            $save_data["update_time"]  = $time;//更新时间
-            $save_data["create_time"]  = $time;//创建时间
-            $result = $order->addImgOnce($save_data);
-        }
-
-        if($result){
-            return $this->response("200","成功");
-        }else{
-            return $this->response("101","失败");
-        }
-    }
-
     /**
      * 收款列表-删除上传图片
      * 朱伟 2018-07-04

application/index/service/OfficeRoomService.php

@@ -1251,7 +1251,7 @@ class OfficeRoomService
             $order = 'a.home_page_sort desc';
         }
 
-        $field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id,a.price,a.price_total';
+        $field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id,a.price,a.price_total,b.status';
         try {
             $data = $this->m_office_room->getRoomBuilding($page_no, $page_size, $order, $field, $where);
         } catch (\Exception $e) {

application/route.php

@@ -1046,6 +1046,9 @@ Route::group('office_index', [
     'getPayLogImg'        => ['index/DailyPaper/getPayLogOfficeImg', ['method' => 'get|post']],
     'receiptImgList'      => ['index/officePayLog/receiptOfficeImgList', ['method' => 'post|get']],//收款列表-收款图片列表
     'getCollectionEdit'   => ['index/officePayLog/getCollectionEdit', ['method' => 'post']],//收款修改保存
+    'refundPayLog'        => ['index/officePayLog/refundPayLog', ['method' => 'POST']],//退款
+    'delPayLog'           => ['index/officePayLog/delPayLog', ['method' => 'POST']],//删除收款
+    'delAdjustment'       => ['index/officePayLog/delAdjustment', ['method' => 'post']],//撤销调整
 
 ]);