ad

app/admin/controller/OrderPay.php

@@ -599,7 +599,7 @@ class OrderPay extends BaseController{
          $page = $page>$total ? intval($total):$page;
          $list=Db::name("trade_return")->alias("a")->leftJoin("assoc b","a.logNo=b.viceCode")
          ->leftJoin("qrd_info c","c.sequenceNo=b.orderCode")
-         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName")
+         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName,c.customerNo")
          ->where($condition)->page($page,$size)->order("a.addtime desc")->select();
          return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/command/handleCxData.php

@@ -87,6 +87,8 @@ class handleCxData extends command
 									          'ownerName'=>$data['apply_name'] ,//销售员,
 									          'ownerid'=>$data['apply_id'] ,//销售员id,
 									          'department'=>$data['depart'] ,//部门,
+									           'manager'=>$data['manager']??"",
+                                               'managerid'=>$data['managerid']??0,
 									          'createdTime'=>$data['addtime'] ,//销售单创建时间,
 									          'qrdType'=>$data['order_type'] ,//销售单类型,
 									          'qrdSource'=>$data['order_source'] ,//销售单来源,
@@ -178,6 +180,12 @@ class handleCxData extends command
 									          'goodDesc'=>$data['cost_desc'] ,//工艺说明,
 									          'goodType'=>$data['good_type'] ,//商品类型,
 									          'goodModel'=>'' ,//商品型号,
+//									          'companyNo'=>$data['supplierNo'] ,//业务企业编号,
+//									          'companyName'=>$data['supplier_name'] ,//业务企业名称,
+//									          'customerNo'=>$data['customer_code'] ,//客户编号,
+//									          'customerName'=>$data['customer_name'] ,//客户名称,
+									           'manager'=>$data['manager']??'',
+                                               'managerid'=>$data['managerid']??0,
 									          'metalsType'=>$data['noble_metal'] ,//贵金属种类,
 									          'weight'=>$data['good_weight'] ,//商品重量,
 									          'deliveryDay'=>$data['delivery_day'] ,//物流天数,
@@ -279,7 +287,8 @@ class handleCxData extends command
 						    ];
 					    }
 						if($data['cgdNo']!=''){
-								Db::name('cgd_info')->where(['sequenceNo'=>$data['cgdNo']])->update(['qrdSend',$data['send_status']]);
+								Db::name('cgd_info')->where(['sequenceNo'=>$data['cgdNo']])->update
+								(['qrdSend'=>$data['send_status']]);
 							}
 					
 				    } else {
@@ -302,7 +311,7 @@ class handleCxData extends command
 					                  ->whereIn('sequenceNo' , $data['cgdNo'])
 					                  ->field('id,status')->findOrEmpty();
 					    $data['qrdSend'] = Db::name("qrd_info")->where(["cgdNo"=>$data['cgdNo']])->value
-					    ("sendStatus",0);
+					    ("sendStatus",1);
 					    if (!empty($exists_cgd)) {
 
 						    //未对账，更新

app/common.php

@@ -712,7 +712,7 @@ if(!function_exists("getUidByDepartId")){
 		$uidArr=Cache::get("Depart_Uid_Arr_$depart_id");
 		if($uidArr==false){
 			$uidArr = Db::connect("mysql_sys")->name("account_item")->where(["itemid"=>$depart_id])->column("account_id");
-			Cache::set("Depart_Uid_Arr_$depart_id",$uidArr);
+			Cache::set("Depart_Uid_Arr_$depart_id",$uidArr, new \DateTime(date("Y-m-d 23:59:59")));
 		}
 		return $uidArr;
 	}