diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 16f8145..244f5cc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,6 @@ - - + + + + + + + + + @@ -56,11 +63,11 @@ - + - - + + @@ -83,11 +90,11 @@ - + - - + + @@ -101,15 +108,6 @@ - - - - - - - - - @@ -138,9 +136,9 @@ @@ -281,18 +279,18 @@ - - + @@ -317,13 +315,6 @@ - - - - - - - @@ -523,13 +514,6 @@ - - - - - - - @@ -544,10 +528,24 @@ + + + + + + + - - + + + + + + + + + diff --git a/application/common/model/NoticeSetting.php b/application/common/model/NoticeSetting.php index 69985fa..64fc8a5 100644 --- a/application/common/model/NoticeSetting.php +++ b/application/common/model/NoticeSetting.php @@ -89,6 +89,7 @@ class NoticeSetting extends Model //通知会员的场景 const NOTICE_USER_SCENE = [ + self::MONEY_PAY_NOTICE, self::ORDER_PAY_NOTICE, self::ORDER_DELIVERY_NOTICE, self::PLATFORM_PASS_REFUND_NOTICE, @@ -143,6 +144,7 @@ class NoticeSetting extends Model public static function getSceneDesc($state) { $data = [ + self::MONEY_PAY_NOTICE => '余额变动', self::ORDER_PAY_NOTICE => '订单已支付', self::ORDER_DELIVERY_NOTICE => '订单已发货', self::PLATFORM_PASS_REFUND_NOTICE => '平台通过售后退款通知',