Skip to content

G
goods
Commit cb0e2c80 authored by jianghaiming's avatar jianghaiming
Browse files
Options

Merge branch 'marketing_20210824' into test

parents 720c6bf8 124fca5d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
application/services/marketing/DistributorService.php
View file @ cb0e2c80
...@@ -193,9 +193,6 @@ class DistributorService ...@@ -193,9 +193,6 @@ class DistributorService
} }
$jwUserId = ''; $jwUserId = '';
// if (empty($distributorCode)) {
// throw new DistributorException(['cus'=>9]);
// }
$info = Distributor::getRecord(['user_id' => $shareUserId]); $info = Distributor::getRecord(['user_id' => $shareUserId]);
if (empty($info)) { if (empty($info)) {
......
application/services/marketing/MarketingService.php
View file @ cb0e2c80
...@@ -93,7 +93,7 @@ class MarketingService ...@@ -93,7 +93,7 @@ class MarketingService
$where = [ $where = [
'online_status' => 1, 'online_status' => 1,
'rule_refund' => 2, //'rule_refund' => 2,
"expiration_time[>]" => date("Y-m-d"), "expiration_time[>]" => date("Y-m-d"),
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment