From 35136aead691c72dcc8916f944b59831d79aa9e6 Mon Sep 17 00:00:00 2001 From: ctexthuang Date: Mon, 17 Mar 2025 17:35:02 +0800 Subject: [PATCH] feat : ide config --- app/Service/Api/Pay/PlacePayService.php | 4 +--- env.local | 11 ++++++++++- env.local.other | 11 ++++++++++- env.pre | 11 ++++++++++- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/Service/Api/Pay/PlacePayService.php b/app/Service/Api/Pay/PlacePayService.php index ef765ee..11bc413 100644 --- a/app/Service/Api/Pay/PlacePayService.php +++ b/app/Service/Api/Pay/PlacePayService.php @@ -166,9 +166,7 @@ class PlacePayService extends BaseService //已经截单 自动退款 if (!$this->isCatering) $this->directGoodRefund(); break; - case OrderCode::ORDER_TYPE_BALANCE: - echo 1; - break; + case OrderCode::ORDER_TYPE_BALANCE: //余额重置是不是不能等于 0 元 default: throw new ErrException('订单类型错误'); } diff --git a/env.local b/env.local index 7e2a7d1..b7b1893 100644 --- a/env.local +++ b/env.local @@ -47,4 +47,13 @@ ALI_CALLBACK_URL=https://new-api-pre.hehele.cc/common/oss/ossCallBack ALI_OSS_URL=https://hhl-catering.oss-cn-shenzhen.aliyuncs.com/ ALI_STS_ENDPOINT=sts.cn-shenzhen.aliyuncs.com ALI_ROLE_ARN=acs:ram::1644087445786901:role/oss -ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com \ No newline at end of file +ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com + +# [wxPay] +WX_PAYMENT_MCH_ID=1656097281 +WX_PAYMENT_MCH_SECRET_KEY=075cf77f5b57cc84ba59e9df3b86eda1 +WX_PAYMENT_MCH_SECRET_CERT=__DIR__/config/pay/wx/apiclient_key.pem +WX_PAYMENT_MCH_PUBLIC_CERT_PATH=__DIR__/config/pay/wx/apiclient_cert.pem +WX_PAYMENT_MINI_APP_ID=wx444b711b6101f25b +WX_PAYMENT_SUB_MINI_APP_ID=wxc2bc0e47e212d831 +WX_PAYMENT_SUB_MCH_ID=1656142874 \ No newline at end of file diff --git a/env.local.other b/env.local.other index 7e2a7d1..b7b1893 100644 --- a/env.local.other +++ b/env.local.other @@ -47,4 +47,13 @@ ALI_CALLBACK_URL=https://new-api-pre.hehele.cc/common/oss/ossCallBack ALI_OSS_URL=https://hhl-catering.oss-cn-shenzhen.aliyuncs.com/ ALI_STS_ENDPOINT=sts.cn-shenzhen.aliyuncs.com ALI_ROLE_ARN=acs:ram::1644087445786901:role/oss -ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com \ No newline at end of file +ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com + +# [wxPay] +WX_PAYMENT_MCH_ID=1656097281 +WX_PAYMENT_MCH_SECRET_KEY=075cf77f5b57cc84ba59e9df3b86eda1 +WX_PAYMENT_MCH_SECRET_CERT=__DIR__/config/pay/wx/apiclient_key.pem +WX_PAYMENT_MCH_PUBLIC_CERT_PATH=__DIR__/config/pay/wx/apiclient_cert.pem +WX_PAYMENT_MINI_APP_ID=wx444b711b6101f25b +WX_PAYMENT_SUB_MINI_APP_ID=wxc2bc0e47e212d831 +WX_PAYMENT_SUB_MCH_ID=1656142874 \ No newline at end of file diff --git a/env.pre b/env.pre index 344bb45..17674e7 100644 --- a/env.pre +++ b/env.pre @@ -44,4 +44,13 @@ ALI_CALLBACK_URL=https://new-api-pre.hehele.cc/common/oss/ossCallBack ALI_OSS_URL=https://hhl-catering.oss-cn-shenzhen.aliyuncs.com/ ALI_STS_ENDPOINT=sts.cn-shenzhen.aliyuncs.com ALI_ROLE_ARN=acs:ram::1644087445786901:role/oss -ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com \ No newline at end of file +ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com + +# [wxPay] +WX_PAYMENT_MCH_ID=1656097281 +WX_PAYMENT_MCH_SECRET_KEY=075cf77f5b57cc84ba59e9df3b86eda1 +WX_PAYMENT_MCH_SECRET_CERT=__DIR__/config/pay/wx/apiclient_key.pem +WX_PAYMENT_MCH_PUBLIC_CERT_PATH=__DIR__/config/pay/wx/apiclient_cert.pem +WX_PAYMENT_MINI_APP_ID=wx444b711b6101f25b +WX_PAYMENT_SUB_MINI_APP_ID=wxc2bc0e47e212d831 +WX_PAYMENT_SUB_MCH_ID=1656142874 \ No newline at end of file