From 0b74118dd882d1f45737da3836b0ce56394d9dd3 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 28 Mar 2023 11:42:08 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=A0=E9=80=81=E7=9A=84=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/controller/v1/order/StoreOrderController.php     | 3 ---
 .../app/services/activity/coupon/StoreCouponIssueServices.php  | 2 +-
 crmeb/app/services/order/StoreOrderDeliveryServices.php        | 1 +
 .../services/product/product/StoreProductCouponServices.php    | 3 +++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index 74f282d8c..40643831f 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -263,9 +263,6 @@ class StoreOrderController
             return app('json')->fail(410215);
         }
 
-        //重新生成订单号去支付
-//        $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id'];
-
         //0元支付
         if (bcsub((string)$orderInfo['pay_price'], '0', 2) <= 0) {
             //创建订单jspay支付
diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
index 0d6718540..9c8d16ce0 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
@@ -259,7 +259,7 @@ class StoreCouponIssueServices extends BaseServices
                     $data['add_time'] = $item['start_use_time'];
                     $data['end_time'] = $item['end_use_time'];
                 }
-                $data['type'] = 'get';
+                $data['type'] = 'send';
                 $issue['uid'] = $uid;
                 $issue['issue_coupon_id'] = $item['id'];
                 $issue['add_time'] = $time;
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index da2b3d109..1def0cef5 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -569,6 +569,7 @@ class StoreOrderDeliveryServices extends BaseServices
     /**
      * 虚拟商品自动发货
      * @param $orderInfo
+     * @throws \ReflectionException
      */
     public function virtualSend($orderInfo)
     {
diff --git a/crmeb/app/services/product/product/StoreProductCouponServices.php b/crmeb/app/services/product/product/StoreProductCouponServices.php
index da8ea57fb..b3362dccb 100644
--- a/crmeb/app/services/product/product/StoreProductCouponServices.php
+++ b/crmeb/app/services/product/product/StoreProductCouponServices.php
@@ -92,6 +92,9 @@ class StoreProductCouponServices extends BaseServices
      * @param int $uid
      * @param $orderId
      * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function giveOrderProductCoupon(int $uid, $orderId)
     {

From 72653993c3d37d4ef4e737cf420f5229418015dd Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 28 Mar 2023 11:47:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E6=9C=89=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/activity/coupon/StoreCouponUserUserServices.php    | 2 +-
 template/admin/src/pages/marketing/storeCouponUser/index.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php b/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php
index 5e856b673..50b35a3ae 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php
@@ -45,7 +45,7 @@ class StoreCouponUserUserServices extends BaseServices
         [$page, $limit] = $this->getPageValue();
         $list = $this->dao->sysPage($where, $page, $limit);
         foreach ($list as $k => &$v) {
-            $v['start_time'] = $v['add_time'];
+            $v['start_time'] = $v['start_time'] > 0 ? $v['start_time'] : $v['add_time'];
             if ($v['end_time'] < time() || $v['use_time'] != 0) $v['is_fail'] = 1;
         }
         $count = $this->dao->sysCount($where);
diff --git a/template/admin/src/pages/marketing/storeCouponUser/index.vue b/template/admin/src/pages/marketing/storeCouponUser/index.vue
index f22cfad97..cda0ffae3 100644
--- a/template/admin/src/pages/marketing/storeCouponUser/index.vue
+++ b/template/admin/src/pages/marketing/storeCouponUser/index.vue
@@ -42,7 +42,7 @@
           <Icon type="md-close" v-else color="#ed5565" size="14" />
         </template>
         <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
+          <span> {{ row.start_time | formatDate }}</span>
         </template>
         <template slot-scope="{ row, index }" slot="end_time">
           <span> {{ row.end_time | formatDate }}</span>

From 99253b7972a2a08a009bea4048ed6e8606e45ed1 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 28 Mar 2023 11:58:44 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/cms/ArticleCategory.php | 4 ++++
 crmeb/app/dao/article/ArticleCategoryDao.php             | 3 ++-
 crmeb/app/services/article/ArticleCategoryServices.php   | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/cms/ArticleCategory.php b/crmeb/app/adminapi/controller/v1/cms/ArticleCategory.php
index 1a666b5ac..c45019d41 100644
--- a/crmeb/app/adminapi/controller/v1/cms/ArticleCategory.php
+++ b/crmeb/app/adminapi/controller/v1/cms/ArticleCategory.php
@@ -165,10 +165,14 @@ class ArticleCategory extends AuthController
     /**
      * 树形列表
      * @return mixed
+     * @throws \ReflectionException
      */
     public function getTreeList()
     {
         $list = $this->service->getTreeList();
+        foreach ($list as &$item) {
+            $item['disabled'] = !$item['status'] || $item['is_del'];
+        }
         return app('json')->success($list);
     }
 }
diff --git a/crmeb/app/dao/article/ArticleCategoryDao.php b/crmeb/app/dao/article/ArticleCategoryDao.php
index 275d6c9d6..dfd266a10 100644
--- a/crmeb/app/dao/article/ArticleCategoryDao.php
+++ b/crmeb/app/dao/article/ArticleCategoryDao.php
@@ -86,9 +86,10 @@ class ArticleCategoryDao extends BaseDao
      * 添加修改选择上级分类列表
      * @param array $where
      * @return array
+     * @throws \ReflectionException
      */
     public function getMenus(array $where)
     {
-        return $this->search($where)->order('sort desc,id desc')->column('title,pid,id');
+        return $this->search($where)->order('sort desc,id desc')->column('title,pid,id,is_del,status');
     }
 }
diff --git a/crmeb/app/services/article/ArticleCategoryServices.php b/crmeb/app/services/article/ArticleCategoryServices.php
index 141aae62c..aff354ae6 100644
--- a/crmeb/app/services/article/ArticleCategoryServices.php
+++ b/crmeb/app/services/article/ArticleCategoryServices.php
@@ -151,10 +151,10 @@ class ArticleCategoryServices extends BaseServices
     /**
      * 树形列表
      * @return array
+     * @throws \ReflectionException
      */
     public function getTreeList()
     {
-        $where['status'] = 1;
-        return sort_list_tier($this->dao->getMenus($where));
+        return sort_list_tier($this->dao->getMenus([]));
     }
 }

From 8cb9a50b220be17dd1842fd2255112bf33fd1998 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 28 Mar 2023 12:04:27 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E5=80=99=EF=BC=8C=E5=90=8E=E5=8F=B0=E8=B5=A0?=
 =?UTF-8?q?=E9=80=81=E5=92=8C=E6=96=B0=E7=94=A8=E6=88=B7=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=8D?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E9=A2=86=E5=8F=96=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/marketing/storeCouponIssue/create.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/marketing/storeCouponIssue/create.vue b/template/admin/src/pages/marketing/storeCouponIssue/create.vue
index 24c5a055a..8b7cb1669 100644
--- a/template/admin/src/pages/marketing/storeCouponIssue/create.vue
+++ b/template/admin/src/pages/marketing/storeCouponIssue/create.vue
@@ -83,7 +83,7 @@
             @on-change="dateChange"
           ></DatePicker>
         </FormItem>
-        <FormItem label="领取时间">
+        <FormItem label="领取时间" v-if="formData.receive_type != 2 && formData.receive_type != 3">
           <RadioGroup v-model="isReceiveTime">
             <Radio :label="1">限时</Radio>
             <Radio :label="0">不限时</Radio>

From 1afa4b504d7fb049d811b101f416d9f4898e0c65 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 28 Mar 2023 12:08:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E8=A6=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7=E9=A2=86=E5=8F=96=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=8F=91=E6=94=BE=E7=9A=84=E9=99=90=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/activity/coupon/StoreCouponIssueServices.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
index 9c8d16ce0..8a88619d5 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponIssueServices.php
@@ -123,6 +123,12 @@ class StoreCouponIssueServices extends BaseServices
             $data['is_permanent'] = 1;
             $data['total_count'] = 0;
         }
+
+        if ($data['is_permanent'] != 1 && $data['receive_limit'] > $data['total_count']) {
+            throw new AdminException(500031);
+        }
+
+
         $data['add_time'] = time();
         $res = $this->dao->save($data);
         if (($data['product_id'] !== '' || $data['category_id'] !== '') && $res) {

From 525498b6e5830b2d398965edd80824c071e7b083 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 28 Mar 2023 12:30:33 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E7=9A=84=E9=99=90?=
 =?UTF-8?q?=E6=97=B6=E4=BD=BF=E7=94=A8=E6=97=B6=E9=97=B4=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/controller/v1/store/StoreCouponsController.php  | 4 ++++
 .../app/services/activity/coupon/StoreCouponUserServices.php  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/crmeb/app/api/controller/v1/store/StoreCouponsController.php b/crmeb/app/api/controller/v1/store/StoreCouponsController.php
index 4925e2cfe..234087391 100644
--- a/crmeb/app/api/controller/v1/store/StoreCouponsController.php
+++ b/crmeb/app/api/controller/v1/store/StoreCouponsController.php
@@ -50,6 +50,9 @@ class StoreCouponsController
      * 领取优惠券
      * @param Request $request
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function receive(Request $request)
     {
@@ -82,6 +85,7 @@ class StoreCouponsController
      * @param StoreCouponIssueServices $service
      * @param $cartId
      * @param $new
+     * @param $shippingType
      * @return mixed
      * @throws \Psr\SimpleCache\InvalidArgumentException
      * @throws \think\db\exception\DataNotFoundException
diff --git a/crmeb/app/services/activity/coupon/StoreCouponUserServices.php b/crmeb/app/services/activity/coupon/StoreCouponUserServices.php
index 1bd6b2353..cb84ac6fb 100644
--- a/crmeb/app/services/activity/coupon/StoreCouponUserServices.php
+++ b/crmeb/app/services/activity/coupon/StoreCouponUserServices.php
@@ -170,6 +170,8 @@ class StoreCouponUserServices extends BaseServices
                     $coupon['start_time'] = $coupon['start_time'] ? date('Y/m/d', $coupon['start_time']) : date('Y/m/d', $coupon['add_time']);
                     $coupon['add_time'] = date('Y/m/d', $coupon['add_time']);
                     $coupon['end_time'] = date('Y/m/d', $coupon['end_time']);
+                    $coupon['start_use_time'] = $coupon['start_use_time'] > 0 ? date('Y/m/d', $coupon['start_use_time']) : 0;
+                    $coupon['end_use_time'] = $coupon['start_use_time'] > 0 ? date('Y/m/d', $coupon['end_use_time']) : 0;
                     $coupon['title'] = $coupon['coupon_title'];
                     $coupon['type'] = $coupon['applicable_type'];
                     $coupon['use_min_price'] = floatval($coupon['use_min_price']);