【程序目录】更新v4.7.0

README.md

@@ -75,18 +75,13 @@ Redis
 
 > 温馨提示：虚拟空间不支持，推荐使用bt宝塔面板，服务器推荐阿里云ecs或腾讯云cvm 云服务器：<a href="https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=dligum2z" target="_blank">  查看 </a>
 
+### 官方论坛
 
-###  系统演示
-
-![输入图片说明](readme/pic/20公众号.jpg)
 
-管理后台： http://v4.crmeb.net/admin 账号：demo 密码：crmeb.com
+[![输入图片说明](readme/pic/gflt.jpg)](https://www.crmeb.com/ask/thread/list/147)
 
-H5端：http://v4.crmeb.net/（移动端打开）
+产品BUG、优化建议，欢迎社区反馈：https://www.crmeb.com/ask/thread/list?id=147
 
-PC端：http://v4.crmeb.net/（电脑端打开）
-
-APP下载：http://app.crmeb.cn/bzv （苹果手机直接在APP Store里搜索CRMEB下载）
 
 ---
 
@@ -97,11 +92,19 @@ APP下载：http://app.crmeb.cn/bzv （苹果手机直接在APP Store里搜索CR
 
 ---
 
-### 官方论坛
 
 
-产品BUG、优化建议，欢迎社区反馈：https://www.crmeb.com/ask/thread/list?id=147
+###  系统演示
+
+![输入图片说明](readme/pic/20公众号.jpg)
+
+管理后台： http://v4.crmeb.net/admin 账号：demo 密码：crmeb.com
 
+H5端：http://v4.crmeb.net/（移动端打开）
+
+PC端：http://v4.crmeb.net/（电脑端打开）
+
+APP下载：http://app.crmeb.cn/bzv （苹果手机直接在APP Store里搜索CRMEB下载）
 
 ### 页面展示
 (页面仅展示部分UI)

crmeb/app/adminapi/controller/Common.php

@@ -346,6 +346,7 @@ public function menusList()
             $pid = $item->getData('pid');
             $data[$key] = json_decode($item, true);
             $data[$key]['pid'] = $pid;
+            $data[$key]['menu_path'] = '/' . config('app.admin_prefix', 'admin') . $item['menu_path'];
             if (in_array($item->id, $counts)) {
                 $data[$key]['type'] = 1;
             } else {

crmeb/app/adminapi/controller/v1/export/ExportExcel.php

@@ -95,6 +95,7 @@ public function orderList()
             ['pay_type', ''],
             ['order', ''],
             ['field_key', ''],
+            ['ids', []],
         ]);
         $where['is_system_del'] = 0;
         $where['pid'] = 0;
@@ -110,7 +111,8 @@ public function productList()
         $where = $this->request->getMore([
             ['store_name', ''],
             ['cate_id', ''],
-            ['type', 1]
+            ['type', 1],
+            ['ids', []]
         ]);
         return app('json')->success($this->service->exportProductList($where));
     }
@@ -206,6 +208,7 @@ public function userCommission(UserBillServices $services)
             ['price_max', ''],
             ['price_min', ''],
             ['excel', '1'],
+            ['time', ''],
         ]);
         $data = $services->getCommissionList($where, false);
         return app('json')->success($this->service->userCommission($data['list'] ?? []));

crmeb/app/adminapi/controller/v1/kefu/StoreService.php

@@ -62,6 +62,7 @@ public function create(UserWechatuserServices $services)
             ['data', '', '', 'time'],
             ['type', '', '', 'user_type'],
         ]);
+        $where['is_del'] = 0;
         [$list, $count] = $services->getWhereUserList($where, 'u.nickname,u.uid,u.avatar as headimgurl,w.subscribe,w.province,w.country,w.city,w.sex,u.user_type,u.is_del');
         return app('json')->success(compact('list', 'count'));
     }

crmeb/app/adminapi/controller/v1/marketing/StoreSeckill.php

@@ -106,10 +106,7 @@ public function delete($id)
         $storeProductAttrValueServices = app()->make(StoreProductAttrValueServices::class);
         $unique = $storeProductAttrValueServices->value(['product_id' => $id, 'type' => 1], 'unique');
         if ($unique) {
-            $name = 'seckill_' . $unique . '_1';
-            /** @var CacheService $cache */
-            $cache = app()->make(CacheService::class);
-            $cache->del($name);
+            CacheService::delete('seckill_' . $unique . '_1');
         }
         return app('json')->success(100002);
     }

crmeb/app/adminapi/controller/v1/marketing/live/LiveRoom.php

@@ -78,6 +78,9 @@ public function add()
             ['replay_status', 1],
             ['sort', 0]
         ]);
+        if (mb_strlen($data['name']) < 6 || mb_strlen($data['name']) > 17) {
+            return app('json')->fail(500030);
+        }
         $this->validate($data, \app\adminapi\validate\marketing\LiveRoomValidate::class, 'save');
         $this->services->add($data);
         return app('json')->success(100000);

crmeb/app/adminapi/controller/v1/notification/sms/SmsConfig.php

@@ -103,14 +103,10 @@ public function is_login(ServeServices $services)
      */
     public function logout()
     {
-        $res = CacheService::delete('sms_account');
-        if ($res) {
-            $this->services->updateSmsConfig('', '');
-            CacheService::clear();
-            return app('json')->success(100042);
-        } else {
-            return app('json')->fail(100043);
-        }
+        CacheService::delete('sms_account');
+        $this->services->updateSmsConfig('', '');
+        CacheService::clear();
+        return app('json')->success(100042);
     }
 
     /**

crmeb/app/adminapi/controller/v1/order/RefundOrder.php

@@ -57,7 +57,13 @@ public function getRefundList()
     /**
      * 订单详情
      * @param $uni
-     * @return mixed
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 吴汐
+     * @email [email protected]
+     * @date 2023/03/02
      */
     public function getRefundInfo($uni)
     {
@@ -163,12 +169,12 @@ public function refundPrice(Request $request, StoreOrderServices $services, $id)
                     return app('json')->fail(400147);
                 }
                 $refund_price = $data['refund_price'];
+            }
 
-                $data['refunded_price'] = bcadd($data['refund_price'], $orderRefund['refunded_price'], 2);
-                $bj = bccomp((string)$orderRefund['refund_price'], (string)$data['refunded_price'], 2);
-                if ($bj < 0) {
-                    return app('json')->fail(400148);
-                }
+            $data['refunded_price'] = bcadd($data['refund_price'], $orderRefund['refunded_price'], 2);
+            $bj = bccomp((string)$orderRefund['refund_price'], (string)$data['refunded_price'], 2);
+            if ($bj < 0) {
+                return app('json')->fail(400148);
             }
 
             unset($data['type']);
@@ -184,7 +190,7 @@ public function refundPrice(Request $request, StoreOrderServices $services, $id)
             $refund_data['open_id'] = $wechatUserServices->uidToOpenid((int)$order['uid'], 'routine') ?? '';
             $refund_data['refund_no'] = $orderRefund['order_id'];
             //修改订单退款状态
-            unset($data['refund_price']);
+            $data['refund_price'] = $data['refunded_price'];
             if ($this->services->agreeRefund($id, $refund_data)) {
                 $this->services->update($id, $data);
                 return app('json')->success(400149);

crmeb/app/adminapi/controller/v1/order/StoreOrder.php

@@ -591,7 +591,7 @@ public function update_un_refund(StoreOrderRefundServices $services, $id)
         }
         $services->storeProductOrderRefundNo((int)$id, $refund_reason);
         //提醒推送
-        event('notice.notice', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
+        event('NoticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
         return app('json')->success(100010);
     }
 

crmeb/app/adminapi/controller/v1/setting/SystemConfig.php

@@ -307,6 +307,9 @@ public function save_basics(Request $request)
                 return app('json')->fail(400763);
             }
         }
+        if (isset($post['uni_brokerage_price']) && preg_match('/\.[0-9]{2,}[1-9][0-9]*$/', (string)$post['uni_brokerage_price']) > 0) {
+            return app('json')->fail(500029);
+        }
 
         //支付接口类型选择，如果有订单就不能再进行切换
 //        if (isset($post['pay_wechat_type'])) {

crmeb/app/adminapi/controller/v1/system/SystemClearData.php

@@ -136,7 +136,7 @@ public function recycleProduct()
         //删除商品收藏记录
         /** @var StoreProductReplyServices $productRelation */
         $productRelation = app()->make(StoreProductReplyServices::class);
-        $productRelation->delete([['product_id', 'in', $ids], ['category', '=', 'product']]);
+        $productRelation->delete([['product_id', 'in', $ids], ['reply_type', '=', 'product']]);
 
         //删除商品的评论
         /** @var StoreProductReplyServices $productReply */

crmeb/app/adminapi/controller/v1/system/SystemCrontab.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace app\adminapi\controller\v1\system;
+
+use app\adminapi\controller\AuthController;
+use app\services\system\crontab\SystemCrontabServices;
+use think\facade\App;
+
+class SystemCrontab extends AuthController
+{
+    public function __construct(App $app, SystemCrontabServices $services)
+    {
+        parent::__construct($app);
+        $this->services = $services;
+    }
+
+    /**
+     * 获取定时任务列表
+     * @return mixed
+     */
+    public function getTimerList()
+    {
+        $where = ['is_del' => 0];
+        return app('json')->success($this->services->getTimerList($where));
+    }
+
+    /**
+     * 获取定时任务详情
+     * @param $id
+     * @return mixed
+     */
+    public function getTimerInfo($id)
+    {
+        return app('json')->success($this->services->getTimerInfo($id));
+    }
+
+    /**
+     * 获取定时任务类型
+     * @return mixed
+     */
+    public function getMarkList()
+    {
+        return app('json')->success($this->services->getMarkList());
+    }
+
+    /**
+     * 保存定时任务
+     * @return mixed
+     */
+    public function saveTimer()
+    {
+        $data = $this->request->postMore([
+            ['id', 0],
+            ['name', ''],
+            ['mark', ''],
+            ['content', ''],
+            ['type', 0],
+            ['is_open', 0],
+            ['week', 0],
+            ['day', 0],
+            ['hour', 0],
+            ['minute', 0],
+            ['second', 0],
+        ]);
+        $this->services->saveTimer($data);
+        return app('json')->success(100000);
+    }
+
+    /**
+     * 删除定时任务
+     * @param $id
+     * @return mixed
+     */
+    public function delTimer($id)
+    {
+        $this->services->delTimer($id);
+        return app('json')->success(100002);
+    }
+
+    /**
+     * 设置定时任务状态
+     * @param $id
+     * @param $is_open
+     * @return mixed
+     */
+    public function setTimerStatus($id, $is_open)
+    {
+        $this->services->setTimerStatus($id, $is_open);
+        return app('json')->success(100014);
+    }
+
+}