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

app/ghs/controllers/CashController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace ghs\controllers;
+
+use bizTy\sj\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/ghs/controllers/RechargeController.php

@@ -2,12 +2,17 @@
 
 namespace ghs\controllers;
 
-use biz\saas\services\RegionService;
+use biz\merchant\classes\MerchantClass;
+use bizTy\recharge\classes\RechargeClass;
+use biz\wx\classes\WxOpenClass;
+use common\components\configDict;
+use common\components\httpUtil;
 use common\components\util;
+use Yii;
 
 class RechargeController extends BaseController
 {
-	
+
 	//充值记录 shish 2021.2.21
 	public function actionList()
 	{
@@ -15,7 +20,7 @@ class RechargeController extends BaseController
 		$list = RechargeClass::getRechargeList($where);
 		util::success($list);
 	}
-	
+
 	//充值余额 shish 2021.2.21
 	public function actionBalance()
 	{
@@ -65,7 +70,7 @@ class RechargeController extends BaseController
 		$input->SetNotify_url(Yii::$app->params['shopHost'] . '/notice/wx-callback/');
 		$input->SetTrade_type("JSAPI");
 		
-		$merchantExtend = WxOpenClass::getWxInfo();
+		$merchantExtend = WxOpenClass::getGhsWxInfo();
 		if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
 			$input->SetSub_openid($openId);
 		} else {