wangmingchuan
/
yanzong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
lszyh
lqmac 5 months ago
parent 29cddcaeb2
commit d53f2a913b
13 changed files with 17 additions and 84 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      app/admin/controller/Store.php
  2. 5
      app/api/controller/User.php
  3. 1
      app/common/model/Goods.php
  4. 9
      app/job/controller/goods/AdminImport.php
  5. 9
      app/job/controller/goods/Collector.php
  6. 9
      app/job/controller/goods/GoodsAddPrice.php
  7. 10
      app/job/controller/goods/GoodsDelete.php
  8. 9
      app/job/controller/goods/GoodsOffline.php
  9. 9
      app/job/controller/goods/GoodsOnline.php
  10. 9
      app/job/controller/goods/GoodsStoreImport.php
  11. 9
      app/job/controller/goods/GoodsUpdateImport.php
  12. 9
      app/job/controller/goods/Import.php
  13. 1
      app/job/service/goods/GoodsAddPrice.php

10
app/admin/controller/Store.php
Unescape View File

@ -387,7 +387,17 @@ class Store extends Controller
return $this->renderSuccess(); return $this->renderSuccess();
} }
/**
* 多商户初始化
* [merchant description]
* @param int $storeId [description]
* @return [type] [description]
*/
public function deleteGoods(int $storeId): Json
{
return $this->renderSuccess();
}

5
app/api/controller/User.php
Unescape View File

@ -403,7 +403,8 @@ class User extends Controller
$scene = "refereeId:" . $user_id; $scene = "refereeId:" . $user_id;
$storeId = request()->header()['storeid']; $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'); $qrcode = $obj->getQrcode((int)$storeId, $scene, $page, 'MP-WEIXIN');
return $this->renderSuccess(str_replace(root_path() . "public/", base_url(), $qrcode)); 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); $user_id = $userInfo = UserService::getCurrentLoginUserId(true);
$obj = new \app\common\service\qrcode\BaseQRcode(); $obj = new \app\common\service\qrcode\BaseQRcode();
$scene = 'refereeId:' . $user_id; $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)); return $this->renderSuccess(str_replace(root_path() . "public/", base_url(), $qrcode));
} }

1
app/common/model/Goods.php
Unescape View File

@ -258,6 +258,7 @@ class Goods extends BaseModel
foreach ($list as &$goods) { foreach ($list as &$goods) {
$goods['dic'] = 'admin'; $goods['dic'] = 'admin';
$goods['after_markup_price'] = round($goods['cost_price_min'] / (1 - ($goods['markup_rate'] / 100)), 0);
$goods = $this->setGoodsData($goods, null); $goods = $this->setGoodsData($goods, null);
} }
return $list; return $list;

9
app/job/controller/goods/AdminImport.php
Unescape View File

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

9
app/job/controller/goods/Collector.php
Unescape View File

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

9
app/job/controller/goods/GoodsAddPrice.php
Unescape View File

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

10
app/job/controller/goods/GoodsDelete.php
Unescape View File

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

9
app/job/controller/goods/GoodsOffline.php
Unescape View File

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

9
app/job/controller/goods/GoodsOnline.php
Unescape View File

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

9
app/job/controller/goods/GoodsStoreImport.php
Unescape View File

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

9
app/job/controller/goods/GoodsUpdateImport.php
Unescape View File

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

9
app/job/controller/goods/Import.php
Unescape View File

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

1
app/job/service/goods/GoodsAddPrice.php
Unescape View File

@ -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; $profit_rate = (float)$item['goods_price_min'] > 0 ? bcmul((string)($profit / (float)$item['goods_price_min']) , (string)100, 2) : 0.00;
$goodsData = [ $goodsData = [
'cost_price_min' => $cost_price, 'cost_price_min' => $cost_price,
'after_markup_price' => $cost_price,
'profit_rate' => $profit_rate, 'profit_rate' => $profit_rate,
'profit' => $profit, 'profit' => $profit,
'markup_rate' => $rate, 'markup_rate' => $rate,

Write Preview
Loading…
Cancel
Save