cash

app-ghs/controllers/CashController.php

@@ -3,6 +3,7 @@
 namespace ghs\controllers;
 
 use biz\sj\classes\CashClass;
+use common\components\dict;
 use common\components\util;
 use Yii;
 
@@ -29,6 +30,7 @@ class CashController extends BaseController
         $get['shopAdminName'] = $shopAdmin->name ?? '';
         $get['shopId'] = $this->shopId;
         $get['sjId'] = $this->sjId;
+        $get['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {

app-hd/controllers/CashController.php

@@ -3,6 +3,7 @@
 namespace hd\controllers;
 
 use biz\sj\classes\CashClass;
+use common\components\dict;
 use common\components\util;
 use Yii;
 
@@ -29,6 +30,7 @@ class CashController extends BaseController
         $get['shopAdminName'] = $shopAdmin->name ?? '';
         $get['shopId'] = $this->shopId;
         $get['sjId'] = $this->sjId;
+        $get['ptStyle'] = dict::getDict('ptStyle', 'hd');
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {

app-pt/controllers/CashController.php

@@ -23,8 +23,8 @@ class CashController extends BaseController
         if (!empty($status)) {
             $where['status'] = $status;
         }
-        $list = CashClass::getCashList($where);
-        util::success($list);
+        $respond = CashClass::getCashList($where);
+        util::success($respond);
     }
 
     //提现审核通过 shish 2021.5.17
@@ -101,58 +101,61 @@ class CashController extends BaseController
                 util::fail('冻结金额不足提现');
             }
 
-            $aliWap = Yii::getAlias("@vendor/alipayWap");
-            require_once($aliWap . '/aop/AopClient.php');
-            require_once($aliWap . '/aop/request/AlipayFundTransToaccountTransferRequest.php');
-
-            $aliPId = '2017041906821571';
-            $aliKey = 'MIIEpAIBAAKCAQEAvbeu6o90L+0AilI+mbhuJJH0lUv7hWQCEC+XUc+cWlC9ulKC3cSVScVLJHpUc09aj6v/iD1p9iVfgMxjeADNVKiQC2RJyRshAjzyTq+2bTcODp619iV2y4qW8UM65VcP7Ide3P0uT5xC2ReW0HpkdHZgm4F+P7mh1VhGt9qOP3hjvoraAHhtGACvsGvy8H69HhSAG+CEmFt7f2tKNWJ8xEUvkfhDvys93PfTk4xMWj048hJE2r38+2mWI/Il5dFQHWXXTVl2x9yi7uhEEW42a+7s9Q3HgqEvZiQ2NI1FTeEAPLFBApiEsNLY/smaszwqqfWGAyTMvtQ6T4K96GcTLQIDAQABAoIBAHwYTj33n9RJfnT73x7F2KXrIsUVcmyKQh88QgqtdmRNNA1QM3HESLJ8bu5pZhwW5/HaW8dOBKWRRKsHBnlUbPrXV4FcFDeLm0fPfd+iZ/2AaZ1+ix962f3BpYIiq7+f9zaMRazfnw9L8x31pByyMktLs12EkoQ0dHsMxxUzzKAOiiPnvCn8Pv+Jb2qej8GXgCjefutCVNMWGsdwJtMVXEbpdmMa48Wvw+0In5ZS/UG39YAreFzgDqI9jWHE1ZhkGmB1+8hKpeIlEeVGAeYVveUgssMORdA/YY8SWHk26KSIFXBrmdKjAcRJ8Q7ZHUmzIqAV+IMV+RD4J5mZHeJgdAECgYEA8J+Hp1M6eYbT4CPLXa//yRP6Xo+qSzrKHaRB1LRAjYhvKpx/TQetYpNCJ5bWpa+Jp0T5R21pzuYaJkPuGlNEHA13b5T3r1l2ltomSEdaShvD5EZ9WtErYV5zpSv7FjjIGkbwa0H3A8Ydnvw5z4A9TZjjHLjC2GtVGJReqHGglMECgYEAydddA4NRPxmXvIjjmLb1Ft1qwHuyv3vvWhi50foGZXNEnBcfP/OkfyBDDpOEu34GZBMXK9ykHBs1l93OEFGXh7AwW0Lp5lARahBEfBZgPjq5yPO8TOJZrb5hVcuvoDdGjxpRh93XDnQDhWS/1IvUcBLcIsTcnVvfrkX4NLxF/W0CgYEAxamG+gD4rBQBwMImsRN+/2MV7M//iEUG+0qPeXeI/7rv9wUP3etMlwl48qSKNxj37xxN2ksa/Acxu/VZhu6XqKO3VUX+IWFQdaNGh2F13iLozIDLQOtKw3WfcjOq0xpZ5pwXq0RI8iSw+IUhyD8EHNZW2qU8CiRBhyt6hsywqQECgYBa8+06FAachI/XqWfF/UvcDdJ5AkS9/L8SvmmdsSkItjSIkfLHAqdxkbwl6Vu6kUOX/PJIFZjuAWTZFl4xBFNgFYj01uZHnnT6cnIp6HteD2CAqTSFAMqgfFWoL6zoaYAmJBnxO4oZPTYI+ilnQcts5VLFaChx0GCvS2BZgy2W0QKBgQDjP2VtRq4aVSLUq2z1KIDI7GJBbOM5KSW1OEj4sfEdViozPh3Ar/FQWiij1oCZF+iJdKkonHoDbDd+Q0ykcpQ+5Gv07iiT8wJYFR/0j8g2kfql7bVQhGSBeBMS5sawKR3CvkfW73WX+CNnf0PklTY0kTyt6WRXDnKSeyxFVwSZ7g==';
-            $aliPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsz3m9juAR1xew4DY6c34gvbwNg8pZ92f932tseKs+4+pF0e+jTDiUo/xHImNDi1KXt1B+s3LxY9L/sxEksbavwmhgbz/igN1cAEwS2YM+Gnf0csDrxAPJhoKL5FTwxPEQ/8VSgroU+6GlF3LAx4VHa1qfn5MqRPfLroJcyPDyGfNe9vna2FnO4E/PH+hVbvPUAwX3XrUvJIm4OgY0JE3HYFlu+O7F4Ln6+Sl+Zv/ZE2nZAvNiyAwW5iVKhKXLieExqwd0NdrP28baBqkkIY+tmV7butGjB52iK1UbU0+1uiaPL4xBxRy6d0LZmYlvdVHp0JRUuwxBLChGgOCo/76DQIDAQAB';
-            $config = [
-                //应用ID,您的APP_ID
-                'app_id' => $aliPId,
-                //商户私钥，您的原始格式RSA私钥
-                'merchant_private_key' => $aliKey,
-                //异步通知地址
-                'notify_url' => Yii::$app->params['hdHost'] . "/notice/ali-async",
-                //同步跳转
-                'return_url' => "",
-                //编码格式
-                'charset' => "UTF-8",
-                //签名方式
-                'sign_type' => "RSA2",
-                //支付宝网关
-                'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
-                //支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
-                'alipay_public_key' => $aliPublicKey,
-            ];
-
-            $aop = new \AopClient();
-            $aop->gatewayUrl = 'https://openapi.alipay.com/gateway.do';
-            $aop->appId = $config['app_id'];
-            $aop->rsaPrivateKey = $config['merchant_private_key'];
-            $aop->alipayrsaPublicKey = $config['alipay_public_key'];
-            $aop->apiVersion = '1.0';
-            $aop->signType = 'RSA2';
-            $aop->postCharset = 'UTF-8';
-            $aop->format = 'json';
-            $request = new \AlipayFundTransToaccountTransferRequest ();
-            $request->setBizContent("{" .
-                "\"out_biz_no\":\"" . $cashSn . "\"," .
-                "\"payee_type\":\"ALIPAY_LOGONID\"," .
-                "\"payee_account\":\"" . $cashAccount . "\"," .
-                "\"amount\":\"" . $getAmount . "\"," .
-                "\"payee_real_name\":\"" . $cashName . "\"," .
-                "\"payer_show_name\":\"厦门中花汇信息科技有限公司\"," .
-                "\"remark\":\"提现申请\"" .
-                "  }");
-            $result = $aop->execute($request);
-
-            $responseNode = str_replace(".", "_", $request->getApiMethodName()) . "_response";
-            $resultCode = $result->$responseNode->code ?? '';
-            $returnOrderId = $result->$responseNode->order_id ?? '';
-            if (!empty($resultCode) && $resultCode == 10000) {
-                $cash->thirdOrderSn = $returnOrderId;
+//            $aliWap = Yii::getAlias("@vendor/alipayWap");
+//            require_once($aliWap . '/aop/AopClient.php');
+//            require_once($aliWap . '/aop/request/AlipayFundTransToaccountTransferRequest.php');
+//
+//            $aliPId = '2017041906821571';
+//            $aliKey = 'MIIEpAIBAAKCAQEAvbeu6o90L+0AilI+mbhuJJH0lUv7hWQCEC+XUc+cWlC9ulKC3cSVScVLJHpUc09aj6v/iD1p9iVfgMxjeADNVKiQC2RJyRshAjzyTq+2bTcODp619iV2y4qW8UM65VcP7Ide3P0uT5xC2ReW0HpkdHZgm4F+P7mh1VhGt9qOP3hjvoraAHhtGACvsGvy8H69HhSAG+CEmFt7f2tKNWJ8xEUvkfhDvys93PfTk4xMWj048hJE2r38+2mWI/Il5dFQHWXXTVl2x9yi7uhEEW42a+7s9Q3HgqEvZiQ2NI1FTeEAPLFBApiEsNLY/smaszwqqfWGAyTMvtQ6T4K96GcTLQIDAQABAoIBAHwYTj33n9RJfnT73x7F2KXrIsUVcmyKQh88QgqtdmRNNA1QM3HESLJ8bu5pZhwW5/HaW8dOBKWRRKsHBnlUbPrXV4FcFDeLm0fPfd+iZ/2AaZ1+ix962f3BpYIiq7+f9zaMRazfnw9L8x31pByyMktLs12EkoQ0dHsMxxUzzKAOiiPnvCn8Pv+Jb2qej8GXgCjefutCVNMWGsdwJtMVXEbpdmMa48Wvw+0In5ZS/UG39YAreFzgDqI9jWHE1ZhkGmB1+8hKpeIlEeVGAeYVveUgssMORdA/YY8SWHk26KSIFXBrmdKjAcRJ8Q7ZHUmzIqAV+IMV+RD4J5mZHeJgdAECgYEA8J+Hp1M6eYbT4CPLXa//yRP6Xo+qSzrKHaRB1LRAjYhvKpx/TQetYpNCJ5bWpa+Jp0T5R21pzuYaJkPuGlNEHA13b5T3r1l2ltomSEdaShvD5EZ9WtErYV5zpSv7FjjIGkbwa0H3A8Ydnvw5z4A9TZjjHLjC2GtVGJReqHGglMECgYEAydddA4NRPxmXvIjjmLb1Ft1qwHuyv3vvWhi50foGZXNEnBcfP/OkfyBDDpOEu34GZBMXK9ykHBs1l93OEFGXh7AwW0Lp5lARahBEfBZgPjq5yPO8TOJZrb5hVcuvoDdGjxpRh93XDnQDhWS/1IvUcBLcIsTcnVvfrkX4NLxF/W0CgYEAxamG+gD4rBQBwMImsRN+/2MV7M//iEUG+0qPeXeI/7rv9wUP3etMlwl48qSKNxj37xxN2ksa/Acxu/VZhu6XqKO3VUX+IWFQdaNGh2F13iLozIDLQOtKw3WfcjOq0xpZ5pwXq0RI8iSw+IUhyD8EHNZW2qU8CiRBhyt6hsywqQECgYBa8+06FAachI/XqWfF/UvcDdJ5AkS9/L8SvmmdsSkItjSIkfLHAqdxkbwl6Vu6kUOX/PJIFZjuAWTZFl4xBFNgFYj01uZHnnT6cnIp6HteD2CAqTSFAMqgfFWoL6zoaYAmJBnxO4oZPTYI+ilnQcts5VLFaChx0GCvS2BZgy2W0QKBgQDjP2VtRq4aVSLUq2z1KIDI7GJBbOM5KSW1OEj4sfEdViozPh3Ar/FQWiij1oCZF+iJdKkonHoDbDd+Q0ykcpQ+5Gv07iiT8wJYFR/0j8g2kfql7bVQhGSBeBMS5sawKR3CvkfW73WX+CNnf0PklTY0kTyt6WRXDnKSeyxFVwSZ7g==';
+//            $aliPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsz3m9juAR1xew4DY6c34gvbwNg8pZ92f932tseKs+4+pF0e+jTDiUo/xHImNDi1KXt1B+s3LxY9L/sxEksbavwmhgbz/igN1cAEwS2YM+Gnf0csDrxAPJhoKL5FTwxPEQ/8VSgroU+6GlF3LAx4VHa1qfn5MqRPfLroJcyPDyGfNe9vna2FnO4E/PH+hVbvPUAwX3XrUvJIm4OgY0JE3HYFlu+O7F4Ln6+Sl+Zv/ZE2nZAvNiyAwW5iVKhKXLieExqwd0NdrP28baBqkkIY+tmV7butGjB52iK1UbU0+1uiaPL4xBxRy6d0LZmYlvdVHp0JRUuwxBLChGgOCo/76DQIDAQAB';
+//            $config = [
+//                //应用ID,您的APP_ID
+//                'app_id' => $aliPId,
+//                //商户私钥，您的原始格式RSA私钥
+//                'merchant_private_key' => $aliKey,
+//                //异步通知地址
+//                'notify_url' => Yii::$app->params['hdHost'] . "/notice/ali-async",
+//                //同步跳转
+//                'return_url' => "",
+//                //编码格式
+//                'charset' => "UTF-8",
+//                //签名方式
+//                'sign_type' => "RSA2",
+//                //支付宝网关
+//                'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
+//                //支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
+//                'alipay_public_key' => $aliPublicKey,
+//            ];
+//
+//            $aop = new \AopClient();
+//            $aop->gatewayUrl = 'https://openapi.alipay.com/gateway.do';
+//            $aop->appId = $config['app_id'];
+//            $aop->rsaPrivateKey = $config['merchant_private_key'];
+//            $aop->alipayrsaPublicKey = $config['alipay_public_key'];
+//            $aop->apiVersion = '1.0';
+//            $aop->signType = 'RSA2';
+//            $aop->postCharset = 'UTF-8';
+//            $aop->format = 'json';
+//            $request = new \AlipayFundTransToaccountTransferRequest ();
+//            $request->setBizContent("{" .
+//                "\"out_biz_no\":\"" . $cashSn . "\"," .
+//                "\"payee_type\":\"ALIPAY_LOGONID\"," .
+//                "\"payee_account\":\"" . $cashAccount . "\"," .
+//                "\"amount\":\"" . $getAmount . "\"," .
+//                "\"payee_real_name\":\"" . $cashName . "\"," .
+//                "\"payer_show_name\":\"厦门中花汇信息科技有限公司\"," .
+//                "\"remark\":\"提现申请\"" .
+//                "  }");
+//            $result = $aop->execute($request);
+//
+//            $responseNode = str_replace(".", "_", $request->getApiMethodName()) . "_response";
+//            $resultCode = $result->$responseNode->code ?? '';
+//            $returnOrderId = $result->$responseNode->order_id ?? '';
+
+
+//            if (!empty($resultCode) && $resultCode == 10000) {
+
+//                $cash->thirdOrderSn = $returnOrderId;
                 $cash->status = CashClass::STATUS_CHECK_YES;
                 $cash->remark = $remark;
                 $cash->getAmount = $getAmount;
@@ -168,16 +171,17 @@ class CashController extends BaseController
                 //通知管理员
                 noticeUtil::push("客户提现审核通过，转帐{$getAmount}元", '15280215347');
                 util::complete();
-            } else {
-                $msg = $result->$responseNode->msg ?? '';
-                $sub_code = $result->$responseNode->sub_code ?? '';
-                $sub_msg = $result->$responseNode->sub_msg ?? '';
-                $text = "转帐失败，原因：code:" . $resultCode . " msg:" . $msg . " sub_code:" . $sub_code . " sub_msg:" . $sub_msg;
-                $transaction->rollBack();
-                Yii::info($text);
-                noticeUtil::push($text, '15280215347');
-                util::fail('审核失败，原因：' . $sub_msg);
-            }
+
+//            } else {
+//                $msg = $result->$responseNode->msg ?? '';
+//                $sub_code = $result->$responseNode->sub_code ?? '';
+//                $sub_msg = $result->$responseNode->sub_msg ?? '';
+//                $text = "转帐失败，原因：code:" . $resultCode . " msg:" . $msg . " sub_code:" . $sub_code . " sub_msg:" . $sub_msg;
+//                $transaction->rollBack();
+//                Yii::info($text);
+//                noticeUtil::push($text, '15280215347');
+//                util::fail('审核失败，原因：' . $sub_msg);
+//            }
         } catch (Exception $exception) {
             $transaction->rollBack();
             Yii::info("审核失败：" . $exception->getMessage());

biz/sj/classes/CashClass.php

@@ -22,6 +22,21 @@ class CashClass extends BaseClass
     public static function getCashList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');
+        if (isset($data['list']) && !empty($data['list'])) {
+            foreach ($data['list'] as $key => $val) {
+                $currentPtStyle = $val['ptStyle'] ?? dict::getDict('ptStyle', 'hd');
+                $beAmount = 0;
+                $amount = $val['amount'] ?? 0.00;
+                if ($currentPtStyle == dict::getDict('ptStyle', 'hd')) {
+                    $tip = bcmul($amount, 0.006, 2);
+                    $beAmount = bcsub($amount, $tip, 2);
+                } elseif ($currentPtStyle == dict::getDict('ptStyle', 'ghs')) {
+                    $tip = bcmul($amount, 0.0038, 2);
+                    $beAmount = bcsub($amount, $tip, 2);
+                }
+                $data['list'][$key]['beAmount'] = $beAmount;
+            }
+        }
         return $data;
     }