|
|
@@ -50,7 +50,7 @@ class SplitSale extends Command
|
|
|
->field('a.*,b.platform_name,b.use_type,c.proof_url')
|
|
|
->where([
|
|
|
['a.is_del', '=', 0],
|
|
|
- ['a.updatetime', '>=', date('Y-m-d H:i:s', time() - 5 * 60)],
|
|
|
+ ['a.updatetime', '>=', date('Y-m-d H:i:s', time() - 30 * 60)],
|
|
|
['a.pay_id', '<>', 0]
|
|
|
])->cursor();
|
|
|
$userCommon = User::getIns();
|
|
|
@@ -349,7 +349,11 @@ class SplitSale extends Command
|
|
|
Db::name('cgd_caixiao')
|
|
|
->where('id', $tmp['id'])
|
|
|
->update($tmp_cgd);
|
|
|
- if(isset($tempOrder['cgdNo']))$tempOrder['cgdNo']= $tmp['cgdNo'];
|
|
|
+ if(isset($tempOrder['cgdNo'])){
|
|
|
+ $tempOrder['cgdNo']= $tmp['cgdNo'];
|
|
|
+ $tempOrder['supplierName'] =$cgd['supplier_name'];
|
|
|
+ $tempOrder['supplierNo'] = $cgd['supplierNo'];
|
|
|
+ }
|
|
|
} else {
|
|
|
if(isset($tempOrder['cgdNo']))$tempOrder['cgdNo']=$cgdNo;
|
|
|
$this->cgd_insert[$this->cgd_key] = array_merge($tmp_cgd, [
|
