|
@@ -1048,7 +1048,7 @@ class TPlusServerService extends Service
|
|
|
$data['end_time'] = $end;
|
|
|
$data['operation_time'] = time();
|
|
|
|
|
|
-// list($status, $msg) = $this->synFreightFeeFromMine($data, $user);dd(333);
|
|
|
+// list($status, $msg) = $this->synFreightFeeFromMine($data, $user);dd($status, $msg);
|
|
|
list($status,$msg) = $this->limitingSendRequest($this->table_3);
|
|
|
if(! $status) return [false, '运费统计同步正在后台运行,请稍后'];
|
|
|
|
|
@@ -1154,7 +1154,7 @@ class TPlusServerService extends Service
|
|
|
do {
|
|
|
$rows = $this->databaseService->table('SA_SaleDelivery_b as sd_b')
|
|
|
->join('SA_SaleDelivery as sd', 'sd_b.idSaleDeliveryDTO', '=', 'sd.ID')
|
|
|
- ->leftJoin('AA_Partner as pn', 'sd.idsettlecustomer', '=', 'pn.ID') // 结算客户
|
|
|
+ ->leftJoin('AA_Partner as pn', 'sd.idcustomer', '=', 'pn.ID') // 客户
|
|
|
->leftJoin('AA_Person as ps', 'sd.idclerk', '=', 'ps.ID') // 业务员
|
|
|
->leftJoin('AA_Person as ps2', 'pn.idsaleman', '=', 'ps2.ID')
|
|
|
->leftJoin('AA_Inventory as it', 'sd_b.idinventory', '=', 'it.ID')
|
|
@@ -1289,8 +1289,8 @@ class TPlusServerService extends Service
|
|
|
|
|
|
private function updateFreightFeeFromMine($data){
|
|
|
try {
|
|
|
- $start_timeStamp = $data['start_time'];
|
|
|
- $end_timeStamp = $data['end_time'];
|
|
|
+ $start_timeStamp = $data['start_timeStamp'];
|
|
|
+ $end_timeStamp = $data['end_timeStamp'];
|
|
|
$tmpTable = $this->table_3;
|
|
|
$time = time();
|
|
|
$ergs = $data;
|