订单结算-共富区结算时间从T+1结算改为立即结算

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -47,6 +47,7 @@ use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\Log;
 use think\model\Relation;
+use Throwable;
 
 /**
  * Class StoreGroupOrderRepository
@@ -197,7 +198,7 @@ class StoreGroupOrderRepository extends BaseRepository
                     $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
                 }
             });
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             throw new ValidateException('关闭订单失败:' . json_encode([
                     'error_message' => $e->getMessage(),
                     'error_file' => $e->getFile(),
@@ -921,7 +922,7 @@ class StoreGroupOrderRepository extends BaseRepository
                     $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
                 }
             });
-        } catch (\Throwable  $e) {
+        } catch (Throwable  $e) {
             Log::error('StoreGroupOrderRepository-createStoreGroupOrder：' . $e->getMessage());
             return [
                 'code' => 10001,
@@ -941,7 +942,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param string $rand 当现金支付时，汇付会在订单尾部跟一个随机数
      * @param string|null $payOpenId 当现金支付时，付款人的Id
      * @return void
-     * @throws DbException
+     * @throws Throwable
      */
     public function storeGroupOrderPaySuccess(int $groupOrderId, string $rand = '', string $payOpenId = null): void
     {
@@ -978,8 +979,9 @@ class StoreGroupOrderRepository extends BaseRepository
             // 生成奖励数据
             $storeOrderRepository->createRewardMechanismByStoreOrderId($storeOrderEntity->getOrderId());
 
-            if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']) {
+            if (in_array($storeOrderEntity->getMerId(), [CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code'], CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']])) {
                 // 会员专区的 订单立即结算
+                // 共富区的订单立即结算
                 $settlementOrderIdList[] = $storeOrderEntity->getOrderId();
             }
 

app/controller/api/Notify.php

@@ -202,7 +202,26 @@ class Notify
                             }
 
                             // 3、支付成功 处理逻辑
-                            $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                            try {
+                                Db::transaction(function () use (
+                                    $storeGroupOrderRepository,
+                                    $storeGroupOrderEntity
+                                ) {
+                                    $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                                });
+                            } catch (\Throwable $e) {
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【结算订单失败】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单失败原因：' . json_encode([
+                                                'error_message' => $e->getMessage(),
+                                                'error_file' => $e->getFile(),
+                                                'error_line' => $e->getLine(),
+                                                'error_code' => $e->getCode(),
+                                                'exception_class' => get_class($e),
+                                                'trace' => $e->getTraceAsString()
+                                            ], JSON_UNESCAPED_UNICODE)
+                                    ]);
+                            }
                             /*
                             $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
                             $uid = $group_order['uid'];