shish 1 سال پیش
والد
کامیت
b9f342dffa
2فایلهای تغییر یافته به همراه3 افزوده شده و 34 حذف شده
  1. 2 2
      biz-hd/recharge/classes/RechargeClass.php
  2. 1 32
      biz-mall/recharge/classes/RechargeClass.php

+ 2 - 2
biz-hd/recharge/classes/RechargeClass.php

@@ -60,7 +60,7 @@ class RechargeClass extends BaseClass
                         if (!isset($response['code']) || $response['code'] != 'BBS00000') {
                             $msg = $response['msg'] ?? '';
                             noticeUtil::push('重点注意,充值换单号没有成功,单号:' . $closeOrderSn . ',关单没有成功,编号966558,' . $msg, '15280215347');
-                            util::fail('老订单取消失败,请联系管理员');
+                            //util::fail('老订单取消失败,请联系管理员');
                         } else {
                             noticeUtil::push('充值,聚合支付关单成功,编号636996,', '15280215347');
                         }
@@ -70,7 +70,7 @@ class RechargeClass extends BaseClass
                         if (!isset($response['code']) || $response['code'] != '000000') {
                             $msg = $response['msg'] ?? '';
                             noticeUtil::push('重点注意,充值换单,收银台的单号:' . $closeOrderSn . ',关单没有成功,编号66996,' . $msg, '15280215347');
-                            util::fail('旧订单取消失败,请联系管理员');
+                            //util::fail('旧订单取消失败,请联系管理员');
                         } else {
                             noticeUtil::push('充值,收银台关单成功,编号665996,', '15280215347');
                         }

+ 1 - 32
biz-mall/recharge/classes/RechargeClass.php

@@ -16,38 +16,7 @@ class RechargeClass extends BaseClass
 
     public static function cancelMyRecharge($recharge, $shop)
     {
-//        $payRequest = $recharge->payRequest ?? 0;
-//        if ($payRequest == 0) {
-//            $recharge->status = 2;
-//            $recharge->save();
-//        } else {
-//            $closeOrderSn = $recharge->orderSn;
-//            $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
-//            $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
-//            $params = [
-//                'appid' => 'OP00002119',
-//                'serial_no' => '018b08cfddbd',
-//                'merchant_no' => $shop->lklSjNo,
-//                'term_no' => $shop->lklScanTermNo,
-//                'merchantPrivateKeyPath' => $merchantPrivateKeyPath,
-//                'lklCertificatePath' => $lklCertificatePath,
-//            ];
-//            $laResource = new Lakala($params);
-//            $closeParams = ['orderSn' => $closeOrderSn];
-//            if ($payRequest == 1) {
-//                //聚合支付
-//                $laResource->close($closeParams);
-//            } else {
-//                //收银台支付
-//                $laResource->cashClose($closeParams);
-//            }
-//        }
-//        $settleId = $recharge->settleId ?? 0;
-//        $settle = SettleClass::getById($settleId, true);
-//        if (!empty($settle)) {
-//            $settle->status = 3;
-//            $settle->save();
-//        }
+
     }
 
     public static function getRechargeList($where)