完善功能

app/admin/controller/member/QuotaController.php

@@ -122,6 +122,14 @@ class QuotaController extends Curd
         return [$id, $data];
     }
 
+    /**
+     * @Desc 额度核销
+     * @Author Gorden
+     * @Date 2024/6/4 8:32
+     *
+     * @param Request $request
+     * @return Response
+     */
     public function writeOff(Request $request)
     {
         $quotaIds = $request->post('quota_id', []);
@@ -131,12 +139,12 @@ class QuotaController extends Curd
         $memberIds = array_column($quotas, 'join_quota_member_id');
 
         if (count(array_unique($memberIds)) > 1) {
-            return json_fail("不可以同时核销多个会员权益");
+            return json_fail("不可同时核销多个会员的权益");
         }
 
         $status = array_column($quotas, 'member_quota_status');
-        if (in_array('USED', $status)) {
-            return json_fail('存在已核销的权益，请去除后重试');
+        if (in_array('USED', $status) || in_array('CANCEL',$status)) {
+            return json_fail('存在已核销 / 无效的权益，请重新选择');
         }
 
         $member = Member::find(current($memberIds));

app/admin/controller/sms/SmsController.php

@@ -12,6 +12,14 @@ class SmsController
 {
     const KEY_PREFIX = 'SMS:CODE:';
 
+    /**
+     * @Desc 核销验证码
+     * @Author Gorden
+     * @Date 2024/6/4 8:46
+     *
+     * @param Request $request
+     * @return \support\Response
+     */
     public function sendSmsCodeByQuota(Request $request)
     {
         $quotaIds = $request->post('quota_id', []);
@@ -23,7 +31,12 @@ class SmsController
         $memberIds = array_column($quotas, 'join_quota_member_id');
 
         if (count(array_unique($memberIds)) > 1) {
-            return json_fail("不可以同时核销多个会员权益");
+            return json_fail("不可同时核销多个会员的权益");
+        }
+
+        $status = array_column($quotas, 'member_quota_status');
+        if (in_array('USED', $status) || in_array('CANCEL',$status)) {
+            return json_fail('存在已核销 / 无效的权益，请重新选择');
         }
 
         try {
@@ -43,7 +56,6 @@ class SmsController
             ]);
 
         } catch (\Exception $e) {
-//            dump($e->getTrace());
             return json_fail("短信发送失败，请稍后重试");
         }