Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app/ghs/controllers/RechargeController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace ghs\controllers;
+
+use biz\saas\services\RegionService;
+use common\components\util;
+
+class RechargeController extends BaseController
+{
+	
+	//充值记录 shish 2021.2.21
+	public function actionList()
+	{
+		$where = ['shopId' => $this->shopId, 'payStatus' => RechargeClass::PAY_STATUS_HAS_PAY];
+		$list = RechargeClass::getRechargeList($where);
+		util::success($list);
+	}
+	
+	//充值余额 shish 2021.2.21
+	public function actionBalance()
+	{
+		ini_set('date.timezone', 'Asia/Shanghai');
+		$get = Yii::$app->request->get();
+		$amount = $get['amount'] ?? 500;
+		$wxPay = configDict::getConfig('payWay', 'weixinPay');
+		$data = [
+			'amount' => $amount,
+			'payWay' => $wxPay,
+			'sjId' => $this->sjId,
+			'sjStyle' => MerchantClass::STYLE_RETAIL,
+			'shopId' => $this->shopId,
+			'modPrice' => 0,
+			'remark' => '',
+		];
+		$order = RechargeClass::addOrder($data);
+		$orderSn = $order['orderSn'];
+		$name = $order['orderName'] ?? '充值';
+		$totalFee = $order['amount'];
+		
+		//强制使用小程序的miniOpenId
+		$openId = $this->admin['miniOpenId'];
+		
+		$capitalTypeData = configDict::getConfig('capitalType');
+		$capitalType = $capitalTypeData['xhRecharge']['id'];
+		//流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
+		$wxPayType = 0;
+		if (httpUtil::isMiniProgram()) {
+			$wxPayType = 1;
+		}
+		$attach = "couponId=0&capitalType=" . $capitalType . '&wxPayType=' . $wxPayType;
+		//订单30分钟后过期
+		$now = time();
+		$expireTime = $now + 1800;
+		
+		$wx = Yii::getAlias("@vendor/weixin");
+		require_once($wx . '/lib/WxPay.Api.php');
+		require_once($wx . '/example/WxPay.JsApiPay.php');
+		$input = new \WxPayUnifiedOrder();
+		$input->SetBody($name);
+		$input->SetOut_trade_no($orderSn);
+		$input->SetTotal_fee($totalFee * 100);
+		$input->SetTime_start(date("YmdHis", $now));
+		$input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
+		$input->SetTime_expire(date("YmdHis", $expireTime));
+		$input->SetNotify_url(Yii::$app->params['shopHost'] . '/notice/wx-callback/');
+		$input->SetTrade_type("JSAPI");
+		
+		$merchantExtend = WxOpenClass::getWxInfo();
+		if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
+			$input->SetSub_openid($openId);
+		} else {
+			$input->SetOpenid($openId);
+		}
+		
+		//强制使用小程序的AppId
+		$merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
+		
+		$wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
+		$tools = new \JsApiPay();
+		$jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
+		$newParams = json_decode($jsApiParameters, true);
+		util::success($newParams);
+	}
+
+}

app/ghs/controllers/MerchantCapitalController.php → app/ghs/controllers/SjCapitalController.php

@@ -2,11 +2,11 @@
 
 namespace ghs\controllers;
 
-use biz\merchant\services\MerchantCapitalService;
+use biz\merchant\services\SjCapitalService;
 use Yii;
 use common\components\util;
 
-class MerchantCapitalController extends BaseController
+class SjCapitalController extends BaseController
 {
 
 	//列表 shish 2020.1.8
@@ -14,7 +14,7 @@ class MerchantCapitalController extends BaseController
 	{
 		$get = Yii::$app->request->get();
 		$where = ['merchantId' => $this->sjId];
-		$list = MerchantCapitalService::getCapitalList($where);
+		$list = SjCapitalService::getCapitalList($where);
 		util::success($list);
 	}
 

app/shop/controllers/CashController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace shop\controllers;
+
+use biz\merchant\classes\CashClass;
+use common\components\util;
+
+class CashController extends BaseController
+{
+
+    //客户列表 shish 2019.11.30
+    public function actionList()
+    {
+        $where = ['shopId' => $this->shopId];
+        $list = CashClass::getCashList($where);
+        util::success($list);
+    }
+
+}

app/shop/controllers/MerchantCapitalController.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace shop\controllers;
-
-use biz\merchant\services\MerchantCapitalService;
-use Yii;
-use common\components\util;
-
-class MerchantCapitalController extends BaseController
-{
-
-	//列表 shish 2020.1.8
-	public function actionList()
-	{
-		$get = Yii::$app->request->get();
-		$where = ['merchantId' => $this->sjId];
-		$list = MerchantCapitalService::getCapitalList($where);
-		util::success($list);
-	}
-
-}

app/shop/controllers/RechargeController.php

@@ -3,7 +3,7 @@
 namespace shop\controllers;
 
 use biz\merchant\classes\MerchantClass;
-use biz\recharge\classes\RechargeClass;
+use bizTy\recharge\classes\RechargeClass;
 use biz\wx\classes\WxOpenClass;
 use common\components\configDict;
 use common\components\httpUtil;
@@ -101,6 +101,72 @@ class RechargeController extends BaseController
         util::success($newParams);
     }
 
+    //充值余额 shish 2021.2.21
+    public function actionBalance()
+    {
+        ini_set('date.timezone', 'Asia/Shanghai');
+        $get = Yii::$app->request->get();
+        $amount = $get['amount'] ?? 500;
+        $wxPay = configDict::getConfig('payWay', 'weixinPay');
+        $data = [
+            'amount' => $amount,
+            'payWay' => $wxPay,
+            'sjId' => $this->sjId,
+            'sjStyle' => MerchantClass::STYLE_RETAIL,
+            'shopId' => $this->shopId,
+            'modPrice' => 0,
+            'remark' => '',
+        ];
+        $order = RechargeClass::addOrder($data);
+        $orderSn = $order['orderSn'];
+        $name = $order['orderName'] ?? '充值';
+        $totalFee = $order['amount'];
+
+        //强制使用小程序的miniOpenId
+        $openId = $this->admin['miniOpenId'];
+
+        $capitalTypeData = configDict::getConfig('capitalType');
+        $capitalType = $capitalTypeData['xhRecharge']['id'];
+        //流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
+        $wxPayType = 0;
+        if (httpUtil::isMiniProgram()) {
+            $wxPayType = 1;
+        }
+        $attach = "couponId=0&capitalType=" . $capitalType . '&wxPayType=' . $wxPayType;
+        //订单30分钟后过期
+        $now = time();
+        $expireTime = $now + 1800;
+
+        $wx = Yii::getAlias("@vendor/weixin");
+        require_once($wx . '/lib/WxPay.Api.php');
+        require_once($wx . '/example/WxPay.JsApiPay.php');
+        $input = new \WxPayUnifiedOrder();
+        $input->SetBody($name);
+        $input->SetOut_trade_no($orderSn);
+        $input->SetTotal_fee($totalFee * 100);
+        $input->SetTime_start(date("YmdHis", $now));
+        $input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
+        $input->SetTime_expire(date("YmdHis", $expireTime));
+        $input->SetNotify_url(Yii::$app->params['shopHost'] . '/notice/wx-callback/');
+        $input->SetTrade_type("JSAPI");
+
+        $merchantExtend = WxOpenClass::getWxInfo();
+        if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
+            $input->SetSub_openid($openId);
+        } else {
+            $input->SetOpenid($openId);
+        }
+
+        //强制使用小程序的AppId
+        $merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
+
+        $wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
+        $tools = new \JsApiPay();
+        $jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
+        $newParams = json_decode($jsApiParameters, true);
+        util::success($newParams);
+    }
+
     //续期成功 shish 2021.2.21
     public function actionRenewSuccess()
     {

app/shop/controllers/SjCapitalController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace shop\controllers;
+
+use biz\merchant\services\SjCapitalService;
+use Yii;
+use common\components\util;
+
+class SjCapitalController extends BaseController
+{
+
+    //列表 shish 2020.1.8
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $where = ['merchantId' => $this->sjId];
+        $list = SjCapitalService::getCapitalList($where);
+        util::success($list);
+    }
+
+}

biz-ghs/merchant/classes/MerchantCapitalClass.php → biz-ghs/merchant/classes/SjCapitalClass.php

@@ -5,10 +5,10 @@ namespace bizGhs\merchant\classes;
 use Yii;
 use biz\base\classes\BaseClass;
 
-class MerchantCapitalClass extends BaseClass
+class SjCapitalClass extends BaseClass
 {
 
-	public static $baseFile = '\bizGhs\merchant\models\MerchantCapital';
+	public static $baseFile = '\bizGhs\merchant\models\SjCapital';
 	
 	//收支流水类型，60以内表示收入，60以上表示支出
 	public $capitalType = [

biz-ghs/merchant/models/MerchantCapital.php → biz-ghs/merchant/models/SjCapital.php

@@ -2,12 +2,12 @@
 namespace bizGhs\merchant\models;
 use biz\base\models\Base;
 
-class MerchantCapital extends Base
+class SjCapital extends Base
 {
 
 	public static function tableName()
 	{
-		return 'xhMerchantCapital';
+		return 'xhSjCapital';
 	}
 
 }

biz-ghs/merchant/services/MerchantCapitalService.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace bizGhs\merchant\services;
-
-use biz\base\services\BaseService;
-use bizGhs\merchant\classes\MerchantCapitalClass;
-use biz\stat\services\StatIncomeCategoryService;
-use biz\stat\services\StatIncomeUsageService;
-use common\components\validate;
-use common\components\util;
-use Yii;
-
-class MerchantCapitalService extends BaseService
-{
-	
-	public static $baseFile = '\bizGhs\merchant\classes\MerchantCapitalClass';
-	
-	//商家订单类的流水归类 shish 2019.12.17
-	public static function orderClassify($data)
-	{
-		$capitalId = $data['capitalId'];
-		if (empty($capitalId)) {
-			util::fail('没有找到商家流水id');
-		}
-		$capital = MerchantCapitalClass::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-ghs/merchant/services/SjCapitalService.php

@@ -0,0 +1,56 @@
+<?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-ghs/order/services/OrderService.php

@@ -150,7 +150,7 @@ class OrderService extends BaseService
                 'amount' => $order->actPrice,
                 'payWay' => $order->payWay,
             ];
-            MerchantCapitalService::orderClassify($setData);
+            SjCapitalService::orderClassify($setData);
 
             $transaction->commit();
         } catch (Exception $e) {

biz-ghs/recharge/classes/RechargeClass.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace bizGhs\recharge\classes;
+
+use bizGhs\base\classes\BaseClass;
+use bizGhs\merchant\classes\ShopClass;
+use common\components\noticeUtil;
+use common\components\orderSn;
+
+class RechargeClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\recharge\models\Recharge';
+
+    const PAY_STATUS_UN_PAY = 1;
+    const PAY_STATUS_HAS_PAY = 2;
+
+    //充值记录 shish 2021.2.21
+    public static function getRechargeList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        return $data;
+    }
+
+    //创建订单 shish 2021.2.21
+    public static function addOrder($data)
+    {
+        $data['orderSn'] = orderSn::getRechargeSn();
+        return self::add($data);
+    }
+
+    //处理充值流程 shish 2021.2.21
+    public static function complete($recharge)
+    {
+        $recharge->payStatus = self::PAY_STATUS_HAS_PAY;
+        $recharge->save();
+        $orderSn = $recharge->orderSn;
+        $shopId = $recharge->shopId;
+        $shop = ShopClass::getById($shopId, true);
+        if (empty($shop)) {
+            noticeUtil::push("充值支付回调通知，没有找到门店 orderSn:{$orderSn}");
+            return false;
+        }
+        $amount = $recharge->amount;
+        ShopClass::addBalance($shop, $amount);
+    }
+
+}

biz-ghs/recharge/classes/RechargeSnClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizGhs\recharge\classes;
+
+use bizGhs\base\classes\BaseClass;
+
+class RechargeSnClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\recharge\models\RechargeSn';
+
+}

biz-ghs/recharge/models/Recharge.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizGhs\recharge\models;
+
+use bizGhs\base\models\Base;
+
+class Recharge extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhRecharge';
+    }
+
+}

biz-ghs/recharge/models/RechargeSn.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizGhs\recharge\models;
+
+use bizGhs\base\models\Base;
+
+class RechargeSn extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhRechargeSn';
+    }
+
+}

biz-ghs/recharge/services/RechargeService.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizGhs\recharge\services;
+
+use bizGhs\base\services\BaseService;
+
+class RechargeService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\recharge\classes\RechargeClass';
+
+}

biz-ty/base/classes/BaseClass.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace bizTy\base\classes;
+
+class BaseClass extends \common\base\classes\BaseClass
+{
+
+}

biz-ty/base/models/Base.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace bizTy\base\models;
+
+class Base extends \common\base\models\Base
+{
+
+}

biz-ty/base/services/BaseService.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace bizTy\base\services;
+
+class BaseService extends 	\common\base\services\BaseService
+{
+
+}

biz/recharge/classes/RechargeClass.php → biz-ty/recharge/classes/RechargeClass.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace biz\recharge\classes;
+namespace bizTy\recharge\classes;
 
-use biz\base\classes\BaseClass;
+use bizTy\base\classes\BaseClass;
 use biz\merchant\classes\ShopClass;
 use common\components\noticeUtil;
 use common\components\orderSn;
@@ -10,7 +10,7 @@ use common\components\orderSn;
 class RechargeClass extends BaseClass
 {
 
-    public static $baseFile = '\biz\recharge\models\Recharge';
+    public static $baseFile = '\bizTy\recharge\models\Recharge';
 
     const PAY_STATUS_UN_PAY = 1;
     const PAY_STATUS_HAS_PAY = 2;

biz-ty/recharge/classes/RechargeSnClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizTy\recharge\classes;
+
+use bizTy\base\classes\BaseClass;
+
+class RechargeSnClass extends BaseClass
+{
+
+    public static $baseFile = '\bizTy\recharge\models\RechargeSn';
+
+}

biz/recharge/models/Recharge.php → biz-ty/recharge/models/Recharge.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace biz\recharge\models;
+namespace bizTy\recharge\models;
 
-use biz\base\models\Base;
+use bizTy\base\models\Base;
 
 class Recharge extends Base
 {

biz/recharge/models/RechargeSn.php → biz-ty/recharge/models/RechargeSn.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace biz\recharge\models;
+namespace bizTy\recharge\models;
 
-use biz\base\models\Base;
+use bizTy\base\models\Base;
 
 class RechargeSn extends Base
 {

biz-ty/recharge/services/RechargeService.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizTy\recharge\services;
+
+use bizTy\base\services\BaseService;
+
+class RechargeService extends BaseService
+{
+
+    public static $baseFile = '\bizTy\recharge\classes\RechargeClass';
+
+}

biz/merchant/classes/CashClass.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace biz\merchant\classes;
+
+use biz\admin\classes\ShopAdminClass;
+use common\components\dirUtil;
+use common\components\httpUtil;
+use common\components\qrCodeUtil;
+use common\components\util;
+use common\components\wxUtil;
+use Yii;
+use biz\base\classes\BaseClass;
+
+class CashClass extends BaseClass
+{
+
+    public static $baseFile = '\biz\merchant\models\Cash';
+
+    //提现记录 shish 2021.2.21
+    public static function getCashList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        return $data;
+    }
+
+}

biz/merchant/classes/MerchantCapitalClass.php → biz/merchant/classes/SjCapitalClass.php

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

biz/merchant/models/Cash.php

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

biz/merchant/models/MerchantCapital.php → biz/merchant/models/SjCapital.php

@@ -2,12 +2,12 @@
 namespace biz\merchant\models;
 use biz\base\models\Base;
 
-class MerchantCapital extends Base
+class SjCapital extends Base
 {
 
 	public static function tableName()
 	{
-		return 'xhMerchantCapital';
+		return 'xhSjCapital';
 	}
 
 }

biz/merchant/services/CashService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace biz\merchant\services;
+
+use biz\base\services\BaseService;
+use Yii;
+
+class CashService extends BaseService
+{
+
+    public static $baseFile = '\biz\merchant\classes\CashClass';
+
+}

biz/merchant/services/MerchantCapitalService.php → biz/merchant/services/SjCapitalService.php

@@ -3,17 +3,17 @@
 namespace biz\merchant\services;
 
 use biz\base\services\BaseService;
-use biz\merchant\classes\MerchantCapitalClass;
+use biz\merchant\classes\SjCapitalClass;
 use biz\stat\services\StatIncomeCategoryService;
 use biz\stat\services\StatIncomeUsageService;
 use common\components\validate;
 use common\components\util;
 use Yii;
 
-class MerchantCapitalService extends BaseService
+class SjCapitalService extends BaseService
 {
 	
-	public static $baseFile = '\biz\merchant\classes\MerchantCapitalClass';
+	public static $baseFile = '\biz\merchant\classes\SjCapitalClass';
 	
 	//商家订单类的流水归类 shish 2019.12.17
 	public static function orderClassify($data)
@@ -22,7 +22,7 @@ class MerchantCapitalService extends BaseService
 		if (empty($capitalId)) {
 			util::fail('没有找到商家流水id');
 		}
-		$capital = MerchantCapitalClass::getById($capitalId, true);
+		$capital = SjCapitalClass::getById($capitalId, true);
 		$capital->usageId = $data['usageId'];
 		$capital->categoryId = $data['categoryId'];
 		$capital->save();

biz/order/services/OrderService.php

@@ -3,7 +3,7 @@
 namespace biz\order\services;
 
 use biz\base\services\BaseService;
-use biz\merchant\services\MerchantCapitalService;
+use biz\merchant\services\SjCapitalService;
 use biz\merchant\services\MerchantService;
 use biz\order\classes\OrderClass;
 use biz\order\models\Order;
@@ -155,7 +155,7 @@ class OrderService extends BaseService
                 'amount' => $order->actPrice,
                 'payWay' => $order->payWay,
             ];
-            MerchantCapitalService::orderClassify($setData);
+            SjCapitalService::orderClassify($setData);
 
             $transaction->commit();
         } catch (Exception $e) {

biz/recharge/classes/RechargeSnClass.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace biz\recharge\classes;
-
-use biz\base\classes\BaseClass;
-
-class RechargeSnClass extends BaseClass
-{
-
-    public static $baseFile = '\biz\recharge\models\RechargeSn';
-
-}

biz/recharge/services/RechargeService.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace biz\recharge\services;
-
-use biz\base\services\BaseService;
-
-class RechargeService extends BaseService
-{
-
-    public static $baseFile = '\biz\recharge\classes\RechargeClass';
-
-}

common/components/wxUtil.php

@@ -1260,10 +1260,12 @@ class wxUtil
         if ($has === false) {
             $currentHost = str_replace('http', 'https', $currentHost);
         }
+        $socket = str_replace("https","",$currentHost);
+        $socket = str_replace("http","",$socket);
         $data = [
             "action" => "set",
             "requestdomain" => [$currentHost],
-            "wsrequestdomain" => [$currentHost],
+            "wsrequestdomain" => ['wss'.$socket],
             "uploaddomain" => [$currentHost],
             "downloaddomain" => [$currentHost],
         ];

common/config/bootstrap.php

@@ -8,3 +8,4 @@ Yii::setAlias('@ghs', dirname(dirname(__DIR__)) . '/app/ghs');
 Yii::setAlias('@biz', dirname(dirname(__DIR__)) . '/biz');
 Yii::setAlias('@bizGhs', dirname(dirname(__DIR__)) . '/biz-ghs');
 Yii::setAlias('@bizPt', dirname(dirname(__DIR__)) . '/biz-pt');
+Yii::setAlias('@bizTy', dirname(dirname(__DIR__)) . '/biz-ty');

common/models/xhMerchantCapital.php → common/models/xhSjCapital.php

@@ -2,12 +2,12 @@
 
 namespace common\models;
 
-class xhMerchantCapital extends xhBaseModel
+class xhSjCapital extends xhBaseModel
 {
 
     public static function tableName()
     {
-        return 'xhMerchantCapital';
+        return 'xhSjCapital';
     }
 
 }

common/services/xhMerchantAssetService.php

@@ -14,7 +14,7 @@ use common\components\wxUtil;
 use common\services\xhGoodsService;
 use common\models\xhMerchantAsset;
 use common\models\xhUser;
-use common\models\xhMerchantCapital;
+use common\models\xhSjCapital;
 use common\services\xhAdminService;
 use common\services\xhTMessageService;
 use common\services\xhOrderGoodsService;
@@ -36,7 +36,7 @@ class xhMerchantAssetService
 	{
 		set_time_limit(0);
 		//计算总收入
-		$income = Yii::$app->db->createCommand("SELECT SUM(amount) as totalIncome FROM xhMerchantCapital WHERE io=1 and merchantId={$merchantId}")->queryOne();
+		$income = Yii::$app->db->createCommand("SELECT SUM(amount) as totalIncome FROM xhSjCapital WHERE io=1 and merchantId={$merchantId}")->queryOne();
 		$totalIncome = $income['totalIncome'];
 		//计算总粉丝数
 		$totalFans = xhUser::find()->andWhere(['subscribe' => 1, 'merchantId' => $merchantId])->count('id');
@@ -44,7 +44,7 @@ class xhMerchantAssetService
 		$visit = Yii::$app->db->createCommand("SELECT SUM(riseNum) as num FROM xhStatVisitByDay WHERE merchantId={$merchantId}")->queryOne();
 		$totalVisit = $visit['num'];
 		//计算总交易量
-		$totalDeal = xhMerchantCapital::find()->andWhere(['io' => 1, 'merchantId' => $merchantId])->count('id');
+		$totalDeal = xhSjCapital::find()->andWhere(['io' => 1, 'merchantId' => $merchantId])->count('id');
 		$data = ['totalDeal' => $totalDeal, 'totalVisit' => $totalVisit, 'totalFans' => $totalFans, 'totalIncome' => $totalIncome];
 		self::updateByMerchantId($merchantId, $data);
 	}
@@ -168,7 +168,7 @@ class xhMerchantAssetService
 					'capitalType' => $capitalType,
 					'operateId' => 0,
 				];
-				xhMerchantCapitalService::add($capitalData);//商家资金流水记录增加
+				xhSjCapitalService::add($capitalData);//商家资金流水记录增加
 
 //				xhCommonService::sendMobileMsg('15280215347', '有客户申请提现，请及时处理');
 				

common/services/xhMerchantCapitalService.php

@@ -5,18 +5,18 @@ use Yii;
 use common\components\configDict;
 use common\components\stringUtil;
 use common\components\wxUtil;
-use common\models\xhMerchantCapital;
+use common\models\xhSjCapital;
 
-class xhMerchantCapitalService {
+class xhSjCapitalService {
 
 	public static function add($capitalData)
 	{
-		return xhMerchantCapital::add($capitalData);
+		return xhSjCapital::add($capitalData);
 	}
 
 	public static function updateByCondition($condition,$data)
 	{
-		xhMerchantCapital::updateByCondition($condition, $data);
+		xhSjCapital::updateByCondition($condition, $data);
 	}
 
 }

common/services/xhPayToolService.php

@@ -268,7 +268,7 @@ class xhPayToolService
                 'addTime' => $now,
                 'capitalType' => $capitalType,
             ];
-            $merchantCapital = xhMerchantCapitalService::add($capitalData);//商家资金流水记录增加
+            $merchantCapital = xhSjCapitalService::add($capitalData);//商家资金流水记录增加
             $merchantCapitalId = $merchantCapital['id'];
             $updateData['capitalId'] = $merchantCapitalId;
             $updateData['payStatus'] = 1;//支付成功

console/controllers/UpgradeController.php

@@ -6,7 +6,7 @@ use biz\goods\services\GoodsCategoryService;
 use biz\goods\services\GoodsService;
 use biz\goods\services\GoodsStyleService;
 use biz\merchant\classes\MerchantClass;
-use biz\merchant\services\MerchantCapitalService;
+use biz\merchant\services\SjCapitalService;
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
 use biz\message\services\TMessageService;
@@ -469,7 +469,7 @@ CREATE TABLE if not exists `xhStatIncomeUsageMonth` (
 `shopId` int not null default 0 comment '门店id,0表示商家所有门店',
   `addTime` int(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '添加时间'
 ) COMMENT='按用途统计每月收入';
-ALTER TABLE `xhMerchantCapital` MODIFY shopId INT NOT NULL DEFAULT 0 COMMENT '0表示商家所有门店';
+ALTER TABLE `xhSjCapital` MODIFY shopId INT NOT NULL DEFAULT 0 COMMENT '0表示商家所有门店';
 ALTER TABLE `xhOrder` ADD `classify` TINYINT NOT NULL DEFAULT 0 COMMENT '是否归类 0未归类 1已归类' AFTER `usageId`;
 ALTER TABLE xhUsage ADD `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER `usageName`;
 ALTER TABLE `xhInvite` ADD amount DECIMAL(9,2) NOT NULL DEFAULT 0.00 COMMENT '下单金额' AFTER `couponId`;
@@ -727,10 +727,10 @@ CREATE TABLE `xhStatUserMonth` (
   PRIMARY KEY (`id`)
 ) COMMENT='客户月度统计';
 RENAME TABLE `xhWxOpenAdmin` TO `xhStaff`;
-ALTER TABLE `xhMerchantCapital` MODIFY `capitalType` TINYINT NOT NULL DEFAULT 0 COMMENT '流水类型';
-ALTER TABLE `xhMerchantCapital` MODIFY `payWay` TINYINT NOT NULL DEFAULT 0 COMMENT '付款方式；支付方式';
-ALTER TABLE `xhMerchantCapital` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源';
-ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '收支类型 0支出 1收入';";
+ALTER TABLE `xhSjCapital` MODIFY `capitalType` TINYINT NOT NULL DEFAULT 0 COMMENT '流水类型';
+ALTER TABLE `xhSjCapital` MODIFY `payWay` TINYINT NOT NULL DEFAULT 0 COMMENT '付款方式；支付方式';
+ALTER TABLE `xhSjCapital` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源';
+ALTER TABLE `xhSjCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '收支类型 0支出 1收入';";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$sql = "ALTER TABLE `xhMerchant` ADD `deadline` INT NOT NULL DEFAULT 0 COMMENT '帐号过期时间' AFTER `status`;UPDATE `xhMerchant` SET `deadline`=1607589778;";
@@ -777,7 +777,7 @@ ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		//商家流水
-		$mCapital = MerchantCapitalService::getAllByCondition([], null, '*');
+		$mCapital = SjCapitalService::getAllByCondition([], null, '*');
 		if (!empty($mCapital)) {
 			foreach ($mCapital as $capital) {
 				$relateId = $capital['relateId'];
@@ -786,16 +786,16 @@ ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '
 					$order = OrderService::getByCondition(['orderSn' => $relateId]);
 					if (!empty($order)) {
 						$orderId = $order['id'];
-						MerchantCapitalService::updateById($id, ['relateId' => $orderId]);
+						SjCapitalService::updateById($id, ['relateId' => $orderId]);
 					} else {
-						MerchantCapitalService::updateById($id, ['relateId' => 0]);
+						SjCapitalService::updateById($id, ['relateId' => 0]);
 					}
 				} else {
-					MerchantCapitalService::updateById($id, ['relateId' => 0]);
+					SjCapitalService::updateById($id, ['relateId' => 0]);
 				}
 			}
 		}
-		$sql = "ALTER TABLE `xhMerchantCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
+		$sql = "ALTER TABLE `xhSjCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		//客户流水

doc/table.md

@@ -764,7 +764,7 @@
 | updateTime | timestamp |  | 
 
 
-#### xhMerchantCapital 表 
+#### xhSjCapital 表 
 | 字段名 | 类型 | 说明 | 
 |:--------:|:---------:|:-------:| 
 | id | int(11) | 主键 | 

sql.sql

@@ -1204,4 +1204,18 @@ ALTER TABLE xhShop ADD totalRecharge DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMEN
 ALTER TABLE xhRecharge ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `payStatus`;
 ALTER TABLE xhRecharge ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
 ALTER TABLE xhRecharge ADD remark VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '' AFTER `payStatus`;
-DROP TABLE IF EXISTS `xhRechargeLog`;
+DROP TABLE IF EXISTS `xhRechargeLog`;
+ALTER TABLE xhMerchantCapital RENAME TO xhSjCapital;
+DROP TABLE IF EXISTS `xhWithdraw`;
+DROP TABLE IF EXISTS `xhCash`;
+CREATE TABLE IF NOT EXISTS `xhCash`(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+sjId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+shopId INT NOT NULL DEFAULT 0 COMMENT '',
+amount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '提现金额',
+balance DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前余额',
+`status` TINYINT NOT NULL DEFAULT 1 COMMENT '1待处理 2处理中 3已完成',
+`addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+`updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
+)COMMENT='提现订单';
+ALTER TABLE `xhCash` ADD `event` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '事项' AFTER `shopId`;