From dd6fdd9bcff3c2b3dcebdb0db3f80bc9dd469bc4 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 25 Dec 2025 10:00:15 +0800
Subject: [PATCH] 1. 添加滚动效果 2. 修复供应方无法开通权限
---
admin/app/api/model/order/Order.php | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/admin/app/api/model/order/Order.php b/admin/app/api/model/order/Order.php
index dc1ae27..641754f 100644
--- a/admin/app/api/model/order/Order.php
+++ b/admin/app/api/model/order/Order.php
@@ -222,11 +222,14 @@
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'];
// 商品购买总金额
$item['total_price'] = helper::bcmul($item['product_price'], $params['product_num']);
+ // 商品总结算价
+ $item['total_settlement_price'] = helper::bcmul($item['settlement_price'], $params['product_num']);
}
$supplierData[] = [
'shop_supplier_id' => $product['shop_supplier_id'],
@@ -343,10 +346,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