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

app/common/repositories/store/product/ProductRepository.php

@@ -1625,7 +1625,13 @@ class ProductRepository extends BaseRepository
 
             $member_settings = merchantConfig($merId, 'member_settings');
             $member_settings = $member_settings ?: [];
-
+            if (empty($member_settings)) {
+                $member_settings['tjj'] = 0;
+                $member_settings['ylj'] = 0;
+                $member_settings['dls'] = 0;
+                $member_settings['yy_one'] = 0;
+                $member_settings['yy_kg'] = 0;
+            }
             $where['mer_id'] = $merId;
             $where['state'] = 1;
             $yeji = Db::name('enterprise_performance_divvy')->where($where)->sum('gdp');