|
@@ -135,7 +135,7 @@ class PartnerTools{
|
|
|
"enterpriseId"=>$enterpriseId,
|
|
|
"title"=>"订单完成计算分佣",
|
|
|
"mono"=>"",
|
|
|
- "status"=>$ckeckData["type"] == "shopCardOrder"?-3:0,//服务优惠卡暂时不计算
|
|
|
+ "status"=>0,//服务优惠卡暂时不计算
|
|
|
"run_time"=>0,
|
|
|
"time"=>time(),
|
|
|
"type"=>$ckeckData["type"],
|
|
@@ -498,13 +498,14 @@ class PartnerTools{
|
|
|
if(empty($orderId)){
|
|
|
return ["code"=>-1,"msg"=>"订单id错误"];
|
|
|
}
|
|
|
- $orderIndexData = $this->dbOrderIndex->get(['id'=>$orderId]);
|
|
|
- if(empty($orderIndexData)){
|
|
|
- return ["code"=>-1,"msg"=>"订单索引数据不存在"];
|
|
|
- }
|
|
|
+
|
|
|
$orderData=null;
|
|
|
//商品订单
|
|
|
if($taskType=="order"){
|
|
|
+ $orderIndexData = $this->dbOrderIndex->get(['id'=>$orderId]);
|
|
|
+ if(empty($orderIndexData)){
|
|
|
+ return ["code"=>-1,"msg"=>"订单索引数据不存在"];
|
|
|
+ }
|
|
|
// 切换订单分表,查询订单主单据数据
|
|
|
$dbOrder = new DOrder('default');
|
|
|
$fix = ceil($orderIndexData['userCenterId'] / 200000);
|
|
@@ -620,7 +621,7 @@ class PartnerTools{
|
|
|
$this->dbNewCommissionDetail->beginTransaction();
|
|
|
$lms = "";
|
|
|
foreach($data as $k=>$v){
|
|
|
- $count = $this->dbNewCommissionDetail->count(["orderId"=>$v["orderId"],"partnerId"=>$v["partnerId"]]);
|
|
|
+ $count = $this->dbNewCommissionDetail->count(["orderId"=>$v["orderId"],"partnerId"=>$v["partnerId"],"taskType"=>$v["taskType"]]);
|
|
|
if($count>0){
|
|
|
$lms.="当前订单已计算佣金[{$v['orderId']}];";
|
|
|
continue;
|