sjCapital 优化

app/ghs/controllers/SjCapitalController.php

@@ -2,7 +2,7 @@
 
 namespace ghs\controllers;
 
-use biz\merchant\services\SjCapitalService;
+use bizTy\sj\services\SjCapitalService;
 use Yii;
 use common\components\util;
 

app/shop/controllers/SjCapitalController.php

@@ -2,7 +2,7 @@
 
 namespace shop\controllers;
 
-use biz\merchant\services\SjCapitalService;
+use bizTy\sj\services\SjCapitalService;
 use Yii;
 use common\components\util;
 

biz-ghs/merchant/classes/SjCapitalClass.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace bizGhs\merchant\classes;
-
-use Yii;
-use biz\base\classes\BaseClass;
-
-class SjCapitalClass extends BaseClass
-{
-
-	public static $baseFile = '\bizGhs\merchant\models\SjCapital';
-	
-	//收支流水类型，60以内表示收入，60以上表示支出
-	public $capitalType = [
-		'xhOrder' => ['id' => 0, 'name' => 'xhOrder'],
-	];
-	
-	//收支流水类型对应链接
-	public $capitalTypeList = [
-		0 => ['link' => '/capital/order-detail', 'name' => '网店', 'orderLink' => '/order/detail'],
-	];
-	
-}

biz-ghs/merchant/models/SjCapital.php

@@ -1,13 +0,0 @@
-<?php
-namespace bizGhs\merchant\models;
-use biz\base\models\Base;
-
-class SjCapital extends Base
-{
-
-	public static function tableName()
-	{
-		return 'xhSjCapital';
-	}
-
-}

biz-ghs/merchant/services/SjCapitalService.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace bizGhs\merchant\services;
-
-use biz\base\services\BaseService;
-use bizGhs\merchant\classes\SjCapitalClass;
-use biz\stat\services\StatIncomeCategoryService;
-use biz\stat\services\StatIncomeUsageService;
-use common\components\validate;
-use common\components\util;
-use Yii;
-
-class SjCapitalService extends BaseService
-{
-
-    public static $baseFile = '\bizGhs\merchant\classes\SjCapitalClass';
-
-    //商家订单类的流水归类 shish 2019.12.17
-    public static function orderClassify($data)
-    {
-        $capitalId = $data['capitalId'];
-        if (empty($capitalId)) {
-            util::fail('没有找到商家流水id');
-        }
-        $capital = SjCapitalClass::getById($capitalId, true);
-        $capital->usageId = $data['usageId'];
-        $capital->categoryId = $data['categoryId'];
-        $capital->save();
-
-        //类型增加资金
-        StatIncomeCategoryService::replaceData($data);
-        //用途增加资金
-        StatIncomeUsageService::replaceData($data);
-    }
-
-    //收入流水 shish 2020.1.8
-
-    /**
-     * 商家的收入方式：
-     * 收入来源：门店、朋友圈、商城、美团
-     * 收入类型：出售商品、客户充值、介绍花店佣金收入
-     * 付款方式：
-     */
-    public static function getCapitalList($where)
-    {
-        $data = self::getList('*', $where, 'addTime DESC');
-        if (isset($data['list']) == false || empty($data['list'])) {
-            return $data;
-        }
-        foreach ($data['list'] as $key => $val) {
-            $data['list'][$key]['event'] = '门店收款';
-        }
-        return $data;
-    }
-
-}

biz/merchant/classes/SjCapitalClass.php → biz-ty/sj/classes/SjCapitalClass.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace biz\merchant\classes;
+namespace bizTy\sj\classes;
 
 use Yii;
-use biz\base\classes\BaseClass;
+use bizTy\base\classes\BaseClass;
 
 class SjCapitalClass extends BaseClass
 {
 
-	public static $baseFile = '\biz\merchant\models\SjCapital';
+	public static $baseFile = '\bizTy\sj\models\SjCapital';
 	
 	//收支流水类型，60以内表示收入，60以上表示支出
 	public $capitalType = [

biz/merchant/models/SjCapital.php → biz-ty/sj/models/SjCapital.php

@@ -1,6 +1,6 @@
 <?php
-namespace biz\merchant\models;
-use biz\base\models\Base;
+namespace bizTy\sj\models;
+use bizTy\base\models\Base;
 
 class SjCapital extends Base
 {

biz/merchant/services/SjCapitalService.php → biz-ty/sj/services/SjCapitalService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace biz\merchant\services;
+namespace bizTy\sj\services;
 
-use biz\base\services\BaseService;
-use biz\merchant\classes\SjCapitalClass;
+use bizTy\base\services\BaseService;
+use bizTy\sj\classes\SjCapitalClass;
 use biz\stat\services\StatIncomeCategoryService;
 use biz\stat\services\StatIncomeUsageService;
 use common\components\validate;
@@ -13,7 +13,7 @@ use Yii;
 class SjCapitalService extends BaseService
 {
 	
-	public static $baseFile = '\biz\merchant\classes\SjCapitalClass';
+	public static $baseFile = '\bizTy\sj\classes\SjCapitalClass';
 	
 	//商家订单类的流水归类 shish 2019.12.17
 	public static function orderClassify($data)

biz/order/services/OrderService.php

@@ -3,7 +3,7 @@
 namespace biz\order\services;
 
 use biz\base\services\BaseService;
-use biz\merchant\services\SjCapitalService;
+use bizTy\sj\services\SjCapitalService;
 use bizTy\sj\services\MerchantService;
 use biz\order\classes\OrderClass;
 use biz\order\models\Order;

console/controllers/UpgradeController.php

@@ -6,7 +6,7 @@ use biz\goods\services\GoodsCategoryService;
 use biz\goods\services\GoodsService;
 use biz\goods\services\GoodsStyleService;
 use bizTy\sj\classes\MerchantClass;
-use biz\merchant\services\SjCapitalService;
+use bizTy\sj\services\SjCapitalService;
 use bizTy\sj\services\MerchantExtendService;
 use bizTy\sj\services\MerchantService;
 use biz\message\services\TMessageService;