Merge remote-tracking branch 'origin/dev' into dev

master
liuweiwen 5 years ago
commit f33ad199f7

@ -390,6 +390,7 @@ class PromoteService {
$orderMap2 = $otherMap;
$orderMap2['create_time'] = ['egt', $orderTime];
M('deposit', 'tab_')->where($orderMap2)->save($updateData);
M('user_play_data_count', 'tab_')->where($orderMap2)->save(['promote_id' => $toPromote['id']]);
$status = M('shift_task', 'sys_')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
if (!$status) {

Loading…
Cancel
Save