diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 2bc23d61..68739369 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2570,13 +2570,13 @@ class StoreOrderRepository extends BaseRepository } else { //默认其他分类 $cate_id = 1726; - $spec_type = 1; + $spec_type = 0; $detail = $attr; /**查询平台分类 */ - $cate_id_one = Db::name('store_category')->where('mer_id', 0)->where('cate_name', $datum['value']['cate_id_one'])->value('store_category_id'); + $cate_id_one = Db::name('store_category')->where('is_show',1)->where('mer_id', 0)->where('cate_name', $datum['value']['cate_id_one'])->value('store_category_id'); if ($cate_id_one) { - $cate_id_two = Db::name('store_category')->where('mer_id', 0)->where('cate_name', $datum['value']['cate_id_two'])->value('store_category_id'); + $cate_id_two = Db::name('store_category')->where('is_show',1)->where('mer_id', 0)->where('pid',$cate_id_one)->where('cate_name', $datum['value']['cate_id_two'])->value('store_category_id'); if ($cate_id_two) { $cate_id = $cate_id_two; } @@ -2697,6 +2697,7 @@ class StoreOrderRepository extends BaseRepository "mer_status" => 1, "rate" => 3, ]; + $make = app()->make(ProductRepository::class); $product_id = $make->create($datas, $product_type); if ($product_id) { @@ -2747,6 +2748,7 @@ class StoreOrderRepository extends BaseRepository $attrValue['price'] = $datum['value']['price']; $attrValue['procure_price'] = $procure_price; $attrValue["image"] = "https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/oa_app/23565656.png"; + Db::name('store_product')->where('product_id',$find['product_id'])->update(['spec_type'=>1]); Db::name('store_product_attr_value')->insert($attrValue); } /** diff --git a/app/common/repositories/system/CacheRepository.php b/app/common/repositories/system/CacheRepository.php index 999121dd..04dff9e7 100644 --- a/app/common/repositories/system/CacheRepository.php +++ b/app/common/repositories/system/CacheRepository.php @@ -38,6 +38,9 @@ class CacheRepository extends BaseRepository const CONSIGN_PRODUCT_AGREE = 'consign_product_agree'; //商户开通采购、交易及结算功能协议 const MERC_SETTLE_AGREE = 'mer_settlement_agree'; + + //生鲜类商品交易售后纠纷处理规则 + const FRESHRULES = 'fresh_rules'; //积分说明 const INTEGRAL_RULE = 'sys_integral_rule'; @@ -91,6 +94,7 @@ class CacheRepository extends BaseRepository ['label' => '供应链商户补充协议','key' => self::MERC_SUPPLY_AGREE], ['label' => '产品代销三方合作协议书', 'key' => self::CONSIGN_PRODUCT_AGREE], ['label' => '商户开通采购、交易及结算功能协议', 'key' => self::MERC_SETTLE_AGREE], + ['label' => '生鲜类商品交易售后纠纷处理规则', 'key' => self::FRESHRULES], ]; if (!$type) { $data[] = ['label' => '注销声明', 'key' => self::CANCELLATION_MSG]; @@ -125,6 +129,7 @@ class CacheRepository extends BaseRepository self::MERC_SUPPLY_AGREE, self::CONSIGN_PRODUCT_AGREE, self::MERC_SETTLE_AGREE, + self::FRESHRULES, ]; } diff --git a/app/event.php b/app/event.php index 7ae53a8c..30312949 100644 --- a/app/event.php +++ b/app/event.php @@ -37,7 +37,7 @@ return [ \crmeb\listens\AutoUnLockBrokerageListen::class, \crmeb\listens\AutoSendPayOrderSmsListen::class, \crmeb\listens\SyncSmsResultCodeListen::class, - \crmeb\listens\SyncBroadcastStatusListen::class, + // \crmeb\listens\SyncBroadcastStatusListen::class,直播间 \crmeb\listens\ExcelFileDelListen::class, \crmeb\listens\RefundOrderAgreeListen::class, \crmeb\listens\SeckillTImeCheckListen::class,