Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

application/api_broker/controller/OrderLog.php

@@ -13,6 +13,7 @@ use app\model\OBargainModel;
 use app\model\OMarchInModel;
 use app\model\ORefundModel;
 use think\Exception;
+use Think\Log;
 
 /**
  * Created by PhpStorm.
@@ -115,8 +116,9 @@ class OrderLog extends Basic
         $params["collecting_bill"] = json_decode($params["collecting_bill"], true);
 
         $remark       = isset($params["remark"]) ? $params["remark"] : "";
-        $transfer_img = isset($params["transfer_img"]) ? $params["transfer_img"] : "";
-        $source       = $params["source"] ? $params["source"] : 0;
+        $transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"] ,true): "";
+        Log::record("********************transfer_img**". json_encode($transfer_img));
+        $source       = isset($params["source"]) ? $params["source"] : 0;
         $is_ok        = $this->service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],
             $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source);
 

application/api_broker/service/OrderLogService.php

@@ -80,6 +80,7 @@ class OrderLogService
             //保存图片
             $oImgModel = new OImg();
             $oImgModel->addImgAll($father_id,2,$transfer_img);
+
             $pushMarchIn = new PushMessageService($params["report_id"], 2);
             $pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送
         }
@@ -285,6 +286,7 @@ class OrderLogService
         $field_pay_log = "id,order_no,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
         remark,transfer_img,real_money,source,create_time";
         $payLogData    = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]);
+        
         if (count($payLogData) > 0) {
             foreach ($payLogData as $k => $v) {
                 $v["step_name"]  = "pay_log";

application/index/controller/Collection.php

@@ -11,6 +11,7 @@ namespace app\index\controller;
 
 use app\index\extend\Basic;
 use app\index\untils\ExportExcelUntil;
+use app\model\OImg;
 use app\model\OPayLogModel;
 
 class Collection extends Basic
@@ -135,6 +136,7 @@ class Collection extends Basic
             return view('getCollection');
         }
     }
+
     public function addRealMoney(){
         $params = $this->params;
        /* $params = array(
@@ -158,4 +160,69 @@ class Collection extends Basic
         }
     }
 
+
+    /**
+     * 收款列表记录上传图片
+     * 朱伟 2018-07-04
+     */
+    public function addReceiptImg(){
+        $params = $this->params;
+        /*$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","请求参数错误");
+        }
+        $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"]     = $params["img_name"];//图片名称
+        $save_data["img_status"]   = 0 ;//删除状态 0正常 1删除
+        $save_data["update_time"]  = $time;//更新时间
+        $save_data["create_time"]  = $time;//创建时间
+
+        $order = new OImg();
+        $res = $order->addImgOnce($save_data);
+        if($res){
+            return $this->response("200","成功");
+        }else{
+            return $this->response("101","失败");
+        }
+    }
+
+    /**
+     * 收款列表-删除上传图片
+     * 朱伟 2018-07-04
+     */
+    public function deleteReceiptImg(){
+        $params = $this->params;
+        /*$params = array(
+            "id"       => 3,
+            "img_name"     => 123,
+        );*/
+
+        if(!isset($params["id"])){
+            return $this->response("101","请求参数错误");
+        }
+
+        $time = date("Y-m-d H:i:s", time());
+        $save_data["id"]       = $params["id"];//id根据img_type区分是收款还是进场还是其他'
+        $save_data["img_status"]   = 1 ;//删除状态 0正常 1删除
+        $save_data["update_time"]  = $time;//更新时间
+
+
+
+        $order = new OImg();
+        $res = $order->updateImgStatus($save_data);
+        if($res){
+            return $this->response("200","成功");
+        }else{
+            return $this->response("101","失败");
+        }
+    }
 }
\ No newline at end of file

application/model/OImg.php

@@ -11,10 +11,11 @@ namespace app\model;
  */
 use think\Db;
 use think\Exception;
+use Think\Log;
 
 class OImg extends BaseModel
 {
-    protected $table = "o_img";
+    protected $table = "o_imgs";
     private $db_;
 
     public function __construct($data = [])
@@ -53,7 +54,7 @@ class OImg extends BaseModel
      * @return int|string
      * @throws Exception xx
      */
-    public function addImgAll(int $img_id, int $img_type,array $params): int
+    public function addImgAll(int $img_id, int $img_type, array $params): int
     {
         $imgBin = [];
         foreach ($params as $item) {

application/route.php

@@ -232,6 +232,10 @@ Route::group('index', [
     'carryOut'                           => [ 'index/Supervise/carryOut', [ 'method' => 'get' ] ],//监督执行
     'toReportListOne'                    => [ 'index/Finance/toReportListOne', [ 'method' => 'POST' ] ], //回到一级审核
     'checkOver'                          => [ 'index/Finance/checkOver', [ 'method' => 'POST' ] ], //财务结单
+    'addReceiptImg'                      => [ 'index/Collection/addReceiptImg', [ 'method' => 'post|get' ] ],//收款图片信息保存
+    'deleteReceiptImg'                   => [ 'index/Collection/deleteReceiptImg', [ 'method' => 'post|get' ] ],//删除收款图片
+
+
 
     'getTaxesById'     => [ 'index/Finance/getTaxesById', [ 'method' => 'POST|GET' ] ], //财务结单
     'financeUpdateLog' => [ 'index/Finance/financeUpdateLog', [ 'method' => 'POST|GET' ] ], //财务结单