优惠券明细

app/admin/controller/coupon/CouponDetailController.php

@@ -23,16 +23,16 @@ class CouponDetailController extends Curd
         $order = $request->get('order', 'desc');
         $field = $field ?? 'coupon_detail_addtimes';
 
-        $couponName = $request->get('coupon_name','');
-        if (!empty($couponName)){
-            $couponIds = Coupon::where('coupon_name','like','%'.$couponName.'%')->pluck('coupon_id')->toArray();
-            if(empty($couponIds)){
+        $couponName = $request->get('coupon_name', '');
+        if (!empty($couponName)) {
+            $couponIds = Coupon::where('coupon_name', 'like', '%' . $couponName . '%')->pluck('coupon_id')->toArray();
+            if (empty($couponIds)) {
                 $couponIds = ['default'];
             }
-            $where['join_detail_coupon_id'] = ['in',$couponIds];
+            $where['join_detail_coupon_id'] = ['in', $couponIds];
         }
-        $addTimes = $request->get('coupon_detail_addtimes',[]);
-        if (!empty($addTimes)){
+        $addTimes = $request->get('coupon_detail_addtimes', []);
+        if (!empty($addTimes)) {
             $addTimes[0] = isset($addTimes[0]) ? strtotime($addTimes[0]) : time();
             $addTimes[1] = isset($addTimes[1]) ? strtotime($addTimes[1]) : time();
 
@@ -118,6 +118,12 @@ class CouponDetailController extends Curd
                     $item['member_used'] += 1;
                 }
             }
+            if (!empty($item['coupon_detail_extend_json'])) {
+                $couponDetailExtendJson = json_decode($item['coupon_detail_extend_json'], true);
+                if (isset($couponDetailExtendJson['gettype'])){
+                    $item['gettype'] = $couponDetailExtendJson['gettype'];
+                }
+            }
         }
 
         return $items;
@@ -133,22 +139,22 @@ class CouponDetailController extends Curd
      */
     public function updateStatus(Request $request)
     {
-        $detailId = $request->post('coupon_detail_id','');
-        $status = $request->post('status','');
+        $detailId = $request->post('coupon_detail_id', '');
+        $status = $request->post('status', '');
 
-        $detail = CouponDetail::where('coupon_detail_id',$detailId)->first();
-        if (!$detail){
+        $detail = CouponDetail::where('coupon_detail_id', $detailId)->first();
+        if (!$detail) {
             return json_fail('数据不存在');
         }
         //状态 INIT|PENDING=等待领取|ACTIVED=可用|WAITING=已占用(待完成)|USED=已使用|DISABLED|CANCEL|EXPIRED
-        if (!in_array($status,['INIT','PENDING','ACTIVED','WAITING','USED','DISABLED','CANCEL','EXPIRED'])){
+        if (!in_array($status, ['INIT', 'PENDING', 'ACTIVED', 'WAITING', 'USED', 'DISABLED', 'CANCEL', 'EXPIRED'])) {
             return json_fail("状态异常");
         }
         try {
-            CouponDetail::where('coupon_detail_id',$detailId)->update(['coupon_detail_status'=>$status]);
+            CouponDetail::where('coupon_detail_id', $detailId)->update(['coupon_detail_status' => $status]);
 
             return json_success('success');
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             dump($e->getMessage());
             return json_fail('数据修改失败');
         }