|
@@ -37,9 +37,9 @@ use app\admin\model\GoodZixun;use app\cxinv\model\CaixiaoData;use think\App;use
|
|
|
$array_diff['cgder'] =$persion->person?:'';
|
|
|
$array_diff['cgder_id'] =$persion->personid?:'';
|
|
|
}
|
|
|
- array_map(function ($item,$key)use($purchOrder,&$before){
|
|
|
+ array_map(function ($key)use($purchOrder,&$before){
|
|
|
$before[$key]= $purchOrder[$key]??"";
|
|
|
- },$array_diff);
|
|
|
+ },array_keys($array_diff));
|
|
|
}
|
|
|
if($param['type']==2){
|
|
|
$saleOrder = \app\admin\model\Sale::where("orderCode",$param['code'])->findOrEmpty();
|
|
@@ -49,17 +49,17 @@ use app\admin\model\GoodZixun;use app\cxinv\model\CaixiaoData;use think\App;use
|
|
|
return error("销售单存在已对账数据",10005,$orderIsCheck);
|
|
|
}
|
|
|
$array_diff=array_diff($param['change'],$saleOrder->toArray());
|
|
|
- array_map(function ($item,$key)use($saleOrder,&$before){
|
|
|
+ array_map(function ($key)use($saleOrder,&$before){
|
|
|
$before[$key]= $saleOrder[$key]??'';
|
|
|
- },$array_diff);
|
|
|
+ },array_keys($array_diff));
|
|
|
}
|
|
|
if($param['type']==3){
|
|
|
$good = GoodZixun::where("spuCode",$param['code'])->findOrEmpty();
|
|
|
if($good->isEmpty()) return error("咨询商品不存在");
|
|
|
$array_diff=array_diff($param['change'],$good->toArray());
|
|
|
- array_map(function ($item,$key)use($good,&$before){
|
|
|
+ array_map(function ($key)use($good,&$before){
|
|
|
$before[$key]= $good[$key]??'';
|
|
|
- },$array_diff);
|
|
|
+ },array_keys($array_diff));
|
|
|
}
|
|
|
$isT= $this->model->where(["code"=>$param['code'],"status"=>1])->findOrEmpty();
|
|
|
if($isT->isEmpty()==false)return error("订单修改存在未完成得流程");
|