ad

app/admin/controller/Sale.php

@@ -1030,8 +1030,8 @@ class Sale extends Base
         }
 
         //新加字段
-        $platform_order = isset($this->post['platform_order']) && $this->post['platform_order'] != "" ? $this->post['platform_order'] : "";
-        $workNo = isset($this->post['workNo']) && $this->post['workNo'] != "" ? $this->post['workNo'] : "";
+        $platform_order = isset($this->post['platform_order']) && $this->post['platform_order'] != "" ?  trim($this->post['platform_order']) : "";
+        $workNo = isset($this->post['workNo']) && $this->post['workNo'] != "" ? trim($this->post['workNo']) : "";
         $proof_type = isset($this->post['proof_type']) && $this->post['proof_type'] != "" ? intval($this->post['proof_type']) : 0;
         $proof_url = isset($this->post['proof_url']) && $this->post['proof_url'] != "" ? trim($this->post['proof_url']) : '';
         Db::startTrans();

app/admin/controller/User.php

@@ -32,8 +32,8 @@ class User extends BaseController
             $post['uid']=$uid;
             }else{
                 $post['nouid']=$uid;
+                unset($post['status']);
             }
-            unset($post['status']);
         }
 
 
@@ -250,8 +250,9 @@ class User extends BaseController
                 $post['uid']= isset($uids)?array_unique(array_merge($uids,$uid)):$uid;
             }else{
                 $post['nouid']=$uid;
+                unset($post['status']);
             }
-            unset($post['status']);
+
         }
         $userinfo=GetList($token,$post);
         if(empty($userinfo)||$userinfo['code']!=0){

app/admin/model/SaleInfo.php

@@ -3,6 +3,7 @@ declare (strict_types = 1);
 
 namespace app\admin\model;
 
+use think\facade\Log;
 use think\Model;
 
 /**
@@ -23,6 +24,7 @@ class SaleInfo extends Model
 			if(empty($arr))throw new \Exception("未找到可用的批次库存数据",1006);
 			$stockid = array_unique(array_column($arr,"stockid"));
 			$stock=self::name("good_stock")->where(["id"=>$stockid])->column("id,usable_stock,wait_out_stock",'id');
+//			Log::write("库存更新{$orderCode}:".json_encode($stock,JSON_UNESCAPED_UNICODE),"info",true);
 			foreach ($arr as $value){
 				$temp=["send_num"=>0,"updatetime"=>date("Y-m-d H:i:s")];
 				if($sendNum==0) break;
@@ -30,12 +32,14 @@ class SaleInfo extends Model
 					$sendNum-=$value['send_num'];
 					$stockup=["total_stock"=>$stock[$value['stockid']]['wait_out_stock']+$stock[$value['stockid']]['usable_stock']-$value['send_num'],"wait_out_stock"=>$stock[$value['stockid']]['wait_out_stock']-$value['send_num'],"updatetime"=>date("Y-m-d H:i:s")];
 				}else{
-				$temp['send_num'] =$value['send_num']-$sendNum;
-				$stockup=["total_stock"=>$stock[$value['stockid']]['wait_out_stock']+$stock[$value['stockid']]['usable_stock']-$sendNum,"wait_out_stock"=>$stock[$value['stockid']]['wait_out_stock']-$sendNum,"updatetime"=>date("Y-m-d H:i:s")];
-				$sendNum=0;
+					$temp['send_num'] =$value['send_num']-$sendNum;
+					$stockup=["total_stock"=>$stock[$value['stockid']]['wait_out_stock']+$stock[$value['stockid']]['usable_stock']-$sendNum,"wait_out_stock"=>$stock[$value['stockid']]['wait_out_stock']-$sendNum,"updatetime"=>date("Y-m-d H:i:s")];
+					$sendNum=0;
 				}
-				self::where($value)->update($temp);
-				self::name("good_stock")->where($stock[$value['stockid']])->update($stockup);
+				$ip = self::where($value)->update($temp);
+				if($ip==false) throw new \Exception("库存更新失败");
+				$sp=self::name("good_stock")->where($stock[$value['stockid']])->update($stockup);
+				if($sp==false) throw new \Exception("库存更新失败");
 			}
 			return true;
     }