admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cost plan recost use cost.srv_json, ordersv2 edit_bill init bill_time

Browse Source
This commit is contained in:
qianhy
2023-03-02 17:04:05 +08:00
committed by lccsw
parent 0f5b5ada75
commit b9c4ab9914
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/receiver/orderv2/Orders.php
+2 -1
View File
@@ -874,6 +874,8 @@ class Orders extends HD_Controller
}else{
$jsondata = json_decode($row['jsondata'],true);
}
$bill_time = date('Y-m-d H:i:s'); # 2023-03-02 $if_usedcar或识别图片开票时间失败，强制开票时间为当前时间
if(!$if_usedcar){
//图片识别
$img_url = build_qiniu_image_url($file);
@@ -881,7 +883,6 @@ class Orders extends HD_Controller
if (!$orc_res['code']) {
return $this->show_json(2, $orc_res['msg']);
}
$bill_time = date('Y-m-d H:i:s');
$carinfo = $orc_res['data']['CarInvoiceInfos'];
if(is_array($carinfo)){
foreach($carinfo as $kye=>$val){
api/controllers/plan/Order.php
+17 -13
View File
@@ -483,9 +483,10 @@ class Order extends CI_Controller{
'id in (select o_id from lc_items_cost)' => null,
);
$bill_time && $where["bill_time >= '{$bill_time}'"] = null;
$id && $where['id'] = $id;
$rows = $this->receiver_orders_v2_model->select($where,'',0,0);
echo "recost: <br>";
echo $this->receiver_orders_v2_model->db->last_query()."<br>";
echo $this->receiver_orders_v2_model->db->last_query()."<br><br>";
}
if ($debug){
echo "debug mode start <br><br>get order_v2: {$id}<br>";
@@ -508,6 +509,13 @@ class Order extends CI_Controller{
foreach ($rows as $item) {
$if_usedcar = $item['if_usedcar'];
$biz = $this->biz_model->get(['id'=>$item['biz_id']]);
$cost = $srv_json_cost = array();
if ($recost || $debug){
$cost = $this->items_cost_model->get(array('o_id'=>$item['id']));
$srv_json_cost = json_decode($cost['srv_json'], true);
echo $this->items_cost_model->db->last_query()."<br>";
}
if ($debug){
echo "finance_id: {$item['finance_id']}"."<br>";
echo "biz_id: {$item['biz_id']}"."<br>";
@@ -551,6 +559,7 @@ class Order extends CI_Controller{
}
$srv_json = [];
$recost && $srv_json = $srv_json_cost; // recost要保留原来有可能修改过的srv
//精品
$srv_json['price_fine_select'] = $money_json['price_fine_select'] ? $money_json['price_fine_select'] : 0;
@@ -917,25 +926,20 @@ class Order extends CI_Controller{
$srv_json['if_pay'] = $pay_price>=$need_price ? 1 : 0;
if ($recost){
# 已标记为齐款的，不能设置为0
$cost = $this->items_cost_model->get(array('o_id'=>$item['id']));
$srv_json_ = json_decode($cost['srv_json'], true);
if ($srv_json_['if_pay']){
$srv_json['if_pay'] = 1;
}
$srv_json_cost['if_pay'] && $srv_json['if_pay'] = 1;
}
$add_data['srv_json'] = json_encode($srv_json,JSON_UNESCAPED_UNICODE);
if ($debug){
echo "get add_data : <br>";
var_dump($add_data);
if ($cost = $this->items_cost_model->get(array('o_id'=>$item['id']))){
if ($cost){
echo "<br><br>";
echo $this->items_cost_model->db->last_query()."<br>";
var_dump($cost);
echo "<br>";
echo "c_time: ".date("Y-m-d H:i:s",$cost['c_time'])."<br>";
echo "srv_json:<br>";
var_dump(json_decode($cost['srv_json'], true));
var_dump($srv_json_cost);
}
echo "<br><br>debug mode end<br><br>";
exit();
@@ -951,17 +955,17 @@ class Order extends CI_Controller{
if(is_numeric($id)){
$this->items_cost_model->update_total($id);
if ($recost){
echo "更新成功订单id:{$item['id']}<br>";
echo "更新成功订单id:{$item['id']}<br><br>";
}
else{
echo "添加成功订单id:{$item['id']}<br>";
echo "添加成功订单id:{$item['id']}<br><br>";
}
}else{
if ($recost){
echo "忽略更新订单id:{$item['id']}<br>";
echo "忽略更新订单id:{$item['id']}<br><br>";
}
else{
echo "添加失败订单id:{$item['id']}<br>";
echo "添加失败订单id:{$item['id']}<br><br>";
}
}
}