Commit 9c5334ac authored by clone's avatar clone

bug

parent a09244a8
...@@ -13,6 +13,7 @@ use app\model\OBargainModel; ...@@ -13,6 +13,7 @@ use app\model\OBargainModel;
use app\model\OMarchInModel; use app\model\OMarchInModel;
use app\model\ORefundModel; use app\model\ORefundModel;
use think\Exception; use think\Exception;
use Think\Log;
/** /**
* Created by PhpStorm. * Created by PhpStorm.
...@@ -115,8 +116,9 @@ class OrderLog extends Basic ...@@ -115,8 +116,9 @@ class OrderLog extends Basic
$params["collecting_bill"] = json_decode($params["collecting_bill"], true); $params["collecting_bill"] = json_decode($params["collecting_bill"], true);
$remark = isset($params["remark"]) ? $params["remark"] : ""; $remark = isset($params["remark"]) ? $params["remark"] : "";
$transfer_img = isset($params["transfer_img"]) ? $params["transfer_img"] : ""; $transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"] ,true): "";
$source = $params["source"] ? $params["source"] : 0; 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"], $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); $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source);
......
...@@ -80,6 +80,7 @@ class OrderLogService ...@@ -80,6 +80,7 @@ class OrderLogService
//保存图片 //保存图片
$oImgModel = new OImg(); $oImgModel = new OImg();
$oImgModel->addImgAll($father_id,2,$transfer_img); $oImgModel->addImgAll($father_id,2,$transfer_img);
$pushMarchIn = new PushMessageService($params["report_id"], 2); $pushMarchIn = new PushMessageService($params["report_id"], 2);
$pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送 $pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送
} }
...@@ -285,6 +286,7 @@ class OrderLogService ...@@ -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, $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"; remark,transfer_img,real_money,source,create_time";
$payLogData = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]); $payLogData = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]);
if (count($payLogData) > 0) { if (count($payLogData) > 0) {
foreach ($payLogData as $k => $v) { foreach ($payLogData as $k => $v) {
$v["step_name"] = "pay_log"; $v["step_name"] = "pay_log";
......
...@@ -11,10 +11,11 @@ namespace app\model; ...@@ -11,10 +11,11 @@ namespace app\model;
*/ */
use think\Db; use think\Db;
use think\Exception; use think\Exception;
use Think\Log;
class OImg extends BaseModel class OImg extends BaseModel
{ {
protected $table = "o_img"; protected $table = "o_imgs";
private $db_; private $db_;
public function __construct($data = []) public function __construct($data = [])
...@@ -53,7 +54,7 @@ class OImg extends BaseModel ...@@ -53,7 +54,7 @@ class OImg extends BaseModel
* @return int|string * @return int|string
* @throws Exception xx * @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 = []; $imgBin = [];
foreach ($params as $item) { foreach ($params as $item) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment