From 98bd00fe01d86f1e43d1e1687be05461f14642d5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 19 Sep 2024 22:44:47 +0800
Subject: [PATCH] feat(CommissionProductLogic): updated prod calc logic for
user ship condition, added source check for order, improved code quality
---
app/common/logic/CommissionProductLogic.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/common/logic/CommissionProductLogic.php b/app/common/logic/CommissionProductLogic.php
index 42772ac12..98dfd9c80 100644
--- a/app/common/logic/CommissionProductLogic.php
+++ b/app/common/logic/CommissionProductLogic.php
@@ -23,7 +23,11 @@ class CommissionProductLogic extends BaseLogic
*/
function calculate_product_flow($find, $order, $village_uid = 0, $brigade_uid = 0, $user_ship = 0, $spread_user_ship = 0)
{
- $product = StoreProduct::where('id', $find['product_id'])->find();
+ if(isset($order['source']) && $order['source'] == 2){
+ $product = StoreBranchProduct::where('product_id', $find['product_id'])->where('store_id', $order['store_id'])->find();
+ }else{
+ $product = StoreProduct::where('id', $find['product_id'])->find();
+ }
if ($product) {
//活动商品
if ($product['product_type'] == 4) {