From 8c00bd0245ca4756ca04483a4980ad202714e43e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:40:44 +0800
Subject: [PATCH] Merge branch 'release/v1.1.4发布'
---
application/api/logic/commission/Jd.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/application/api/logic/commission/Jd.php b/application/api/logic/commission/Jd.php
index 67edf64..9dadd83 100644
--- a/application/api/logic/commission/Jd.php
+++ b/application/api/logic/commission/Jd.php
@@ -71,7 +71,7 @@
$trade_id = isset($order['order_row_id']) ? $order['order_row_id'] : '';
if(empty($trade_id)) return ['status'=>false,'info'=>'璁㈠崟鍙蜂负绌�'];
//鍒ゆ柇鏄疄浠橀噾棰濇槸鍚﹀ぇ浜�4鍏冿紝澶т簬4鍏冪洿鎺ユ櫘閫氳繑鍒�
- if(floatval($order['estimate_cos_price'])>4){
+ if(floatval($order['estimate_cos_price'])>5){
$res=self::fanliCommission($order);
return $res;
}
@@ -96,7 +96,7 @@
}
else{
- $itemid=$order['item_id'];
+ $itemid=$order['sku_id'];
$first_good=DB::name('user_first_free_browse')->where(['user_id'=>$user['id'],'is_order'=>0,'new_goodsId'=>$itemid])->find();
if(empty($first_good)){
$res=self::fanliCommission($order);
@@ -398,7 +398,7 @@
return ['status'=>false,'info'=>'鏇存柊璁㈠崟tk_z_status閿欒,璁㈠崟ID涓�:'.$order['id']];
}
}
- Db::name('user_first_free_browse')->where(['user_id'=>$user['id'],'new_goodsId'=>$order['item_id']])->update(['tid'=>$trade_id,'is_order'=>1]);
+ Db::name('user_first_free_browse')->where(['user_id'=>$user['id'],'new_goodsId'=>$order['sku_id']])->update(['tid'=>$trade_id,'is_order'=>1]);
Db::commit();
return ['status'=>true,'info'=>'鎷嗗垎鎴愬姛'];
}
--
Gitblit v1.9.3