王晓刚 / market · 提交

转到一个项目

作者 耿培杰
提交 92d66c117da9454d96175149d42e18937b5d517c 1 个父辈 d72cf3f8

修改订单付款接口

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 1 行删除
@@ -280,6 +280,7 @@ class Goods extends Model @@ -280,6 +280,7 @@ class Goods extends Model
280 $sum_stock_num = $this->alias('g') 280 $sum_stock_num = $this->alias('g')
281 ->join('fa_depot d','g.id=d.goods_id') 281 ->join('fa_depot d','g.id=d.goods_id')
282 ->where(['g.id' => $goodsId]) 282 ->where(['g.id' => $goodsId])
  283 + ->where('type',1)
283 ->field('d.id,d.stock_num') 284 ->field('d.id,d.stock_num')
284 ->sum('d.stock_num'); 285 ->sum('d.stock_num');
285 if($number > $sum_stock_num){ 286 if($number > $sum_stock_num){
@@ -150,8 +150,9 @@ class IntegralGoods extends Model @@ -150,8 +150,9 @@ class IntegralGoods extends Model
150 */ 150 */
151 public function checkStockNum($goodsId,$number){ 151 public function checkStockNum($goodsId,$number){
152 $sum_stock_num = $this->alias('g') 152 $sum_stock_num = $this->alias('g')
153 - ->join('fa_integral_depot d','g.id=d.goods_id') 153 + ->join('fa_depot d','g.id=d.goods_id')
154 ->where(['g.id' => $goodsId]) 154 ->where(['g.id' => $goodsId])
  155 + ->where('type',2)
155 ->field('d.id,d.stock_num') 156 ->field('d.id,d.stock_num')
156 ->sum('d.stock_num'); 157 ->sum('d.stock_num');
157 if($number > $sum_stock_num){ 158 if($number > $sum_stock_num){