|
@@ -132,7 +132,6 @@ class Order extends Base
|
|
|
if($id==""){
|
|
|
return error_show(1004,"unit_id不能为空");
|
|
|
}
|
|
|
-
|
|
|
$kg= Db::name('unit')->where(["is_del" => 0,"id"=>$id,"status"=>1])->field("id,name,weight,limit_num")->find();
|
|
|
// var_dump(Db::name('unit')->where(["is_del" => 0,"id"=>$id,"status"=>1])->getLastSql());
|
|
|
if(empty($kg)){
|
|
@@ -244,8 +243,15 @@ class Order extends Base
|
|
|
$unit = Db::name('unit')->where(['is_del'=>0,'status'=>1])->field("id,name,weight,limit_num")->select();
|
|
|
$limit=[];
|
|
|
foreach ($unit as $value){
|
|
|
+ $zl =0;
|
|
|
$num = intval($data['stock']/$value['weight']);
|
|
|
- $value['limit_num'] = $value['limit_num']==0 ||$value['limit_num']>$num ? $num : $value['limit_num'];
|
|
|
+ if($value['limit_num']>0){
|
|
|
+ $zl = Db::name('order_log')->where(["unit_id"=>$value['id'],"accountid"=>$this->userinfo['id']])->sum('num');
|
|
|
+ $value['limit_num']>$zl?$value['limit_num'] -= $zl:$value['limit_num']=0;
|
|
|
+ $value['limit_num'] = $value['limit_num']>$num ? $num : $value['limit_num'];
|
|
|
+ }else{
|
|
|
+ $value['limit_num'] = $num ;
|
|
|
+ }
|
|
|
$limit[]=$value;
|
|
|
}
|
|
|
$data['limit']=$limit;
|