|
|
@@ -3,6 +3,7 @@
|
|
|
namespace Util\Common;
|
|
|
use Mall\Framework\Factory;
|
|
|
use JinDouYun\Dao\Customer\DCustomer;
|
|
|
+use JinDouYun\Dao\UserCenter\DUserCenter;
|
|
|
use JinDouYun\Cache\CustomerCache;
|
|
|
use JinDouYun\Dao\Order\DOrderIndex;
|
|
|
use JinDouYun\Dao\Order\DOrder;
|
|
|
@@ -16,6 +17,7 @@ use JinDouYun\Dao\CommissionPartner\DNewCommissionTask;
|
|
|
|
|
|
class PartnerTools{
|
|
|
private $dbCustomer;
|
|
|
+ private $dbUserCenter;
|
|
|
private $dbOrderIndex;
|
|
|
|
|
|
private $dbNewCommissionPartner;
|
|
|
@@ -50,6 +52,9 @@ class PartnerTools{
|
|
|
$this->dbCustomer = new DCustomer('default');
|
|
|
$customerTableName = $this->dbCustomer->getTableName($this->dbCustomer->get_Table(), $this->enterpriseId, $this->cutTable);
|
|
|
$this->dbCustomer->setTable($customerTableName);
|
|
|
+ //用户账号表
|
|
|
+ $this->dbUserCenter = new DUserCenter();
|
|
|
+
|
|
|
|
|
|
//订单索引表
|
|
|
$this->dbOrderIndex = new DOrderIndex();
|
|
|
@@ -953,6 +958,11 @@ class PartnerTools{
|
|
|
return ["code"=>-1,"msg"=>"参数错误"];
|
|
|
}
|
|
|
|
|
|
+ $adminData = $this->dbUserCenter->get($this->onlineUserId);
|
|
|
+ if(empty($adminData)){
|
|
|
+ $adminData=["audit_name"=>"管理人员"];
|
|
|
+ }
|
|
|
+
|
|
|
//频繁操作限制
|
|
|
$key = "partnerCashDealCache_".$id.'::'.$this->enterpriseId;
|
|
|
$result = $this->cache->get($key);
|
|
|
@@ -978,7 +988,8 @@ class PartnerTools{
|
|
|
"status"=>1,
|
|
|
"audit_time"=>time(),
|
|
|
"audit_mono"=>$mono,
|
|
|
- "audit_id"=>$audit_id
|
|
|
+ "audit_id"=>$audit_id,
|
|
|
+ "audit_name"=>$adminData["mobile"],
|
|
|
], $where);
|
|
|
$this->cache->set($key,null);
|
|
|
if(empty($res)){
|
|
|
@@ -993,7 +1004,8 @@ class PartnerTools{
|
|
|
"status"=>-1,
|
|
|
"audit_time"=>time(),
|
|
|
"audit_mono"=>$mono,
|
|
|
- "audit_id"=>$audit_id
|
|
|
+ "audit_id"=>$audit_id,
|
|
|
+ "audit_name"=>$adminData["mobile"],
|
|
|
], $where);
|
|
|
if(empty($res)){
|
|
|
$this->dbNewCommissionCash->rollBack();
|
yingzi