完善功能

app/admin/service/member/MemberService.php

@@ -40,7 +40,7 @@ class MemberService
                 $query->where('member_cert.member_cert_name', 'like', '%' . $name . '%');
             })->when($mobile != '', function ($query) use ($mobile) {
                 $query->where('member.member_mobile', 'like', '%' . $mobile . '%');
-            })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes',
+            })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
                 'member_info.member_info_nickname', 'member_info.member_info_headimg',
                 'member_role.member_role_id', 'member_role.member_role_name',
                 'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation',
@@ -74,6 +74,7 @@ class MemberService
                 foreach ($row['account'] as $item) {
                     if ($item['member_account_classify'] == 'POINTS') {
                         $account['points'] = [
+                            'member_account_name' => $item['member_account_name'],
                             'member_account_income' => $item['member_account_income'],
                             'member_account_expend' => $item['member_account_expend'],
                             'member_account_surplus' => $item['member_account_surplus'],
@@ -81,6 +82,15 @@ class MemberService
                         ];
                     } else if ($item['member_account_classify'] == 'CASH') {
                         $account['cash'] = [
+                            'member_account_name' => $item['member_account_name'],
+                            'member_account_income' => $item['member_account_income'],
+                            'member_account_expend' => $item['member_account_expend'],
+                            'member_account_surplus' => $item['member_account_surplus'],
+                            'member_account_added' => $item['member_account_added'],
+                        ];
+                    } else if ($item['member_account_classify'] == 'CARD') {
+                        $account['card'] = [
+                            'member_account_name' => $item['member_account_name'],
                             'member_account_income' => $item['member_account_income'],
                             'member_account_expend' => $item['member_account_expend'],
                             'member_account_surplus' => $item['member_account_surplus'],
@@ -95,6 +105,14 @@ class MemberService
             if (!empty($row['member_cert_nbr']) && !empty($row['member_cert_name'])) {
                 $row['is_auth'] = "已认证";
             }
+
+            $row['source'] = "APP";
+            if (!empty($row['member_extend_json'])) {
+                $extendJson = json_decode($row['member_extend_json'], true);
+                if (isset($extendJson['come_from'])) {
+                    $row['source'] = $extendJson['come_from'] ?? '';
+                }
+            }
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
@@ -276,7 +294,8 @@ class MemberService
                 'member_classify' => $params['classify'],
                 'member_status' => $params['status'],
                 'member_mobile' => $params['mobile'],
-                'member_from' => $params['source'],
+//                'member_from' => $params['source'],
+                'member_extend_json' => json_encode(['come_from' => $params['source']]),
                 'member_addtimes' => time(),
             ];
             Member::insert($memberData);
@@ -345,9 +364,15 @@ class MemberService
         Db::beginTransaction();
         try {
             $memberId = $params['member_id'];
-            if (!Member::where('member_id', $params['member_id'])->exists()) {
+            $member = Member::where('member_id', $params['member_id'])->first();
+            if (!$member) {
                 return json_fail("暂无数据");
             }
+            $extendJson = [];
+            if (!empty($member->member_extend_json)) {
+                $extendJson = json_decode($member->member_extend_json, true);
+            }
+            $extendJson['come_from'] = $params['source'];
             // 先写主表，要ID
             $memberData = [
                 'member_id' => $memberId,
@@ -355,7 +380,8 @@ class MemberService
                 'member_classify' => $params['classify'],
                 'member_status' => $params['status'],
                 'member_mobile' => $params['mobile'],
-                'member_from' => $params['source'],
+//                'member_from' => $params['source'],
+                'member_extend_json' => json_encode($extendJson)
             ];
             Member::where('member_id', $params['member_id'])->update($memberData);
             // member cert

app/admin/validate/goods/GoodsValidate.php

@@ -20,7 +20,7 @@ class GoodsValidate extends Validate
 //        'goods_sku_json' => 'isJson',
 //        'goods_attribute_json|属性' => 'isJson',
         'goods_service_json|服务' => 'isJson',
-        'goods_title|标题' => 'max:128',
+        'goods_title|简介' => 'max:300',
         'goods_cover|封面' => 'url',
         'goods_on_addtimes|上架时间' => 'date',
         'goods_sort|排序' => 'integer',