|
@@ -60,7 +60,7 @@ class Cgdmake
|
|
|
if($info->fill_type==2){
|
|
|
$origins=(new GoodNake())->where([['spuCode', '=', $orderinfo->good_code], ['min_num', '<=',
|
|
|
$info->good_num], ['is_del', '=', 0]])->order('min_num desc')->findOrEmpty();
|
|
|
- $good = (new Good())->where(['spuCode'=>$orderinfo->spuCode])->findOrEmpty();
|
|
|
+ $good = (new Good())->where(['spuCode'=>$orderinfo->good_code])->findOrEmpty();
|
|
|
$origin =array_merge($good->toArray(),$origins->toArray());
|
|
|
}
|
|
|
if($info->fill_type==3){
|