Browse Source

会员部分修改

shensong 5 years ago
parent
commit
a806380075

+ 2 - 0
app/Http/Controllers/Admin/CustomerDepositController.php

808
                 $item['status'] = '已使用';
808
                 $item['status'] = '已使用';
809
             } else if(time() <= strtotime($value['end_time'])){
809
             } else if(time() <= strtotime($value['end_time'])){
810
                 $item['status'] = '未使用';
810
                 $item['status'] = '未使用';
811
+                $item['use_time'] = '';
811
             } else {
812
             } else {
812
                 $item['status'] = '已过期';
813
                 $item['status'] = '已过期';
814
+                $item['use_time'] = '';
813
             }
815
             }
814
             return $item;
816
             return $item;
815
         },$couponList);
817
         },$couponList);

+ 7 - 4
app/Http/Controllers/Api/CustomerController.php

223
             $item['is_use'] = $value['is_use'];
223
             $item['is_use'] = $value['is_use'];
224
             $item['order_id'] = $value['order_id'];
224
             $item['order_id'] = $value['order_id'];
225
             if($value['is_use'] == 1){
225
             if($value['is_use'] == 1){
226
-                $item['status'] = 1;
227
-            } else if(time() <= strtotime($value['end_time'])){
228
                 $item['status'] = 0;
226
                 $item['status'] = 0;
229
-            } else {
227
+                $item['use_time'] = $value['use_time'];
228
+            } else if(time() <= strtotime($value['end_time'])){
230
                 $item['status'] = 1;
229
                 $item['status'] = 1;
230
+                $item['use_time'] = '';
231
+            } else {
232
+                $item['status'] = 0;
233
+                $item['use_time'] = '';
231
             }
234
             }
232
-            $item['use_time'] = $value['use_time'];
235
+
233
             return $item;
236
             return $item;
234
         },$list);
237
         },$list);
235
         return self::returnValue($list,200);
238
         return self::returnValue($list,200);