1

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();
+    }
 
 
 

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));
     }
 

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;

app/job/controller/goods/AdminImport.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/Collector.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/GoodsAddPrice.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/GoodsDelete.php

@@ -1,13 +1,5 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
+
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/GoodsOffline.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/GoodsOnline.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/GoodsStoreImport.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/GoodsUpdateImport.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

app/job/controller/goods/Import.php

@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\job\controller\goods;

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,