longyi 6 달 전
부모
커밋
214067f3e7
4개의 변경된 파일14개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 0
      core/CoreApp/controllers/Apiexpress.php
  2. 4 0
      core/CoreApp/controllers/Transfer.php
  3. 5 5
      core/CoreApp/models/Model_api.php
  4. 4 0
      template/erp/transfer_operate.html

+ 1 - 0
core/CoreApp/controllers/Apiexpress.php

@@ -37,6 +37,7 @@ class Apiexpress extends Start_Controller {
         if(empty($order_no)){
             die($this->logic_tools->ret_json(-1,"请求单号异常"));
         }
+        $order_no = $shop.$order_no;
         $table_name = $this->logic_tools->getOrderTable($shop);
         $info = $this->logic_order->getInfoByTableName($table_name,"orderinfo = ".$order_no);
         if(empty($info)){

+ 4 - 0
core/CoreApp/controllers/Transfer.php

@@ -864,6 +864,10 @@ class Transfer extends Start_Controller {
 		$transfer_str = implode(",",$transfer_ids);
 		$this->data['cz_1_num'] = $this->systemtransfer_cr->find_count("orver_flag = 1 and is_over = 0 and time > ".(time()-3600*24*7)  ." and lx in (".$transfer_str.")");
 		$this->data['cz_2_num'] = $this->systemtransfer_cr->find_count("orver_flag = 2 and is_over = 0 and time > ".(time()-3600*24*7)  ." and lx in (".$transfer_str.")");
+		$jiaji_num = 0;
+	
+		
+		$this->data['jiaji_num'] = $jiaji_num;
 		$this->_Template('transfer_operate',$this->data);
 	}
 	

+ 5 - 5
core/CoreApp/models/Model_api.php

@@ -856,11 +856,11 @@ function __construct(){
 		$post['issku'] = implode(",",$pxsku);
 		$post['quantity'] = implode(";",$pxquantity);
 		**/
-		if(stripos($post['issku'],'+') !== false){
-			$this->logic_ding->sendToDing("测试获取3+1订单未转化数据".json_encode($v));
-			$this->logic_ding->sendToDing("测试获取3+1订单已转化数据".json_encode($post));
-		}
-		
+// 		if(stripos($post['issku'],'+') !== false){
+// 			$this->logic_ding->sendToDing("测试获取3+1订单未转化数据".json_encode($v));
+// 			$this->logic_ding->sendToDing("测试获取3+1订单已转化数据".json_encode($post));
+// 		}
+		$this->logic_ding->sendToDing("获取独立站的订单".json_encode($v));
 		
 		$matching = $this->matching($post['quantity'],$post['issku'],$dtc,$money,$int,$dtctitle,$shop,[
 			'row_total'=>isset($v['row_total'])?$v['row_total']:"0",

+ 4 - 0
template/erp/transfer_operate.html

@@ -76,6 +76,10 @@
 <li>
     <font class="cona lv_chaoshi" data-url="/transfer/linqi" style="color:#fff;background-color: #f33;">已超时({$cz_2_num})</font>
    
+</li>
+<li>
+    <font class="cona"  style="color:#fff;background-color: #f33;">加急({$jiaji_num})</font>
+   
 </li>
 </ul>
 <table class="datatitle data" border="0" style="border-collapse:collapse;">