From 33f004d1196d056b99a3886de070d429315bac39 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 11 Dec 2025 18:12:38 +0800
Subject: [PATCH] 将分类改为多选 修复活动报名 实现成为vip会员时根据活动报名信息绑定下级
---
admin/app/api/model/order/Order.php | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/admin/app/api/model/order/Order.php b/admin/app/api/model/order/Order.php
index dc1ae27..ab6ed4e 100644
--- a/admin/app/api/model/order/Order.php
+++ b/admin/app/api/model/order/Order.php
@@ -222,6 +222,7 @@
foreach ($productList as &$item) {
// 商品单价
$item['product_price'] = $item['product_sku']['product_price'];
+ $item['settlement_price'] = $item['product_sku']['settlement_price'];
// 商品购买数量
$item['total_num'] = $params['product_num'];
$item['spec_sku_id'] = $item['product_sku']['spec_sku_id'];
@@ -343,10 +344,16 @@
{
$model = new static();
$where = ['order_id' => $order_id, 'user_id' => $user_id];
- if(strlen($order_id)>=14){
- $where = ['order_no' => $order_id, 'user_id' => $user_id];
+ if(strlen($order_id)>=14){ //按照微信支付的 预下单填入的out_trade_no
+ $where = ['trade_no' => $order_id, 'user_id' => $user_id];
+ $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
+ if(!$order){
+ $where = ['ins_order_sn' => $order_id, 'user_id' => $user_id];
+ $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
+ }
+ }else{
+ $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
}
- $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
if (empty($order)) {
throw new BaseException(['msg' => '订单不存在']);
}
--
Gitblit v1.9.2