release 8.7.0

Author: modstart

app/Constant/AppConstant.php

@@ -7,4 +7,5 @@ class AppConstant
     const APP = 'cms9';
     const APP_NAME = 'ModStartCMS9';
     const VERSION = '8.7.0';
+
 }

module/Banner/Admin/Controller/BannerController.php

@@ -40,7 +40,9 @@ protected function crud(AdminCRUDBuilder $builder)
                     ->when(BannerType::VIDEO, function ($context) {
                         /** @var HasFields $context */
                         $context->video('video', '视频');
-                    })->required();
+                    })
+                    ->defaultValue(BannerType::IMAGE)
+                    ->required();
                 $builder->color('backgroundColor', '背景色');
                 $builder->link('link', '链接');
                 $builder->display('created_at', L('Created At'))->listable(false);

module/Banner/Docs/release.md

@@ -1,7 +1,8 @@
-## 1.8.0
+## 1.8.0 轮播图获取支持仅图片过滤方法，视频 Banner 概率不播放问题
 
-- 新增：轮播图获取支持近图片过滤方法
+- 新增：轮播图获取支持仅图片过滤方法
 - 优化：视频 `Banner` 概率不播放问题
+- 优化：轮播类型添加修改是否为空判断
 
 ---
 

module/Banner/config.json

@@ -11,7 +11,7 @@
     "require": [
         "Vendor:>=3.0.0"
     ],
-    "modstartVersion": ">=2.6.0",
+    "modstartVersion": ">=3.9.0",
     "title": "通用轮播",
     "version": "1.8.0",
     "author": "官方",
@@ -24,4 +24,4 @@
             ]
         ]
     }
-}
+}

module/Cms/Admin/Controller/ContentController.php

@@ -358,7 +358,7 @@ function (Form $form) use ($catOptions) {
                     'catId', 'title', 'alias', 'title', 'summary', 'cover', 'postTime',
                     'status', 'isRecommend', 'isTop', 'tags', 'author', 'source',
                     'seoTitle', 'seoDescription', 'seoKeywords',
-                    'detailTemplate',
+                    'detailTemplate', 'verifyStatus',
                 ]);
                 if (modstart_config('CmsUrlMix_Enable', false)) {
                     $recordValue['fullUrl'] = (empty($data['fullUrl']) ? null : $data['fullUrl']);

module/Cms/Docs/release.md

@@ -1,6 +1,7 @@
 ## 3.8.0
 
 - 新增：CMS表单提交支持验证码配置，拦截恶意信息提交
+- 修复：审核状态编辑异常问题修复
 
 ---
 

module/Member/Api/Controller/AuthController.php

@@ -840,7 +840,7 @@ public function loginPhone()
         Session::forget('loginPhone');
         Session::put('memberUserId', $memberUser['id']);
         MemberUtil::fireLogin($memberUser['id']);
-        EventUtil::fire(new MemberUserLoginedEvent($memberUser));
+        EventUtil::fire(new MemberUserLoginedEvent($memberUser['id']));
         return Response::generate(0, null);
     }
 

module/Member/Api/Controller/MemberVipController.php

@@ -9,9 +9,12 @@
 use ModStart\Core\Exception\BizException;
 use ModStart\Core\Input\InputPackage;
 use ModStart\Core\Input\Response;
+use ModStart\Core\Util\SerializeUtil;
 use Module\Member\Auth\MemberUser;
 use Module\Member\Auth\MemberVip;
 use Module\Member\Core\MemberVipPayCenterBiz;
+use Module\Member\Core\MemberVipVoucherBiz;
+use Module\Member\Model\MemberVipOrder;
 use Module\Member\Support\MemberLoginCheck;
 use Module\Member\Util\MemberVipUtil;
 use Module\PayCenter\Support\PayCenterPerform;
@@ -50,23 +53,45 @@ public function buy()
         if (empty($memberVip)) {
             return Response::generateError('请选择会员类型');
         }
-        $priceInfoRet = $this->calc($vipId);
+        $priceInfoRet = $this->processCalc();
         if ($priceInfoRet['code']) {
             return Response::generateError($priceInfoRet['msg']);
         }
         $money = $priceInfoRet['data']['price'];
         if ($money < 0.01) {
             return Response::generateError('支付金额为空0.01');
         }
-        $memberVipOrder = ModelUtil::insert('member_vip_order', [
-            'status' => OrderStatus::WAIT_PAY,
-            'memberUserId' => MemberUser::id(),
-            'vipId' => $memberVip['id'],
-            'payFee' => $money,
-            'expire' => $priceInfoRet['data']['expire'],
-            'type' => $priceInfoRet['data']['type'],
-        ]);
-        BizException::throwsIf('请安装 PayCenter 模块', !modstart_module_enabled('PayCenter'));
+        try {
+            ModelUtil::transactionBegin();
+            $orderParam = [];
+            if (!empty($priceInfoRet['data']['usedVoucherItems'])) {
+                $orderParam['voucherItemIds'] = array_column($priceInfoRet['data']['usedVoucherItems'], 'id');
+            }
+            $memberVipOrder = ModelUtil::insert(MemberVipOrder::class, [
+                'status' => OrderStatus::WAIT_PAY,
+                'memberUserId' => MemberUser::id(),
+                'vipId' => $memberVip['id'],
+                'payFee' => $money,
+                'expire' => $priceInfoRet['data']['expire'],
+                'type' => $priceInfoRet['data']['type'],
+                'param' => SerializeUtil::jsonEncode($orderParam),
+            ]);
+            if (!empty($priceInfoRet['data']['usedVoucherItems'])) {
+                MemberVipVoucherBiz::bizer()->processUpdateUsedItemsInTransactionOrFail(
+                    MemberUser::id(),
+                    $priceInfoRet['data']['usedVoucherItems'],
+                    'MemberVipOrder',
+                    $memberVipOrder['id']
+                );
+            }
+            ModelUtil::transactionCommit();
+        } catch (BizException $e) {
+            ModelUtil::transactionRollback();
+            return Response::generateError($e->getMessage());
+        } catch (\Exception $e) {
+            ModelUtil::transactionRollback();
+            throw $e;
+        }
         $payCenterPerform = app(PayCenterPerform::class);
         return $payCenterPerform->performSubmitOrder(
             MemberVipPayCenterBiz::NAME,
@@ -76,7 +101,14 @@ public function buy()
         );
     }
 
-    public function calc($vipId = 0)
+    public function calc()
+    {
+        $ret = $this->processCalc();
+        unset($ret['data']['usedVoucherItems']);
+        return $ret;
+    }
+
+    private static function processCalc()
     {
         $input = InputPackage::buildFromInput();
         if (MemberUser::isNotLogin()) {
@@ -97,6 +129,20 @@ public function calc($vipId = 0)
         if ($ret['code']) {
             return Response::generateError($ret['msg']);
         }
-        return Response::generateSuccessData($ret['data']);
+        $data = $ret['data'];
+        if (modstart_module_enabled('Voucher')) {
+            $voucherId = $input->getInteger('voucherId');
+            if ($voucherId > 0) {
+                $bizer = MemberVipVoucherBiz::bizer();
+                $voucherItems = MemberVipVoucherBiz::listValidForMemberWithItemIds(MemberUser::id(), [$voucherId]);
+                $voucherItems = $bizer->processFindUsableItems(MemberUser::id(), $voucherItems);
+                $processResult = $bizer->processComputeItems(MemberUser::id(), $voucherItems, [
+                    'price' => $data['price'],
+                ]);
+                $data['price'] = $processResult['price'];
+                $data['usedVoucherItems'] = $processResult['usedVoucherItems'];
+            }
+        }
+        return Response::generateSuccessData($data);
     }
 }