From ff42a171ae5ef8e3143b42d6af33ffdf606a3a80 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:39:05 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' into develop
---
application/api/logic/order/DyOrder.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/application/api/logic/order/DyOrder.php b/application/api/logic/order/DyOrder.php
index 178f125..e978b1b 100644
--- a/application/api/logic/order/DyOrder.php
+++ b/application/api/logic/order/DyOrder.php
@@ -87,8 +87,9 @@
$list = $this->model->where(['is_distribution'=>0,'channel_code'=>['neq',''],'channel_code'=>['neq',0]])->whereOr("is_distribution = 1 And tk_z_status = 2 And channel_code !=''")->limit(20)->order('id desc')->select();
if(!empty($list)){
$LogicDyCommission = new LogicDyCommission();
- foreach($list as $order){
- $result = $LogicDyCommission->fanliCommission($order);
+ foreach($list as $order){
+ $result = $LogicDyCommission->fanliCommissionNew($order);
+ // $result = $LogicDyCommission->fanliCommission($order);
if(!$result){
mylog('璁㈠崟鎷嗗垎閿欒',$result['info'],"errorInfo");
}
--
Gitblit v1.9.3