|
|
@@ -2,12 +2,14 @@
|
|
|
|
|
|
namespace app\admin\service\goods;
|
|
|
|
|
|
+use app\model\Appointment;
|
|
|
use app\model\Goods;
|
|
|
use app\model\GoodsComponent;
|
|
|
use app\model\GoodsDetail;
|
|
|
use app\model\GoodsLabel;
|
|
|
use app\model\GoodsRunning;
|
|
|
use app\model\GoodsSku;
|
|
|
+use app\model\OrderSheet;
|
|
|
use app\model\SysCategory;
|
|
|
use app\model\SysDept;
|
|
|
use app\model\SysSerial;
|
|
|
@@ -1113,6 +1115,20 @@ class GoodsService
|
|
|
return json_fail("数据错误~");
|
|
|
}
|
|
|
|
|
|
+ // 是否在套包里
|
|
|
+ if (GoodsComponent::whereIn('join_component_goods_id',$ids)->exists()){
|
|
|
+ return json_fail("当前商品存在于套包中，请先在套包中删除");
|
|
|
+ }
|
|
|
+ // 是否已被购买过
|
|
|
+ if (OrderSheet::whereIn('join_sheet_goods_id',$ids)->exists()){
|
|
|
+ return json_fail("当前商品已有购买历史，如不在APP显示，请选择【下架】操作");
|
|
|
+ }
|
|
|
+ // 是否预约过
|
|
|
+ if (Appointment::whereIn('join_appointment_goods_id',$ids)->exists()){
|
|
|
+
|
|
|
+ return json_fail("当前商品已有预约历史，如不在APP显示，请选择【下架】操作");
|
|
|
+ }
|
|
|
+
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
|
Goods::whereIn('goods_id', $ids)->delete();
|
|
|
@@ -1575,7 +1591,7 @@ class GoodsService
|
|
|
$data['goods_cover'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_cover']);
|
|
|
}
|
|
|
$data['goods_on_addtimes'] = isset($data['goods_on_addtimes']) ? strtotime($data['goods_on_addtimes']) : 0;
|
|
|
- $data['goods_sku_json'] = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => []]);
|
|
|
+ $data['goods_sku_json'] = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => ['标准']]);
|
|
|
|
|
|
$row = Goods::find($data['goods_id']);
|
|
|
if ($row->join_goods_category_id != $data['join_goods_category_id']) {
|
gorden