Merge branch 'refs/heads/master' into dev

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

@@ -178,20 +178,33 @@ class StoreGroupOrderRepository extends BaseRepository
         }
 
         // 3、逻辑处理
-        Db::startTrans();
         try {
-            // 软 删除订单组
-            $storeGroupOrderEntity->setIsDel(StoreGroupOrderEnum::IS_DEL['Yes']['code']);
-            $this->update($storeGroupOrderEntity->getGroupOrderId(), $storeGroupOrderEntity->toUnderlineArray());
-
-            // 循环关闭订单组内的数据
-            foreach ($storeOrderEntityList as $storeOrderEntity) {
-                $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
-            }
-
-            Db::commit();
-        } catch (DbException $e) {
-            Db::rollback();
+            Db::transaction(function () use (
+                $storeOrderRepository,
+                $storeGroupOrderEntity,
+                $storeOrderEntityList,
+                $uid,
+                $changeMessage,
+                $remark
+            ) {
+                // 软 删除订单组
+                $storeGroupOrderEntity->setIsDel(StoreGroupOrderEnum::IS_DEL['Yes']['code']);
+                $this->update($storeGroupOrderEntity->getGroupOrderId(), $storeGroupOrderEntity->toUnderlineArray());
+
+                // 循环关闭订单组内的数据
+                foreach ($storeOrderEntityList as $storeOrderEntity) {
+                    $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
+                }
+            });
+        } catch (\Throwable $e) {
+            throw new ValidateException('关闭订单失败:' . 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));
         }
 
         // $groupOrder = $this->search(['paid' => 0, 'uid' => $uid ?: ''])->where('group_order_id', $id)->with(['orderList'])->find();
@@ -770,7 +783,7 @@ class StoreGroupOrderRepository extends BaseRepository
                 ->setCost($cost)
                 ->setMerMoney($merMoney)
                 ->setPayType($storeOrderCreateRequestEntity->getPayType())
-                ->setShareId($storeOrderCreateRequestEntity->getShareId())
+                ->setShareId($shareEntity->getId())
                 ->setShareUid($shareEntity->getUid())
                 ->setServiceMoney($serviceMoney)
                 ->setTestOrder($userEntity->getTestUser())
@@ -804,93 +817,115 @@ class StoreGroupOrderRepository extends BaseRepository
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
         // 4、写入数据
-        Db::startTrans();
         try {
-            // 4.1 更细库存
-            foreach ($productStockList as $item) {
-                $productRepository->descStock($item['productId'], $item['cartNum']);
-            }
-            foreach ($productAttrValueStockList as $item) {
-                $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
-            }
-
-            // 4.2 修改 购物车状态
-            $storeCartRepository->updateIsPayByCartIdList($cartIdList);
-
-            // 4.3 写入 组合订单 (支付订单)
-            $storeGroupOrderEntity = $storeGroupOrderRepository->createByEntity($storeGroupOrderEntity);
-
-            // 4.5 写入订单数据
-            $storeOrderStatusEntityList = [];
-            $storeOrderProductEntityList = [];
-            $paySuccess = true; // 是否已完成支付 并支付成功
-            foreach ($storeOrderEntityList as $key => $storeOrderEntity) {
-                // 将订单数据 写入数据库 并完善实体
-                $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
-                $storeOrderEntity = $storeOrderRepository->createByEntity($storeOrderEntity);
-
-                // 4.4 验证是否 可以进行支付 因为历史的 用户资金（佣金、养老金、积分、VR等）扣减所绑定的orderId都是订单ID
-                /** @var FzonePayTypeEntity $fzonePayTypeEntity */
-                $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
-                // 当有一笔支付失败时，默认整个 订单组 没有 "完全" 支付成功
-                if (!$storeOrderRepository->abatement($userEntity, $storeOrderEntity, $fzonePayTypeEntity)) {
-                    $paySuccess = false;
+            Db::transaction(function () use (
+                $productRepository,
+                $productAttrValueRepository,
+                $storeCartRepository,
+                $storeGroupOrderRepository,
+                $storeOrderRepository,
+                $productStockList,
+                $productAttrValueStockList,
+                $cartIdList,
+                &$storeGroupOrderEntity,
+                $storeOrderEntityList,
+                $storeOrderCreateRequestEntity,
+                $userEntity,
+                $cartEntityMap,
+                $storeProductEntityMap,
+                $storeProductAttrValueEntityMap
+            ) {
+                // 4.1 更细库存
+                foreach ($productStockList as $item) {
+                    $productRepository->descStock($item['productId'], $item['cartNum']);
+                }
+                foreach ($productAttrValueStockList as $item) {
+                    $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
                 }
 
-                // 将每件商品设计到的优惠券要取消掉
-
-                // 准备订单的 状态数据
-                $storeOrderStatusEntityList[] = StoreOrderStatusEntity::newInstance()
-                    ->setOrderId($storeOrderEntity->getOrderId())
-                    ->setChangeType(StoreOrderStatusEnum::CHANGE_TYPE['Create']['code'])
-                    ->setChangeMessage(StoreOrderStatusEnum::CHANGE_TYPE['Create']['name']);
-
-                // 获取当前 订单绑定的购物车
-                $cartEntity = $cartEntityMap[$storeOrderEntity->getCartId()];
-                // 准备订单的 订单购物详情表
-                $storeOrderProductEntityList[] = StoreOrderProductEntity::newInstance()
-                    ->setOrderId($storeOrderEntity->getOrderId())
-                    ->setCartId($storeOrderEntity->getCartId())
-                    ->setUid($storeOrderEntity->getUid())
-                    ->setProductId($cartEntity->getProductId())
-                    ->setProductPrice($storeOrderEntity->getTotalPrice())
-                    ->setExtensionOne(0.00)
-                    ->setExtensionTwo(0.00)
-                    ->setProductSku($cartEntity->getProductAttrUnique())
-                    ->setProductNum($cartEntity->getCartNum())
-                    ->setRefundNum($cartEntity->getCartNum())
-                    ->setType($storeProductEntityMap[$cartEntity->getProductId()]->getType())
-                    ->setCartInfo(json_encode([
-                        'product' => $storeProductEntityMap[$cartEntity->getProductId()]->toUnderlineArray(),
-                        'productAttr' => $storeProductAttrValueEntityMap[$cartEntity->getProductAttrUnique()]->toUnderlineArray(),
-                        'product_type' => $cartEntity->getProductType()
-                    ]));
-
-            }
+                // 4.2 修改 购物车状态
+                $storeCartRepository->updateIsPayByCartIdList($cartIdList);
+
+                // 4.3 写入 组合订单 (支付订单)
+                $storeGroupOrderEntity = $storeGroupOrderRepository->createByEntity($storeGroupOrderEntity);
+
+                // 4.5 写入订单数据
+                $storeOrderStatusEntityList = [];
+                $storeOrderProductEntityList = [];
+                $paySuccess = true; // 是否已完成支付 并支付成功
+                foreach ($storeOrderEntityList as $key => $storeOrderEntity) {
+                    // 将订单数据 写入数据库 并完善实体
+                    $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
+                    $storeOrderEntity = $storeOrderRepository->createByEntity($storeOrderEntity);
+
+                    // 4.4 验证是否 可以进行支付 因为历史的 用户资金（佣金、养老金、积分、VR等）扣减所绑定的orderId都是订单ID
+                    /** @var FzonePayTypeEntity $fzonePayTypeEntity */
+                    $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
+                    // 当有一笔支付失败时，默认整个 订单组 没有 "完全" 支付成功
+                    if (!$storeOrderRepository->abatement($userEntity, $storeOrderEntity, $fzonePayTypeEntity)) {
+                        $paySuccess = false;
+                    }
+
+                    // 将每件商品设计到的优惠券要取消掉
+
+                    // 准备订单的 状态数据
+                    $storeOrderStatusEntityList[] = StoreOrderStatusEntity::newInstance()
+                        ->setOrderId($storeOrderEntity->getOrderId())
+                        ->setChangeType(StoreOrderStatusEnum::CHANGE_TYPE['Create']['code'])
+                        ->setChangeMessage(StoreOrderStatusEnum::CHANGE_TYPE['Create']['name']);
+
+                    // 获取当前 订单绑定的购物车
+                    $cartEntity = $cartEntityMap[$storeOrderEntity->getCartId()];
+                    // 准备订单的 订单购物详情表
+                    $storeOrderProductEntityList[] = StoreOrderProductEntity::newInstance()
+                        ->setOrderId($storeOrderEntity->getOrderId())
+                        ->setCartId($storeOrderEntity->getCartId())
+                        ->setUid($storeOrderEntity->getUid())
+                        ->setProductId($cartEntity->getProductId())
+                        ->setProductPrice($storeOrderEntity->getTotalPrice())
+                        ->setExtensionOne(0.00)
+                        ->setExtensionTwo(0.00)
+                        ->setProductSku($cartEntity->getProductAttrUnique())
+                        ->setProductNum($cartEntity->getCartNum())
+                        ->setRefundNum($cartEntity->getCartNum())
+                        ->setType($storeProductEntityMap[$cartEntity->getProductId()]->getType())
+                        ->setCartInfo(json_encode([
+                            'product' => $storeProductEntityMap[$cartEntity->getProductId()]->toUnderlineArray(),
+                            'productAttr' => $storeProductAttrValueEntityMap[$cartEntity->getProductAttrUnique()]->toUnderlineArray(),
+                            'product_type' => $cartEntity->getProductType()
+                        ]));
 
-            // 4.6 订单操作记录表
-            /** @var StoreOrderStatusRepository $storeOrderStatusRepository */
-            $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
-            $storeOrderStatusRepository->createByEntityList($storeOrderStatusEntityList);
+                }
 
-            // 4.7 订单购物详情表
-            /** @var StoreOrderProductRepository $storeOrderProductRepository */
-            $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
-            $storeOrderProductRepository->createByEntityList($storeOrderProductEntityList);
+                // 4.6 订单操作记录表
+                /** @var StoreOrderStatusRepository $storeOrderStatusRepository */
+                $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
+                $storeOrderStatusRepository->createByEntityList($storeOrderStatusEntityList);
 
-            // 4.8 支付成功后 发放奖励
-            // 非现金 支付成功后 直接结算
-            if ($paySuccess) {
-                $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
-            }
+                // 4.7 订单购物详情表
+                /** @var StoreOrderProductRepository $storeOrderProductRepository */
+                $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
+                $storeOrderProductRepository->createByEntityList($storeOrderProductEntityList);
 
-            Db::commit();
-        } catch (DbException $e) {
-            Db::rollback();
+                // 4.8 支付成功后 发放奖励
+                // 非现金 支付成功后 直接结算
+                if ($paySuccess) {
+                    $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                }
+            });
+        } catch (\Throwable  $e) {
             Log::error('StoreGroupOrderRepository-createStoreGroupOrder：' . $e->getMessage());
+            return [
+                'code' => 10001,
+                'message' => $e->getMessage(),
+                'data' => []
+            ];
         }
-        return ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()];
-
+        return [
+            'code' => 0,
+            'message' => '订单创建成功',
+            'data' => ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()]
+        ];
     }
 
     /**

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

@@ -12313,8 +12313,15 @@ class StoreOrderRepository extends BaseRepository
 
             // 5、撤回订单扣除的数据项
             $this->cancellation($userEntity, $storeOrderEntity, $fzonePayTypeEntity);
-        } catch (DbException $e) {
-            throw new ValidateException('支付失败，支付方式错误！');
+        } catch (\Throwable $e) {
+            throw new ValidateException('关闭订单失败:' . 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));
         }
     }
 

app/common/repositories/store/product/ProductRepository.php

@@ -7,6 +7,7 @@
 
 namespace app\common\repositories\store\product;
 
+use app\common\enum\CommonEnum;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\product\Product;
 use app\common\model\store\product\ProductContent;
@@ -1052,7 +1053,12 @@ class ProductRepository extends BaseRepository
         }
 
 
-
+        // 共富商品处理
+        if ($res['mer_id'] == 3447) {
+            $res['yanglao'] = bcmul($res['price'], CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], 2);
+            $k['jifen'] = 0;
+            $k['gongxian'] = 0;
+        }
 
         $res['pv']=($k['pv']);
         $res['jifen']=($k['jifen']);

app/common/repositories/system/merchant/MerchantRepository.php

@@ -12,6 +12,7 @@ namespace app\common\repositories\system\merchant;
 
 
 use app\common\dao\system\merchant\MerchantDao;
+use app\common\enum\CommonEnum;
 use app\common\model\store\product\ProductReply;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\product\ProductCopyRepository;
@@ -501,6 +502,9 @@ class MerchantRepository extends BaseRepository
                         3=>$v['price']//复购金
                     ]
                 ];
+            }else if ($productMerId == 3447) {
+                $yanglao = bcmul($v['price'], CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], 2);
+                $v['yanglao'] = $yanglao;
             }
 
 //            $v=($v,$k);

app/controller/api/Notify.php

@@ -127,85 +127,87 @@ class Notify
                             }
                             break;
                         case 'pay':
-                            $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
-                            $uid = $group_order['uid'];
-                            if (in_array($uid, [1592, 766, 6, 783, 7, 1166, 4604, 4782])) {
-                                /** ************** 定义参数 ************** */
-                                // 订单编号
-                                $groupOrderSn_Rand = $post_data_str['order_no'];
-                                // 订单号
-                                $groupOrderSn = $requestId[0];
-                                // 随机值
-                                $rand = $requestId[1];
-                                // 支付人ID
-                                $payOpenId = $post_data_str['expend']['open_id'];
-                                // 支付撤销方法
-                                $paymentReverseFunc = function ($payWX, $payType, $groupOrderSn_Rand, $paymentId, $appId, $orderNo, $reverseAmt, $notifyUrl = '') {
-                                    if ($payWX == StoreGroupOrderEnum::PAY_WX['TDYL']['code']) {
-                                        $key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
-                                    } else {
-                                        $key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
-                                    }
-                                    $refundTraits = [
-                                        'payment_id' => $paymentId,
-                                        'app_id' => $appId,
-                                        'order_no' => $orderNo,
-                                        'reverse_amt' => $reverseAmt,
-                                        'notify_url' => $notifyUrl ?: env('APP_URL') . "/api/hf_notify/reverse_order",
-                                    ];
-                                    $hfRefundRes = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refundTraits, $payType == '1' ? 2 : 1, $payWX, $key);
-                                    Db::name("log")
-                                        ->insert([
-                                            'data' => '【订单支付回调】【03】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；汇付支付撤销请求参数：' . json_encode($refundTraits) . '；汇付支付撤销返回结果：' . json_encode($hfRefundRes)
-                                        ]);
-                                };
-                                /** *************** 定义结束 *************** */
-
-                                /** 逻辑开始 */
-                                // 1、获取订单数据
-                                /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
-                                $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
-                                // 获取订单组数据
-                                $storeGroupOrderEntity = $storeGroupOrderRepository->getStoreGroupOrderEntityByGroupOrderSn($groupOrderSn);
-                                if (empty($storeGroupOrderEntity->getGroupOrderId())) {
-                                    Db::name("log")
-                                        ->insert([
-                                            'data' => '【订单支付回调】【01】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单组查询失败'
-                                        ]);
-                                    break;
-                                }
-                                /** @var StoreOrderRepository $storeOrderRepository */
-                                $storeOrderRepository = app()->make(StoreOrderRepository::class);
-                                // 获取订单集合
-                                $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
-                                if (empty($storeOrderEntityList)) {
-                                    Db::name("log")
-                                        ->insert([
-                                            'data' => '【订单支付回调】【02】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单集合查询失败'
-                                        ]);
-                                    break;
+                            /** ************** 定义参数 ************** */
+                            // 订单编号
+                            $groupOrderSn_Rand = $post_data_str['order_no'];
+                            // 订单号
+                            $groupOrderSn = $requestId[0];
+                            // 随机值
+                            $rand = $requestId[1];
+                            // 支付人ID
+                            $payOpenId = $post_data_str['expend']['open_id'];
+                            // 支付撤销方法
+                            $paymentReverseFunc = function ($payWX, $payType, $groupOrderSn_Rand, $paymentId, $appId, $orderNo, $reverseAmt, $notifyUrl = '') {
+                                if ($payWX == StoreGroupOrderEnum::PAY_WX['TDYL']['code']) {
+                                    $key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+                                } else {
+                                    $key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
                                 }
+                                $refundTraits = [
+                                    'payment_id' => $paymentId,
+                                    'app_id' => $appId,
+                                    'order_no' => $orderNo,
+                                    'reverse_amt' => $reverseAmt,
+                                    'notify_url' => $notifyUrl ?: env('APP_URL') . "/api/hf_notify/reverse_order",
+                                ];
+                                $hfRefundRes = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refundTraits, $payType == '1' ? 2 : 1, $payWX, $key);
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【03】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；汇付支付撤销请求参数：' . json_encode($refundTraits) . '；汇付支付撤销返回结果：' . json_encode($hfRefundRes)
+                                    ]);
+                            };
+                            /** *************** 定义结束 *************** */
+
+                            /** 逻辑开始 */
+                            // 1、获取订单数据
+                            /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
+                            $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
+                            // 获取订单组数据
+                            $storeGroupOrderEntity = $storeGroupOrderRepository->getStoreGroupOrderEntityByGroupOrderSn($groupOrderSn);
+                            if (empty($storeGroupOrderEntity->getGroupOrderId())) {
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【01】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单组查询失败'
+                                    ]);
+                                break;
+                            }
+                            /** @var StoreOrderRepository $storeOrderRepository */
+                            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                            // 获取订单集合
+                            $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
+                            if (empty($storeOrderEntityList)) {
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【02】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单集合查询失败'
+                                    ]);
+                                break;
+                            }
 
-                                // 2、判断订单是否已经被代付 如果已记录支付人 并且不是自己，则可能有人代付，则将本次的支付撤回
-                                foreach ($storeOrderEntityList as $storeOrderEntity) {
-                                    if (!empty($storeOrderEntity->getPayOpenId())) {
-                                        if ($storeOrderEntity->getPayOpenId() != $payOpenId) {
-                                            // 如果已经被用户支付 撤回支付
-                                            $orderNo = app()->make(StoreRefundOrderRepository::class)->getNewOrderId();
-                                            $paymentReverseFunc($storeGroupOrderEntity->getPayWx(), $pay_type, $groupOrderSn_Rand, $post_data_str['id'], $post['app_id'], $orderNo, $post_data_str['pay_amt']);
-                                            break 2;
-                                        }
-                                    } else {
-                                        $storeOrderEntity->setPayOpenId($payOpenId);
+                            // 2、判断订单是否已经被代付 如果已记录支付人 并且不是自己，则可能有人代付，则将本次的支付撤回
+                            foreach ($storeOrderEntityList as $storeOrderEntity) {
+                                if (!empty($storeOrderEntity->getPayOpenId())) {
+                                    if ($storeOrderEntity->getPayOpenId() != $payOpenId) {
+                                        // 如果已经被用户支付 撤回支付
+                                        $orderNo = app()->make(StoreRefundOrderRepository::class)->getNewOrderId();
+                                        $paymentReverseFunc($storeGroupOrderEntity->getPayWx(), $pay_type, $groupOrderSn_Rand, $post_data_str['id'], $post['app_id'], $orderNo, $post_data_str['pay_amt']);
+                                        break 2;
                                     }
+                                } else {
+                                    $storeOrderEntity->setPayOpenId($payOpenId);
                                 }
-                                // 如果已支付 不做后续处理
-                                if ($storeGroupOrderEntity->getPaid() == StoreGroupOrderEnum::PAID['YES']['code']) {
-                                    break;
-                                }
+                            }
+                            // 如果已支付 不做后续处理
+                            if ($storeGroupOrderEntity->getPaid() == StoreGroupOrderEnum::PAID['YES']['code']) {
+                                break;
+                            }
+
+                            // 3、支付成功 处理逻辑
+                            $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                            /*
+                            $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
+                            $uid = $group_order['uid'];
+                            if (in_array($uid, [1592, 766, 6, 783, 7, 1166, 4604, 4782])) {
 
-                                // 3、支付成功 处理逻辑
-                                $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
                             } else {
                             // 判断代付是否支付过
                             $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
@@ -965,6 +967,7 @@ class Notify
                             event('pay_success_order', ['order_sn' => $requestId[0],'pay_type'=>$pay_type]);
 
                             }
+                            */
                             break;
                         case 'pay_channel':
                             //渠道商

app/controller/api/store/order/StoreGroupOrder.php

@@ -64,7 +64,18 @@ class StoreGroupOrder extends BaseController
         }
 
         // 3、创建订单
-        $result = $this->repository->createStoreGroupOrder($storeOrderCreateRequestEntity);
-        return app('json')->success('订单创建成功', $result);
+        makeLock()->lock();
+        try {
+            $result = $this->repository->createStoreGroupOrder($storeOrderCreateRequestEntity);
+        } catch (\Throwable $e) {
+            makeLock()->unlock();
+            throw $e;
+        }
+        makeLock()->unlock();
+
+        if (!empty($result['code'])) {
+            return app('json')->fail($result['message']);
+        }
+        return app('json')->success($result['message'], $result['data']);
     }
 }

app/controller/merchant/store/order/Order.php

@@ -20,6 +20,7 @@ use think\App;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreOrderRepository as repository;
 use think\facade\Db;
+use think\facade\Log;
 
 class Order extends BaseController
 {
@@ -439,18 +440,34 @@ class Order extends BaseController
     /**
      * @param $id
      * @param StoreGroupOrderRepository $groupOrderRepository
+     * @param repository $orderRepository
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
      */
     public function cancelGroupOrder($id, StoreGroupOrderRepository $groupOrderRepository, StoreOrderRepository $orderRepository)
     {
-        $data = $this->request->params(['change_message','remark']);
+        $data = $this->request->params(['change_message', 'remark']);
         $merId = $this->request->merId();
         $order = $orderRepository->getWhere(['group_order_id' => $id]);
         if ($order['mer_id'] != $merId)
             return app('json')->fail('数据不存在');
-        $groupOrderRepository->cancel((int)$id, 0, $data['change_message'], $data['remark']);
+        try {
+            $groupOrderRepository->cancel((int)$id, 0, $data['change_message'], $data['remark']);
+        } catch (\Throwable $e) {
+            Log::error('关闭订单失败:' . 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));
+            return app('json')->fail('关闭订单失败');
+        }
         return app('json')->success('取消成功');
     }
 

crmeb/listens/AutoCancelGroupOrderListen.php

@@ -22,6 +22,7 @@ class AutoCancelGroupOrderListen implements ListenerInterface
 
     public function handle($event): void
     {
+        /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
         $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
         Timer::tick(60000, function () use ($storeGroupOrderRepository) {
             $timer = ((int)systemConfig('auto_close_order_timer')) ?: 15;