From e5ecb82ccda179554fb9b39adf9b3591327a1a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 6 Sep 2022 09:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E6=B4=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=8A=A0=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=B5=B7=E6=8A=A5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=8A=A0=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/controller/v1/PublicController.php                | 2 +-
 crmeb/app/services/activity/bargain/StoreBargainServices.php    | 2 +-
 .../services/activity/combination/StoreCombinationServices.php  | 2 +-
 crmeb/app/services/activity/seckill/StoreSeckillServices.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php
index 84a9bd61e..f19e9e5c0 100644
--- a/crmeb/app/api/controller/v1/PublicController.php
+++ b/crmeb/app/api/controller/v1/PublicController.php
@@ -301,7 +301,7 @@ class PublicController
             ['code', ''],
         ], true);
         if (!preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $imageUrl) || !preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $codeUrl)) {
-            return app('json')->fail(100100);
+            return app('json')->success(['code' => false, 'image' => false]);
         }
         try {
             $code = CacheService::get($codeUrl, function () use ($codeUrl) {
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index 56c8b09f9..66ba986af 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -1047,7 +1047,7 @@ class StoreBargainServices extends BaseServices
                 $item['status'] = '未知';
             }
             $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
-            $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
+            $item['pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : '';
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php
index 3643fb34d..2737acba6 100644
--- a/crmeb/app/services/activity/combination/StoreCombinationServices.php
+++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php
@@ -683,7 +683,7 @@ class StoreCombinationServices extends BaseServices
                 $item['status'] = '未知';
             }
             $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
-            $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
+            $item['pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : '';
         }
         return compact('list', 'count');
     }
diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
index 6d7610066..68cc1f9e7 100644
--- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php
+++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php
@@ -923,7 +923,7 @@ class StoreSeckillServices extends BaseServices
                 $item['status'] = '未知';
             }
             $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
-            $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
+            $item['pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : '';
         }
         return compact('list', 'count');
     }