From a4b3ee325c7354579d495bc74a777e494e5ec38c Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 06 Feb 2026 18:18:44 +0800
Subject: [PATCH] 商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制，添加活动选择了填写人数限制的分类时活动名额下显示该分类人数限制为15 同一个企业30天内只能走访一次，在30天内走访同一个企业时提示该企业已被走访xx天后才可以从新走访
---
admin/app/common/library/fbpay/FbPay.php | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/admin/app/common/library/fbpay/FbPay.php b/admin/app/common/library/fbpay/FbPay.php
index cb78e36..f33f43a 100644
--- a/admin/app/common/library/fbpay/FbPay.php
+++ b/admin/app/common/library/fbpay/FbPay.php
@@ -7,6 +7,7 @@
use app\common\enum\order\OrderPayTypeEnum;
use app\common\exception\BaseException;
use app\common\model\app\AppWx as AppWxModel;
+use app\common\model\payment\PaymentLog as PaymentLogModel;
use think\helper\Str;
use EasyWeChat\Factory;
use app\common\model\user\UserAuth as UserAuthModel;
@@ -129,7 +130,15 @@
$attach = json_decode($data['attach'], true);
// 实例化订单模型
$PaySuccess = PayTypeSuccessFactory::getFactory($data['merchant_order_sn'], $attach);
- $app_id = $PaySuccess->isExist();
+ $app_id = $PaySuccess->isExist();//这里主要处理支付订单号和现有订单信息对不上的原因
+ $payment_model = new PaymentLogModel();
+ if(empty($app_id) || $app_id==0){
+ $app_id = $payment_model->checkOrder($data['merchant_order_sn'], $attach);
+ if($app_id){
+ $PaySuccess = PayTypeSuccessFactory::getFactory($data['merchant_order_sn'], $attach);
+ }
+ }
+
$app_id == 0 && $this->returnCode(false, '订单不存在1');
$shop_supplier_id = $PaySuccess->isExistSupplier();
// $shop_supplier_id == 0 && $this->returnCode(false, '订单商户不存在2'); // 暂时屏蔽 by lyzflash 20251029
@@ -155,6 +164,8 @@
echo 'error';
exit();
}
+ //更新支付记录
+ $payment_model->updatePaymentLog(['order_no'=>$data['merchant_order_sn']]);
// 返回状态
echo 'success';
exit();
--
Gitblit v1.9.2