|
@@ -1273,17 +1273,6 @@ class After extends Base
|
|
|
->find();
|
|
|
if ($stock == false || $stock['usable_stock'] < $good_num) return error_show(1003, "库存数量不足");
|
|
|
|
|
|
- } else {
|
|
|
- if ($is_activity == 0) {
|
|
|
- $origin = Db::name("good_nake")
|
|
|
- ->where([["spuCode", "=", $spuCode], ["min_num", "<=", $good_num], ["is_del", "=", 0]])
|
|
|
- ->order("min_num desc")
|
|
|
- ->find();
|
|
|
-
|
|
|
- if (empty($origin)) return error_show(1003, "未找到相关阶梯成本价格");
|
|
|
-
|
|
|
- $origin_price = $origin['nake_total'];
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
$goodinfo['cgd_gold_price'] = 0;
|
|
@@ -1300,7 +1289,6 @@ class After extends Base
|
|
|
|
|
|
if ($act['activity_stock'] < $good_num) return error_show(1003, "商品活动库存剩余{$act['activity_stock']}");
|
|
|
|
|
|
- $origin_price = $act['cost_price'];
|
|
|
} else {
|
|
|
$good = Db::name("good_ladder")
|
|
|
->where(["skuCode" => $skuCode, "is_del" => 0, "status" => 1])
|
|
@@ -1394,7 +1382,7 @@ class After extends Base
|
|
|
// "cat_id" => $goodinfo['cat_id'],
|
|
|
"apply_id" => $rm,
|
|
|
"apply_name" => $ri,
|
|
|
-// "origin_price" => $origin_price,
|
|
|
+ "origin_price" => $origin_price,
|
|
|
"sale_price" => $sale_price,
|
|
|
// "post_fee" => 0,
|
|
|
// "status" => 0,
|