From d53f2a913b36a9258bb23708744869c7fe05683c Mon Sep 17 00:00:00 2001 From: lqmac Date: Thu, 27 Jun 2024 00:23:47 +0800 Subject: [PATCH] 1 --- app/admin/controller/Store.php | 12 +++++++++++- app/api/controller/User.php | 5 +++-- app/common/model/Goods.php | 1 + app/job/controller/goods/AdminImport.php | 9 --------- app/job/controller/goods/Collector.php | 9 --------- app/job/controller/goods/GoodsAddPrice.php | 9 --------- app/job/controller/goods/GoodsDelete.php | 10 +--------- app/job/controller/goods/GoodsOffline.php | 9 --------- app/job/controller/goods/GoodsOnline.php | 9 --------- app/job/controller/goods/GoodsStoreImport.php | 9 --------- app/job/controller/goods/GoodsUpdateImport.php | 9 --------- app/job/controller/goods/Import.php | 9 --------- app/job/service/goods/GoodsAddPrice.php | 1 + 13 files changed, 17 insertions(+), 84 deletions(-) diff --git a/app/admin/controller/Store.php b/app/admin/controller/Store.php index 345b3c2a..ead2b3b4 100644 --- a/app/admin/controller/Store.php +++ b/app/admin/controller/Store.php @@ -387,7 +387,17 @@ class Store extends Controller return $this->renderSuccess(); } - + /** + * 多商户初始化 + * [merchant description] + * @param int $storeId [description] + * @return [type] [description] + */ + public function deleteGoods(int $storeId): Json + { + + return $this->renderSuccess(); + } diff --git a/app/api/controller/User.php b/app/api/controller/User.php index 6696ed33..58283d10 100644 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -403,7 +403,8 @@ class User extends Controller $scene = "refereeId:" . $user_id; $storeId = request()->header()['storeid']; // 下载小程序码 - $page = 'pages/login/index'; + //$page = 'pages/login/index'; + $page = 'pages/index/index'; $qrcode = $obj->getQrcode((int)$storeId, $scene, $page, 'MP-WEIXIN'); return $this->renderSuccess(str_replace(root_path() . "public/", base_url(), $qrcode)); } @@ -423,7 +424,7 @@ class User extends Controller $user_id = $userInfo = UserService::getCurrentLoginUserId(true); $obj = new \app\common\service\qrcode\BaseQRcode(); $scene = 'refereeId:' . $user_id; - $qrcode = $obj->getQrcode((int)$storeId, $scene, 'pages/login/index', 'MP-WEIXIN'); + $qrcode = $obj->getQrcode((int)$storeId, $scene, 'pages/index/index', 'MP-WEIXIN'); return $this->renderSuccess(str_replace(root_path() . "public/", base_url(), $qrcode)); } diff --git a/app/common/model/Goods.php b/app/common/model/Goods.php index efa8f559..26f62d39 100644 --- a/app/common/model/Goods.php +++ b/app/common/model/Goods.php @@ -258,6 +258,7 @@ class Goods extends BaseModel foreach ($list as &$goods) { $goods['dic'] = 'admin'; + $goods['after_markup_price'] = round($goods['cost_price_min'] / (1 - ($goods['markup_rate'] / 100)), 0); $goods = $this->setGoodsData($goods, null); } return $list; diff --git a/app/job/controller/goods/AdminImport.php b/app/job/controller/goods/AdminImport.php index 044d0e67..6559e07f 100644 --- a/app/job/controller/goods/AdminImport.php +++ b/app/job/controller/goods/AdminImport.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/Collector.php b/app/job/controller/goods/Collector.php index 7a3f5e50..8933d17d 100644 --- a/app/job/controller/goods/Collector.php +++ b/app/job/controller/goods/Collector.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/GoodsAddPrice.php b/app/job/controller/goods/GoodsAddPrice.php index c3d24f2c..699f157d 100644 --- a/app/job/controller/goods/GoodsAddPrice.php +++ b/app/job/controller/goods/GoodsAddPrice.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/GoodsDelete.php b/app/job/controller/goods/GoodsDelete.php index 2ad7ce79..e24b9eaa 100644 --- a/app/job/controller/goods/GoodsDelete.php +++ b/app/job/controller/goods/GoodsDelete.php @@ -1,13 +1,5 @@ -// +---------------------------------------------------------------------- + declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/GoodsOffline.php b/app/job/controller/goods/GoodsOffline.php index 3f251365..655e88d0 100644 --- a/app/job/controller/goods/GoodsOffline.php +++ b/app/job/controller/goods/GoodsOffline.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/GoodsOnline.php b/app/job/controller/goods/GoodsOnline.php index 7dda50eb..19af7ef0 100644 --- a/app/job/controller/goods/GoodsOnline.php +++ b/app/job/controller/goods/GoodsOnline.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/GoodsStoreImport.php b/app/job/controller/goods/GoodsStoreImport.php index b788d5a1..abe01823 100644 --- a/app/job/controller/goods/GoodsStoreImport.php +++ b/app/job/controller/goods/GoodsStoreImport.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/GoodsUpdateImport.php b/app/job/controller/goods/GoodsUpdateImport.php index a9f8b72e..cdebbaf7 100644 --- a/app/job/controller/goods/GoodsUpdateImport.php +++ b/app/job/controller/goods/GoodsUpdateImport.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/controller/goods/Import.php b/app/job/controller/goods/Import.php index 87fa3a68..7a85b26b 100644 --- a/app/job/controller/goods/Import.php +++ b/app/job/controller/goods/Import.php @@ -1,13 +1,4 @@ -// +---------------------------------------------------------------------- declare (strict_types=1); namespace app\job\controller\goods; diff --git a/app/job/service/goods/GoodsAddPrice.php b/app/job/service/goods/GoodsAddPrice.php index 595d42d0..549f6970 100644 --- a/app/job/service/goods/GoodsAddPrice.php +++ b/app/job/service/goods/GoodsAddPrice.php @@ -70,6 +70,7 @@ class GoodsAddPrice extends BaseService $profit_rate = (float)$item['goods_price_min'] > 0 ? bcmul((string)($profit / (float)$item['goods_price_min']) , (string)100, 2) : 0.00; $goodsData = [ 'cost_price_min' => $cost_price, + 'after_markup_price' => $cost_price, 'profit_rate' => $profit_rate, 'profit' => $profit, 'markup_rate' => $rate,