双十一活动

app/admin/controller/finance/MemberAccountController.php

@@ -76,6 +76,26 @@ class MemberAccountController
         $statistics['expend'] = $rows->sum('member_account_expend');
         $statistics['added'] = $rows->sum('member_account_added');
 
+        $statistics['memberTotal'] = Member::where('member_mobile', '<>', '0000')
+            ->when(!empty($level), function ($query) use ($level, $levelIds) {
+                if ($level == '00') {
+                    $query->where('join_member_role_id', '')->orWhere('join_member_role_id', NULL);
+                } else if ($level == 'VIP') {
+                    $query->where('member_is_vip', 'Y');
+                } else if (!empty($levelIds)) {
+                    $query->whereIn('member_role_id', $levelIds);
+                } else {
+                    $query->where('join_member_role_id', $level);
+                }
+
+            })->when(!empty($memberId), function ($query) use ($memberId) {
+                $query->where('member_id', $memberId);
+            })->when(!empty($days), function ($query) use ($days) {
+                $query->whereBetween('member_addtimes', $days);
+            })->when(!empty($premisesId), function ($query) use ($premisesId) {
+                $query->whereJsonContains('member_extend_json->belong->premises', $premisesId);
+            })->count();
+
         $rows = $rows->select('member.member_id', 'member.member_mobile', 'member.member_addtimes', 'member.join_member_role_id',
             'ma.member_account_income as member_account_income', 'ma.member_account_expend as member_account_expend', 'ma.member_account_surplus as member_account_surplus', 'ma.member_account_added as member_account_added'
         )

app/admin/service/goods/GoodsService.php

@@ -996,6 +996,9 @@ class GoodsService
             if (isset($extendJson['min-count'])) {
                 $data['min_count'] = $extendJson['min-count'];
             }
+            if (isset($extendJson['max-limit'])) {
+                $data['max_limit'] = $extendJson['max-limit'];
+            }
             if (isset($extendJson['position'])) {
                 $data['position'] = $extendJson['position'];
             }
@@ -1914,14 +1917,20 @@ class GoodsService
                 $model->goods_attribute_json = json_encode($attributeJson);
             }
             if (isset($params['min_count'])) {
+                $attributeJson = [];
                 if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
                     $attributeJson = json_decode($model->goods_attribute_json, true);
-                } elseif (empty($model->goods_attribute_json)) {
-                    $attributeJson = [];
                 }
                 $attributeJson['min-count'] = $params['min_count'];
                 $model->goods_attribute_json = json_encode($attributeJson);
             }
+            if (isset($params['max_limit'])){
+                $attributeJson = [];
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                }
+                $attributeJson['max-limit'] = $params['max_limit'];
+            }
             if (isset($params['teachers'])) {
                 if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
                     $attributeJson = json_decode($model->goods_attribute_json, true);
@@ -2500,6 +2509,15 @@ class GoodsService
                 $data['goods_attribute_json']['min-count'] = $params['min_count'];
                 $data['goods_attribute_json'] = json_encode($data['goods_attribute_json']);
             }
+            if (isset($params['max_limit'])) {
+                if (!empty($data['goods_attribute_json']) && !is_array($data['goods_attribute_json'])) {
+                    $data['goods_attribute_json'] = json_decode($data['goods_attribute_json'], true);
+                }elseif (empty($data['goods_attribute_json'])) {
+                    $data['goods_attribute_json'] = [];
+                }
+                $data['goods_attribute_json']['max-limit'] = $params['max_limit'];
+                $data['goods_attribute_json'] = json_encode($data['goods_attribute_json']);
+            }
             if (isset($params['teachers'])) {
                 if (!empty($data['goods_attribute_json']) && !is_array($data['goods_attribute_json'])) {
                     if (is_json($data['goods_attribute_json'])) {