diff --git a/app/admin/controller/store_branch_product/StoreBranchProductController.php b/app/admin/controller/store_branch_product/StoreBranchProductController.php index eec659f37..c26452cb4 100644 --- a/app/admin/controller/store_branch_product/StoreBranchProductController.php +++ b/app/admin/controller/store_branch_product/StoreBranchProductController.php @@ -5,6 +5,7 @@ namespace app\admin\controller\store_branch_product; use app\admin\controller\BaseAdminController; use app\admin\lists\store_branch_product\StoreBranchProductLists; +use app\admin\logic\store_branch_product\StoreBranchProductLogic; use app\admin\logic\store_product\StoreProductLogic; use app\admin\validate\store_product\StoreProductValidate; use app\common\model\store_branch_product\StoreBranchProduct; @@ -45,7 +46,15 @@ class StoreBranchProductController extends BaseAdminController } return $this->fail(StoreProductLogic::getError()); } - + public function update() + { + $params = $this->request->post(); + StoreBranchProductLogic::edit($params); + if (StoreBranchProductLogic::hasError()) { + return $this->fail(StoreBranchProductLogic::getError()); + } + return $this->success('更新成功', [], 1, 1); + } /** * @notes 编辑门店商品辅助列表 @@ -55,10 +64,10 @@ class StoreBranchProductController extends BaseAdminController */ public function edit() { - $params =$this->request->post(); - foreach($params['data'] as $k=>$v){ + $params = $this->request->post(); + foreach ($params['data'] as $k => $v) { StoreProductLogic::stock($v); - if(StoreProductLogic::hasError()){ + if (StoreProductLogic::hasError()) { return $this->fail(StoreProductLogic::getError()); } } @@ -73,13 +82,13 @@ class StoreBranchProductController extends BaseAdminController */ public function edit_price() { - $params =$this->request->post(); - $res= StoreBranchProduct::where('id',$params['id'])->update(['price'=>$params['price']]); - if($res){ - return $this->success('编辑成功', [], 1, 1); - }else{ - return $this->fail('编辑失败', [], 1, 1); - } + $params = $this->request->post(); + $res = StoreBranchProduct::where('id', $params['id'])->update(['price' => $params['price']]); + if ($res) { + return $this->success('编辑成功', [], 1, 1); + } else { + return $this->fail('编辑失败', [], 1, 1); + } } /** * @notes 编辑门店商品辅助库存 @@ -117,6 +126,4 @@ class StoreBranchProductController extends BaseAdminController $result = StoreProductLogic::detail($params); return $this->data($result); } - - -} \ No newline at end of file +} diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 40f1da786..1e95deedd 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -101,12 +101,7 @@ class StoreProductLogic extends BaseLogic public static function edit(array $params): bool { Db::startTrans(); - $StoreProduct = StoreProduct::where('id', $params['id'])->find(); try { - if ($StoreProduct['cate_id'] != $params['cate_id']) { - StoreCategory::where('id', $params['cate_id'])->inc('three')->update(); - StoreCategory::where('id', $StoreProduct['cate_id'])->dec('three')->update(); - } $data = [ 'store_name' => $params['store_name'], 'image' => $params['image'], diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php index a1b6d7a96..f51b487f7 100644 --- a/app/queue/redis/StoreStorageSend.php +++ b/app/queue/redis/StoreStorageSend.php @@ -64,6 +64,7 @@ class StoreStorageSend implements Consumer if ($product_arr['stock'] > 0) { $this->storage($find, $store_id, $admin_id, $product_arr); } + StoreProductLogic::updateGoodsclass($find['cate_id']); Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/store/controller/ConfigController.php b/app/store/controller/ConfigController.php index 70bf9ff4b..c13dec726 100644 --- a/app/store/controller/ConfigController.php +++ b/app/store/controller/ConfigController.php @@ -17,6 +17,8 @@ namespace app\store\controller; use app\admin\logic\ConfigLogic; use app\admin\logic\system_store\SystemStoreLogic; use app\common\controller\Definitions; +use app\common\service\ConfigService; +use app\common\service\FileService; use hg\apidoc\annotation as ApiDoc; use think\facade\Db; @@ -48,7 +50,23 @@ class ConfigController extends BaseAdminController ] public function getConfig() { - $data = ConfigLogic::getConfig(); + // $data = ConfigLogic::getConfig(); + $data = [ + // 文件域名 + 'oss_domain' => FileService::getFileUrl(), + + // 网站名称 + 'web_name' => '泸优采门店后台', + // 网站图标 + 'web_favicon' => FileService::getFileUrl(ConfigService::get('website', 'web_favicon')), + // 网站logo + 'web_logo' => FileService::getFileUrl(ConfigService::get('website', 'web_logo')), + // 登录页 + 'login_image' => FileService::getFileUrl(ConfigService::get('website', 'login_image')), + + // 版权信息 + 'copyright_config' => ConfigService::get('copyright', 'config', []), + ]; return $this->data($data); }