Merge branch 'koogua/v1.5.1' into demo

CHANGELOG.md

@@ -8,6 +8,7 @@
 - 修正第三方登录解除绑定失败问题
 - 使用ServiceTrait归纳获取服务代码
 - 优化anonymous隐藏部分字符函数
+- 调整积分兑换相关定义命名
 - 去除js_vars中关于IM客服的配置
 - 增加验证码开关
 

app/Console/Tasks/PointGiftDeliverTask.php

@@ -19,7 +19,7 @@ use App\Repos\ImGroupUser as ImGroupUserRepo;
 use App\Repos\PointGift as PointGiftRepo;
 use App\Repos\PointGiftRedeem as PointGiftRedeemRepo;
 use App\Services\Logic\Notice\DingTalk\PointGiftRedeem as PointGiftRedeemNotice;
-use App\Services\Logic\Point\History\PointRefund as PointRefundPointHistory;
+use App\Services\Logic\Point\History\PointGiftRefund as PointGiftRefundPointHistory;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
 
@@ -44,12 +44,6 @@ class PointGiftDeliverTask extends Task
 
             $redeem = $redeemRepo->findById($task->item_id);
 
-            if (!$redeem) {
-                $task->status = TaskModel::STATUS_FAILED;
-                $task->update();
-                break;
-            }
-
             try {
 
                 $this->db->begin();
@@ -177,7 +171,7 @@ class PointGiftDeliverTask extends Task
 
     protected function handlePointRefund(PointGiftRedeemModel $redeem)
     {
-        $service = new PointRefundPointHistory();
+        $service = new PointGiftRefundPointHistory();
 
         $service->handle($redeem);
     }

app/Http/Admin/Views/setting/dingtalk_robot.volt

@@ -28,13 +28,13 @@
         <div class="layui-form-item">
             <label class="layui-form-label">技术手机号</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="ts_mobiles" placeholder="值班技术人员手机号，多个号码逗号分隔" value="{{ robot.ts_mobiles }}" lay-verify="required">
+                <input class="layui-input" type="text" name="ts_mobiles" placeholder="值班技术人员手机号，多个号码逗号分隔" value="{{ robot.ts_mobiles }}">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">客服手机号</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="cs_mobiles" placeholder="值班客服人员手机号，多个号码逗号分隔" value="{{ robot.ts_mobiles }}" lay-verify="required">
+                <input class="layui-input" type="text" name="cs_mobiles" placeholder="值班客服人员手机号，多个号码逗号分隔" value="{{ robot.cs_mobiles }}">
             </div>
         </div>
         <div class="layui-form-item" style="margin-top:20px;">

app/Http/Admin/Views/setting/im_cs.volt

@@ -1,35 +0,0 @@
-<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.im'}) }}">
-    <div class="layui-form-item">
-        <label class="layui-form-label">开启服务</label>
-        <div class="layui-input-block">
-            <input type="radio" name="enabled" value="1" title="是" {% if cs.enabled == 1 %}checked="checked"{% endif %}>
-            <input type="radio" name="enabled" value="0" title="否" {% if cs.enabled == 0 %}checked="checked"{% endif %}>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">客服1用户编号</label>
-        <div class="layui-input-block">
-            <input class="layui-input" type="text" name="user1_id" value="{{ cs.user1_id }}" lay-verify="required">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">客服2用户编号</label>
-        <div class="layui-input-block">
-            <input class="layui-input" type="text" name="user2_id" value="{{ cs.user2_id }}">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">客服3用户编号</label>
-        <div class="layui-input-block">
-            <input class="layui-input" type="text" name="user3_id" value="{{ cs.user3_id }}">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label"></label>
-        <div class="layui-input-block">
-            <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
-            <button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
-            <input type="hidden" name="section" value="im.cs">
-        </div>
-    </div>
-</form>

app/Http/Admin/Views/setting/im_main.volt

@@ -9,13 +9,13 @@
     <div class="layui-form-item">
         <label class="layui-form-label">应用名称</label>
         <div class="layui-input-block">
-            <input class="layui-input" type="text" name="title" value="{{ main.title }}">
+            <input class="layui-input" type="text" name="title" value="{{ main.title }}" lay-verify="required">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">消息最大长度</label>
         <div class="layui-input-block">
-            <input class="layui-input" type="text" name="msg_max_length" value="{{ main.msg_max_length }}">
+            <input class="layui-input" type="text" name="msg_max_length" value="{{ main.msg_max_length }}" lay-verify="number">
         </div>
     </div>
     <div class="layui-form-item">

app/Http/Admin/Views/setting/mail.volt

@@ -9,25 +9,25 @@
         <div class="layui-form-item">
             <label class="layui-form-label">发送邮箱</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="smtp_from_email" value="{{ mail.smtp_from_email }}">
+                <input class="layui-input" type="text" name="smtp_from_email" value="{{ mail.smtp_from_email }}" lay-verify="email">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">发送人</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="smtp_from_name" value="{{ mail.smtp_from_name }}">
+                <input class="layui-input" type="text" name="smtp_from_name" value="{{ mail.smtp_from_name }}" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">SMTP服务器</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="smtp_host" value="{{ mail.smtp_host }}">
+                <input class="layui-input" type="text" name="smtp_host" value="{{ mail.smtp_host }}" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">SMTP端口号</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="smtp_port" value="{{ mail.smtp_port }}">
+                <input class="layui-input" type="text" name="smtp_port" value="{{ mail.smtp_port }}" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
@@ -49,13 +49,13 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">SMTP帐号</label>
                 <div class="layui-input-block">
-                    <input class="layui-input" type="text" name="smtp_username" value="{{ mail.smtp_username }}">
+                    <input class="layui-input" type="text" name="smtp_username" value="{{ mail.smtp_username }}" lay-verify="required">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">SMTP密码</label>
                 <div class="layui-input-block">
-                    <input class="layui-input" type="text" name="smtp_password" value="{{ mail.smtp_password }}">
+                    <input class="layui-input" type="text" name="smtp_password" value="{{ mail.smtp_password }}" lay-verify="required">
                 </div>
             </div>
         </div>

app/Http/Admin/Views/setting/vod.volt

@@ -96,13 +96,13 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">防盗链Key</label>
                 <div class="layui-input-block">
-                    <input class="layui-input" type="text" name="key_anti_key" value="{{ vod.key_anti_key }}" lay-verify="required">
+                    <input class="layui-input" type="text" name="key_anti_key" value="{{ vod.key_anti_key }}">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">有效时间（秒）</label>
                 <div class="layui-input-block">
-                    <input class="layui-input" type="text" name="key_anti_expiry" value="{{ vod.key_anti_expiry }}" lay-verify="required">
+                    <input class="layui-input" type="text" name="key_anti_expiry" value="{{ vod.key_anti_expiry }}">
                 </div>
             </div>
         </div>

app/Models/PointHistory.php

@@ -14,8 +14,8 @@ class PointHistory extends Model
      * 事件类型
      */
     const EVENT_ORDER_CONSUME = 1; // 订单消费
-    const EVENT_POINT_REDEEM = 2; // 积分兑换
-    const EVENT_POINT_REFUND = 3; // 积分退款
+    const EVENT_POINT_GIFT_REDEEM = 2; // 积分礼品兑换
+    const EVENT_POINT_GIFT_REFUND = 3; // 积分礼品退款
     const EVENT_ACCOUNT_REGISTER = 4; // 帐号注册
     const EVENT_SITE_VISIT = 5; // 站点访问
     const EVENT_CHAPTER_STUDY = 6; // 课时学习
@@ -126,8 +126,8 @@ class PointHistory extends Model
     {
         return [
             self::EVENT_ORDER_CONSUME => '订单消费',
-            self::EVENT_POINT_REDEEM => '积分兑换',
-            self::EVENT_POINT_REFUND => '积分退款',
+            self::EVENT_POINT_GIFT_REDEEM => '积分礼品兑换',
+            self::EVENT_POINT_GIFT_REFUND => '积分礼品退款',
             self::EVENT_ACCOUNT_REGISTER => '用户注册',
             self::EVENT_SITE_VISIT => '用户登录',
             self::EVENT_CHAPTER_STUDY => '课时学习',

app/Services/Logic/Point/History/PointGiftRedeem.php

@@ -25,7 +25,7 @@ class PointGiftRedeem extends PointHistory
         if ($pointEnabled == 0) return;
 
         $eventId = $redeem->id;
-        $eventType = PointHistoryModel::EVENT_POINT_REDEEM;
+        $eventType = PointHistoryModel::EVENT_POINT_GIFT_REDEEM;
         $eventPoint = 0 - $redeem->gift_point;
 
         $historyRepo = new PointHistoryRepo();

app/Services/Logic/Point/History/PointGiftRefund.php

@@ -13,13 +13,13 @@ use App\Repos\PointHistory as PointHistoryRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Logic\Point\PointHistory;
 
-class PointRefund extends PointHistory
+class PointGiftRefund extends PointHistory
 {
 
     public function handle(PointGiftRedeemModel $redeem)
     {
         $eventId = $redeem->id;
-        $eventType = PointHistoryModel::EVENT_POINT_REFUND;
+        $eventType = PointHistoryModel::EVENT_POINT_GIFT_REFUND;
         $eventPoint = $redeem->gift_point;
 
         $historyRepo = new PointHistoryRepo();

db/migrations/20210403184518.php

@@ -821,7 +821,7 @@ final class V20210403184518 extends AbstractMigration
             [
                 'section' => 'vod',
                 'item_key' => 'key_anti_ip_limit',
-                'item_value' => '',
+                'item_value' => '3',
             ],
             [
                 'section' => 'dingtalk.robot',