Merge branch 'marketing_20210824' into test

cb0e2c80 · jianghaiming · 720c6bf8 · 124fca5d · cb0e2c80 · cb0e2c80
Commit cb0e2c80 authored Aug 26, 2021 by jianghaiming
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

DistributorService.php application/services/marketing/DistributorService.php +0 -3

MarketingService.php application/services/marketing/MarketingService.php +1 -1

No files found.
--- a/application/services/marketing/DistributorService.php
+++ b/application/services/marketing/DistributorService.php
@@ -193,9 +193,6 @@ class DistributorService
        }

        $jwUserId = '';
-        // if (empty($distributorCode)) {
-        //     throw new DistributorException(['cus'=>9]);
-        // }
        $info = Distributor::getRecord(['user_id' => $shareUserId]);

        if (empty($info)) {

--- a/application/services/marketing/MarketingService.php
+++ b/application/services/marketing/MarketingService.php
@@ -93,7 +93,7 @@ class MarketingService

        $where = [
            'online_status' => 1,
-            'rule_refund' => 2,
+            //'rule_refund' => 2,
            "expiration_time[>]" => date("Y-m-d"),
        ];