【程序目录】更新开源5.6.3

crmeb/.version

@@ -1,5 +1,5 @@
-version=CRMEB-KY v5.6.1
-version_code=561
+version=CRMEB-KY v5.6.3
+version_code=563
 platform=gitee
 app_id=ze7x9rxsv09l6pvsyo
 app_key=fuF7U9zaybLa5gageVQzxtxQMFnvU2OI

crmeb/README.md

@@ -4,12 +4,6 @@ CRMEB v5 后端程序目录
 > 运行环境要求PHP7.1-7.4。
 
 ## 安装
-## 宝塔Docker一键安装
-1.安装宝塔面板，前往 [宝塔面板](https://www.bt.cn/new/download.html?r=dk_crmeb) 官网，选择正式版的脚本下载安装
-
-2.安装后登录宝塔面板，在菜单栏中点击 Docker ，首次进入会提示安装 Docker 服务，点击立即安装，按提示完成安装
-
-3.安装完成后在应用商店中找到crmeb  ，点击安装，配置域名等基本信息即可完成安装
 
 ## 一键安装
 上传你的代码，站点入口目录设置/public

crmeb/app/adminapi/common.php

@@ -126,13 +126,21 @@ if (!function_exists('attr_format')) {
                     $result = [];
                     foreach ($temp as $item) {
                         foreach ($arr[$i + 1]['detail'] as $datum) {
-                            $result[] = trim($item) . ',' . trim($datum);
+                            if (is_array($item)) {
+                                $result[] = trim($item['value']) . ',' . trim($datum['value']);
+                            } else {
+                                $result[] = trim($item) . ',' . trim($datum);
+                            }
                         }
                     }
                 }
             } else {
                 foreach ($arr[0]['detail'] as $item) {
-                    $result[] = trim($item);
+                    if (is_array($item)) {
+                        $result[] = trim($item['value']);
+                    } else {
+                        $result[] = trim($item);
+                    }
                 }
             }
         }

crmeb/app/adminapi/controller/UpgradeController.php

@@ -734,8 +734,8 @@ class UpgradeController
      */
     public function upData()
     {
-        $data['new_version'] = 'CRMEB-BZ v5.6.1';
-        $data['new_code'] = 561;
+        $data['new_version'] = 'CRMEB-BZ v5.6.3';
+        $data['new_code'] = 563;
         $data['update_sql'] = [
             [
                 'code' => 560,
@@ -2354,6 +2354,61 @@ SQL
                 'type' => -1,
                 'table' => "system_config_tab",
                 'sql' => "UPDATE `@table` SET `title` = '自定义JS' WHERE `eng_title` = 'statistics_config';"
+            ],[
+                'code' => 562,
+                'type' => 6,
+                'table' => "system_config",
+                'whereTable' => "system_config_tab",
+                'findSql' => "select id from @table where `menu_name` = 'merchant_cert_path'",
+                'whereSql' => "SELECT id as tabId FROM `@whereTable` WHERE `eng_title`='ali_pay'",
+                'sql' => "INSERT INTO `@table` VALUES (null, 'merchant_cert_path', 'upload', 'input', @tabId, '', 3, '', 0, 0, '\"\"', '应用公钥证书', '支付宝接口加签完成之后下载的应用公钥证书', 0, 1, 1, 489, 1);"
+            ],[
+                'code' => 562,
+                'type' => 6,
+                'table' => "system_config",
+                'whereTable' => "system_config_tab",
+                'findSql' => "select id from @table where `menu_name` = 'alipay_cert_path'",
+                'whereSql' => "SELECT id as tabId FROM `@whereTable` WHERE `eng_title`='ali_pay'",
+                'sql' => "INSERT INTO `@table` VALUES (null, 'alipay_cert_path', 'upload', 'input', @tabId, '', 3, '', 0, 0, '\"\"', '支付宝公钥证书', '支付宝接口加签完成下载的支付宝公钥证书', 0, 1, 1, 489, 1);"
+            ],[
+                'code' => 562,
+                'type' => 6,
+                'table' => "system_config",
+                'whereTable' => "system_config_tab",
+                'findSql' => "select id from @table where `menu_name` = 'alipay_root_cert_path'",
+                'whereSql' => "SELECT id as tabId FROM `@whereTable` WHERE `eng_title`='ali_pay'",
+                'sql' => "INSERT INTO `@table` VALUES (null, 'alipay_root_cert_path', 'upload', 'input', @tabId, '', 3, '', 0, 0, '\"\"', '支付宝根证书', '支付宝接口加签完成下载的支付宝根证书', 0, 1, 1, 489, 1);"
+            ],[
+                'code' => 562,
+                'type' => 6,
+                'table' => "system_config",
+                'whereTable' => "system_config_tab",
+                'findSql' => "select id from @table where `menu_name` = 'alipay_sign_type'",
+                'whereSql' => "SELECT id as tabId FROM `@whereTable` WHERE `eng_title`='ali_pay'",
+                'sql' => "INSERT INTO `@table` VALUES (null, 'alipay_sign_type', 'radio', 'input', @tabId, '0=>密钥\n1=>证书', 1, '', 0, 0, '0', '接口加签类型', '接口加签类型：密钥或证书', 80, 1, 0, 0, 0);"
+            ],[
+                'code' => 562,
+                'type' => -1,
+                'table' => "system_config",
+                'sql' => "UPDATE `@table` SET `level` = 1, `link_id` = 489, `link_value` = 0 WHERE `menu_name` = 'alipay_public_key';"
+            ],[
+                'code' => 562,
+                'type' => -1,
+                'table' => "system_config",
+                'sql' => "UPDATE `@table` SET `sort` = 85 WHERE `menu_name` = 'alipay_merchant_private_key';"
+            ],[
+                'code' => 562,
+                'type' => -1,
+                'table' => "system_config",
+                'sql' => "UPDATE `@table` SET `sort` = 91 WHERE `menu_name` = 'ali_pay_appid';"
+            ],[
+                'code' => 562,
+                'type' => 6,
+                'table' => "system_config",
+                'whereTable' => "system_config_tab",
+                'findSql' => "select id from @table where `menu_name` = 'image_thumb_status'",
+                'whereSql' => "SELECT id as tabId FROM `@whereTable` WHERE `eng_title`='base_config'",
+                'sql' => "INSERT INTO `@table` VALUES (null, 'image_thumb_status', 'radio', 'input', @tabId, '1=>开启\n0=>关闭', 1, '', 0, 0, '0', '缩略图开关', '是否开启缩略图', 0, 1, 0, 0, 0);"
             ],
         ];
         return $data;

crmeb/app/adminapi/controller/v1/diy/DiyPro.php

@@ -73,7 +73,7 @@ class DiyPro extends AuthController
                             }
                             $tabValue['goodsList']['ids'] = array_column($tabValue['goodsList']['list'], 'id');
                         }
-                        unset($tabValue['goodsList']['list'], $item['productList']['list']);
+                        unset($tabValue['goodsList']['list'], $tabValue['productList']['list']);
                     }
                     $item['tabConfig']['list'] = $list;
                 }

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

@@ -249,4 +249,23 @@ class StoreCombination extends AuthController
         ]);
         return app('json')->success($this->services->combinationStatisticsOrder($id, $where));
     }
+
+    /**
+     * 立即成团
+     * @param $id
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author wuhaotian
+     * @email 442384644@qq.com
+     * @date 2025/6/18
+     */
+    public function immediatelyCombination($id)
+    {
+        /** @var StorePinkServices $storePinkServices */
+        $storePinkServices = app()->make(StorePinkServices::class);
+        $storePinkServices->virtualCombination($id, 'admin');
+        return app('json')->success('成团成功');
+    }
 }

crmeb/app/adminapi/controller/v1/product/StoreProduct.php

@@ -290,6 +290,31 @@ class StoreProduct extends AuthController
         return app('json')->success($res);
     }
 
+    /**
+     * 批量移动到回收站
+     * @return \think\Response
+     */
+    public function batchDelete()
+    {
+        [$ids] = $this->request->postMore([
+            ['ids', []],
+        ], true);
+        return app('json')->success($this->service->batchDelete($ids));
+    }
+
+    /**
+     * 批量从回收站恢复
+     * @return \think\Response
+     */
+    public function batchRecover()
+    {
+        [$ids] = $this->request->postMore([
+            ['ids', []],
+        ], true);
+        $this->service->batchRecover($ids);
+        return app('json')->success('恢复成功');
+    }
+
     /**
      * 生成规格列表
      * @param int $id
@@ -439,8 +464,11 @@ class StoreProduct extends AuthController
             ['give_integral', 0],
             ['coupon_ids', []],
             ['label_id', []],
+            ['label_list', []],
             ['recommend', []],
-            ['type', 0]
+            ['type', 0],
+            ['is_gift', 0],
+            ['gift_price', 0],
         ]);
         $this->service->batchSetting($data);
         return app('json')->success(100014);

crmeb/app/adminapi/controller/v1/product/StoreProductLabel.php

@@ -9,9 +9,8 @@ use think\facade\App;
 
 class StoreProductLabel extends AuthController
 {
-
-    private StoreProductLabelCateServices $labelCateServices;
-    private StoreProductLabelServices $labelServices;
+    protected $labelCateServices;
+    protected $labelServices;
 
     public function __construct(App $app, StoreProductLabelCateServices $labelCateServices, StoreProductLabelServices $labelServices)
     {

crmeb/app/adminapi/controller/v1/product/StoreProductReply.php

@@ -126,4 +126,21 @@ class StoreProductReply extends AuthController
         $this->services->update($id, ['status' => $status]);
         return app('json')->success($status == 1 ? '审核通过' : '拒绝成功');
     }
+
+    /**
+     * 批量商品评论审核
+     * @return \think\Response
+     * @author wuhaotian
+     * @email 442384644@qq.com
+     * @date 2025/6/18
+     */
+    public function batch_set_status()
+    {
+        list($ids, $status) = $this->request->postMore([
+            ['ids', []],
+            ['status', 0]
+        ], true);
+        $this->services->batchUpdate($ids, ['status' => $status]);
+        return app('json')->success($status == 1 ? '审核通过' : '拒绝成功');
+    }
 }

crmeb/app/adminapi/controller/v1/user/User.php

@@ -64,6 +64,7 @@ class User extends AuthController
             ['pay_count_num', []],
             ['pay_count_money', []],
             ['recharge_count', []],
+            ['agent_level', 0],
         ]);
         $where['label_id'] = toIntArray($where['label_id']);
         return app('json')->success($this->services->index($where));

crmeb/app/adminapi/route/marketing.php

@@ -89,6 +89,9 @@ Route::group('marketing', function () {
         Route::get('combination/statistics/list/:id', 'v1.marketing.StoreCombination/combinationStatisticsList')->option(['real_name' => '拼团统计列表']);
         //拼团订单
         Route::get('combination/statistics/order/:id', 'v1.marketing.StoreCombination/combinationStatisticsOrder')->option(['real_name' => '拼团统计订单']);
+        //立即成团
+        Route::get('combination/immediately/:id', 'v1.marketing.StoreCombination/immediatelyCombination')->option(['real_name' => '立即成团']);
+
     })->option(['parent' => 'marketing', 'cate_name' => '拼团活动']);
 
     /** 秒杀活动 */

crmeb/app/adminapi/route/product.php

@@ -79,6 +79,10 @@ Route::group('product', function () {
         Route::get('product/:id', 'v1.product.StoreProduct/get_product_info')->option(['real_name' => '商品详情']);
         //加入回收站
         Route::delete('product/:id', 'v1.product.StoreProduct/delete')->option(['real_name' => '商品放入回收站']);
+        //加入回收站
+        Route::post('product/batch_delete', 'v1.product.StoreProduct/batchDelete')->option(['real_name' => '商品批量放入回收站']);
+        //批量从回收站恢复
+        Route::post('product/batch_recover', 'v1.product.StoreProduct/batchRecover')->option(['real_name' => '批量从回收站恢复']);
         //保存新建或保存
         Route::post('product/:id', 'v1.product.StoreProduct/save')->option(['real_name' => '新建或修改商品']);
         //生成属性
@@ -113,6 +117,8 @@ Route::group('product', function () {
         Route::post('reply/save_fictitious_reply', 'v1.product.StoreProductReply/save_fictitious_reply')->option(['real_name' => '保存虚拟评论']);
         //审核商品评论
         Route::put('reply/set_status/:id/:status', 'v1.product.StoreProductReply/set_status')->option(['real_name' => '审核商品评论']);
+        //批量审核商品评论
+        Route::post('reply/batch_set_status', 'v1.product.StoreProductReply/batch_set_status')->option(['real_name' => '批量审核商品评论']);
     })->option(['parent' => 'product', 'cate_name' => '商品评论']);
 
     /** 商品采集 */

crmeb/app/api/controller/v1/PublicController.php

@@ -803,7 +803,7 @@ class PublicController
             $res = $pay->queryTransferBills($order_id);
             if (isset($res['fail_reason']) && $res['fail_reason'] != '') {
                 if ($type == 1) {
-                    $extractServices->refuse((int)$info['id'], '提现失败，原因：超时为领取');
+                    $extractServices->changeFail($info['id'], $info, '提现失败，原因：超时未领取');
                     $extractServices->update($info['id'], ['state' => 'FAIL']);
                 } else {
                     $lotteryRecordServices->update($info['id'], ['state' => 'FAIL']);

crmeb/app/common.php

@@ -936,6 +936,10 @@ if (!function_exists('get_thumb_water')) {
      */
     function get_thumb_water($list, string $type = 'small', array $field = ['image'], bool $is_remote_down = false)
     {
+        // 未开启缩略图功能 直接返回原数据
+        if (!sys_config('image_thumb_status', 0)) {
+            return $list;
+        }
         if (!$list || !$field) return $list;
         $baseType = $type;
         $data = $list;

crmeb/app/dao/activity/coupon/StoreCouponUserDao.php

@@ -216,4 +216,37 @@ class StoreCouponUserDao extends BaseDao
     {
         return $this->getModel()->where($where)->delete();
     }
+
+    /**
+     * 判断用户是否还能领取或者已经领取未使用
+     * @param $uid
+     * @param $coupon_id
+     * @param $receive_limit
+     * @return bool
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author wuhaotian
+     * @email 442384644@qq.com
+     * @date 2025/7/15
+     */
+    public function getUserCouponCanUse($uid, $coupon_id, $receive_limit)
+    {
+        $list = $this->getModel()->where(['uid' => $uid, 'cid' => $coupon_id])->select()->toArray();
+        $count = count($list);
+        if ($count < $receive_limit) {
+            return true;
+        }
+        $noUserCount = 0;
+        foreach ($list as $item) {
+            if ($item['status'] == '未使用') {
+                $noUserCount++;
+            }
+        }
+        if ($noUserCount > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

crmeb/app/dao/order/StoreOrderRefundDao.php

@@ -40,7 +40,7 @@ class StoreOrderRefundDao extends BaseDao
             }
         })->when(isset($where['order_id']) && $where['order_id'] != '', function ($query) use ($where) {
             $query->where(function ($q) use ($where) {
-                $q->whereLike('order_id', '%' . $where['order_id'] . '%')->whereOr('store_order_id', 'IN', function ($orderModel) use ($where) {
+                $q->where('order_id|refund_express', 'like', '%' . $where['order_id'] . '%')->whereOr('store_order_id', 'IN', function ($orderModel) use ($where) {
                     $orderModel->name('store_order')->field('id')->whereLike('order_id', '%' . $where['order_id'] . '%');
                 });
             });
@@ -194,6 +194,6 @@ class StoreOrderRefundDao extends BaseDao
 
     public function orderIsRefund($store_order_id)
     {
-        return boolval($this->getModel()->where('store_order_id', $store_order_id)->whereIn('refund_type', [1, 2, 4, 5])->count());
+        return boolval($this->getModel()->where('store_order_id', $store_order_id)->whereIn('refund_type', [1, 2, 4, 5])->where('is_cancel', 0)->count());
     }
 }

crmeb/app/dao/product/product/StoreProductDao.php

@@ -122,7 +122,7 @@ class StoreProductDao extends BaseDao
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getSearchList(array $where, int $page = 0, int $limit = 0, array $field = ['*'], array $with = ['attrs', 'couponId', 'description'])
+    public function getSearchList(array $where, int $page = 0, int $limit = 0, array $field = ['*'], array $with = [])
     {
         if (isset($where['star'])) $with[] = 'star';
         return $this->search($where, false)->with($with)->when($page != 0 && $limit != 0, function ($query) use ($page, $limit) {

crmeb/app/dao/user/UserWechatUserDao.php

@@ -279,6 +279,11 @@ class UserWechatUserDao extends BaseDao
         if (isset($where['ids']) && count($where['ids'])) {
             $model->whereIn($userAlias . 'uid', $where['ids']);
         }
+
+        if (isset($where['agent_level']) && $where['agent_level'] != '') {
+            $model->where($userAlias . 'agent_level', $where['agent_level']);
+        }
+
         return $field ? $model->field($field) : $model;
     }
 

crmeb/app/listener/user/RegisterListener.php

@@ -51,7 +51,7 @@ class RegisterListener implements ListenerInterface
             //自定义消息-下级用户绑定成功
             if ($res) {
                 $phone = app()->make(UserServices::class)->value($uid, 'phone');
-                event('CustomNoticeListener', [$uid, ['nickname' => $name, 'time' => date('Y-m-d H:i:s'), 'phone' => $phone], 'spread_success']);
+                event('CustomNoticeListener', [$spreadUid, ['nickname' => $name, 'time' => date('Y-m-d H:i:s'), 'phone' => $phone], 'spread_success']);
             }
         }
 

crmeb/app/services/activity/combination/StorePinkServices.php

@@ -800,7 +800,7 @@ class StorePinkServices extends BaseServices
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function virtualCombination($pinkId)
+    public function virtualCombination($pinkId, $operator = 'auto')
     {
         $pinkInfo = $this->dao->get($pinkId);
         $people = $pinkInfo['people'];
@@ -809,7 +809,7 @@ class StorePinkServices extends BaseServices
         /** @var StoreCombinationServices $services */
         $services = app()->make(StoreCombinationServices::class);
         $percent2 = $services->value(['id' => $pinkInfo['cid']], 'virtual');
-        if ($percent1 >= $percent2) {
+        if ($percent1 >= $percent2 || $operator == 'admin') {
             $time = time();
             $num = $people - $count;
             $data = [];

crmeb/app/services/activity/seckill/StoreSeckillServices.php

@@ -805,23 +805,25 @@ class StoreSeckillServices extends BaseServices
         $data['time_ids'] = implode(',', $data['time_ids']);
 
         return $this->transaction(function () use ($id, $data, $timeIds) {
+
+            $productInfos = $data['product_infos'];
+            $productIds = array_column($productInfos, 'id');
+            /** @var StoreProductServices $productServices */
+            $productServices = app()->make(StoreProductServices::class);
+            $productList = $productServices->searchList(['id' => $productIds, 'is_del' => 0]);
+            $productList = $productList['list'] ?? [];
+            $productInfos = array_combine($productIds, $productInfos);
+
             /** @var StoreActivityServices $StoreActivityServices */
             $StoreActivityServices = app()->make(StoreActivityServices::class);
             if ($id) {
                 $StoreActivityServices->update($id, $data);
-//                $this->clearActivitySeckill($id);
+                $this->clearActivitySeckill($id, $productIds);
             } else {
                 $data['add_time'] = time();
                 $res = $StoreActivityServices->save($data);
                 $id = (int)$res->id;
             }
-            $productInfos = $data['product_infos'];
-            $productIds = array_column($productInfos, 'id');
-            /** @var StoreProductServices $productServices */
-            $productServices = app()->make(StoreProductServices::class);
-            $productList = $productServices->searchList(['id' => $productIds, 'is_del' => 0]);
-            $productList = $productList['list'] ?? [];
-            $productInfos = array_combine($productIds, $productInfos);
             foreach ($productList as &$product) {
                 $attrInfo = $productServices->getProductRules((int)$product['id']);
                 $seckillData = [];
@@ -892,11 +894,16 @@ class StoreSeckillServices extends BaseServices
         });
     }
 
-    public function clearActivitySeckill($id)
+    public function clearActivitySeckill($id, $productIds = [])
     {
         $seckill = $this->dao->getList(['activity_id' => $id, 'is_del' => 0]);
-        if ($seckill) {
-            $seckillIds = array_column($seckill, 'id');
+        $seckillIds = [];
+        foreach ($seckill as $item) {
+            if (!in_array($item['product_id'], $productIds)) {
+                $seckillIds[] = $item['id'];
+            }
+        }
+        if (count($seckillIds)) {
             /** @var StoreProductAttrResultServices $storeProductAttrResultServices */
             $storeProductAttrResultServices = app()->make(StoreProductAttrResultServices::class);
             /** @var StoreDescriptionServices $storeDescriptionServices */

crmeb/app/services/agent/AgentLevelServices.php

@@ -396,4 +396,16 @@ class AgentLevelServices extends BaseServices
         // 返回true表示设置成功
         return true;
     }
+
+    /**
+     * 获取分销等级数组
+     * @return array
+     * @author wuhaotian
+     * @email 442384644@qq.com
+     * @date 2025/6/16
+     */
+    public function getAgentLevelArr()
+    {
+        return $this->dao->getColumn(['status'=>1,'is_del'=>0], 'name', 'grade');
+    }
 }

crmeb/app/services/agent/DivisionServices.php

@@ -526,6 +526,7 @@ class DivisionServices extends BaseServices
                 }
                 if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                     $divisionPercent = bcsub($divisionInfo['division_percent'], $agentPercent, 2);
+                    $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                 } else {
                     $divisionPercent = 0;
                 }
@@ -542,11 +543,13 @@ class DivisionServices extends BaseServices
                 }
                 if ($agentInfo['division_status'] == 1 && $agentInfo['division_end_time'] > time()) {
                     $agentPercent = bcsub($agentInfo['division_percent'], $staffPercent, 2);
+                    $agentPercent = $agentPercent < 0 ? 0 : $agentPercent;
                 } else {
                     $agentPercent = 0;
                 }
                 if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                     $divisionPercent = bcsub($divisionInfo['division_percent'], bcadd($staffPercent, $agentPercent, 2), 2);
+                    $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                 } else {
                     $divisionPercent = 0;
                 }
@@ -563,16 +566,19 @@ class DivisionServices extends BaseServices
                         $storeBrokerageTwo = 0;
                         if ($staffInfo['division_status'] == 1 && $staffInfo['division_end_time'] > time()) {
                             $staffPercent = bcsub($staffInfo['division_percent'], $storeBrokerageOne, 2);
+                            $staffPercent = $staffPercent < 0 ? 0 : $staffPercent;
                         } else {
                             $staffPercent = 0;
                         }
                         if ($agentInfo['division_status'] == 1 && $agentInfo['division_end_time'] > time()) {
                             $agentPercent = bcsub($agentInfo['division_percent'], bcadd($storeBrokerageOne, $staffPercent, 2), 2);
+                            $agentPercent = $agentPercent < 0 ? 0 : $agentPercent;
                         } else {
                             $agentPercent = 0;
                         }
                         if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                             $divisionPercent = bcsub($divisionInfo['division_percent'], bcadd(bcadd($storeBrokerageOne, $staffPercent, 2), $agentPercent, 2), 2);
+                            $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                         } else {
                             $divisionPercent = 0;
                         }
@@ -582,16 +588,19 @@ class DivisionServices extends BaseServices
                         $brokerageOneTwo = bcadd($storeBrokerageOne, $storeBrokerageTwo, 2);
                         if ($staffInfo['division_status'] == 1 && $staffInfo['division_end_time'] > time()) {
                             $staffPercent = bcsub($staffInfo['division_percent'], $brokerageOneTwo, 2);
+                            $staffPercent = $staffPercent < 0 ? 0 : $staffPercent;
                         } else {
                             $staffPercent = 0;
                         }
                         if ($agentInfo['division_status'] == 1 && $agentInfo['division_end_time'] > time()) {
                             $agentPercent = bcsub($agentInfo['division_percent'], bcadd($brokerageOneTwo, $staffPercent, 2), 2);
+                            $agentPercent = $agentPercent < 0 ? 0 : $agentPercent;
                         } else {
                             $agentPercent = 0;
                         }
                         if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                             $divisionPercent = bcsub($divisionInfo['division_percent'], bcadd(bcadd($brokerageOneTwo, $staffPercent, 2), $agentPercent, 2), 2);
+                            $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                         } else {
                             $divisionPercent = 0;
                         }
@@ -604,11 +613,13 @@ class DivisionServices extends BaseServices
                         $staffPercent = 0;
                         if ($agentInfo['division_status'] == 1 && $agentInfo['division_end_time'] > time()) {
                             $agentPercent = bcsub($agentInfo['division_percent'], $storeBrokerageOne, 2);
+                            $agentPercent = $agentPercent < 0 ? 0 : $agentPercent;
                         } else {
                             $agentPercent = 0;
                         }
                         if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                             $divisionPercent = bcsub($divisionInfo['division_percent'], bcadd($storeBrokerageOne, $agentPercent, 2), 2);
+                            $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                         } else {
                             $divisionPercent = 0;
                         }
@@ -619,11 +630,13 @@ class DivisionServices extends BaseServices
                         $staffPercent = 0;
                         if ($agentInfo['division_status'] == 1 && $agentInfo['division_end_time'] > time()) {
                             $agentPercent = bcsub($agentInfo['division_percent'], $brokerageOneTwo, 2);
+                            $agentPercent = $agentPercent < 0 ? 0 : $agentPercent;
                         } else {
                             $agentPercent = 0;
                         }
                         if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                             $divisionPercent = bcsub($divisionInfo['division_percent'], bcadd($brokerageOneTwo, $agentPercent, 2), 2);
+                            $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                         } else {
                             $divisionPercent = 0;
                         }
@@ -638,6 +651,7 @@ class DivisionServices extends BaseServices
                         $agentPercent = 0;
                         if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                             $divisionPercent = bcsub($divisionInfo['division_percent'], $storeBrokerageOne, 2);
+                            $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                         } else {
                             $divisionPercent = 0;
                         }
@@ -649,6 +663,7 @@ class DivisionServices extends BaseServices
                         $agentPercent = 0;
                         if ($divisionInfo['division_status'] == 1 && $divisionInfo['division_end_time'] > time()) {
                             $divisionPercent = bcsub($divisionInfo['division_percent'], $brokerageOneTwo, 2);
+                            $divisionPercent = $divisionPercent < 0 ? 0 : $divisionPercent;
                         } else {
                             $divisionPercent = 0;
                         }

crmeb/app/services/diy/DiyProServices.php

@@ -122,7 +122,7 @@ class DiyProServices extends BaseServices
                                         }
                                         $where['is_show'] = 1;
                                         $where['is_del'] = 0;
-                                        $tabValue['productList']['list'] = $productServices->getSearchList($where, 0, $num, ['id,store_name,cate_id,image,IFNULL(sales, 0) + IFNULL(ficti, 0) as sales,price,stock,activity,ot_price,spec_type,recommend_image,unit_name,is_vip,vip_price']);
+                                        $tabValue['goodsList']['list'] = $productServices->getSearchList($where, 0, $num, ['id,store_name,cate_id,image,IFNULL(sales, 0) + IFNULL(ficti, 0) as sales,price,stock,activity,ot_price,spec_type,recommend_image,unit_name,is_vip,vip_price']);
                                     }
                                 }
                                 $item['tabConfig']['list'] = $list;

crmeb/app/services/order/StoreOrderCreateServices.php

@@ -431,7 +431,7 @@ class StoreOrderCreateServices extends BaseServices
         //设置用户默认地址
         if (!$addressServices->be(['is_default' => 1, 'uid' => $order['uid']])) {
             $addressServices->setDefaultAddress($group['addressId'], $order['uid']);
-            $province = $addressServices->value(['id' => $group['addressId']], 'province');
+            $province = $addressServices->value(['id' => $group['addressId']], 'province') ?? '';
             app()->make(WechatUserServices::class)->update(['uid' => $order['uid']], ['province' => $province]);
         }
         //删除购物车

crmeb/app/services/order/StoreOrderDeliveryServices.php

@@ -502,7 +502,7 @@ if ($type == 'order') {
             $data['delivery_id'] = uniqid();
         }
         // 小程序订单管理
-        event('OrderShippingListener', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_name']]);
+        event('OrderShippingListener', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_code']]);
         //到期自动收货
         event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
 

crmeb/app/services/order/StoreOrderServices.php

@@ -632,6 +632,13 @@ HTML;
             if ($item['clerk_id'] == 0 && !isset($item['clerk_name'])) {
                 $item['clerk_name'] = '总平台';
             }
+
+            if ($item['store_id']) {
+                $store = app()->make(SystemStoreServices::class);
+                $storeOne = $store->value(['id' => $item['store_id']], 'name');
+                if ($storeOne) $item['store_name'] = $storeOne;
+            }
+
             //根据核销员更改store_name
             if ($item['clerk_id'] && isset($item['staff_store_id']) && $item['staff_store_id']) {
                 /** @var SystemStoreServices $store */
@@ -2009,7 +2016,7 @@ HTML;
     {
         //订单商品全部评价完成
         $replyServices->count(['unique' => $uniqueList, 'oid' => $oid]);
-        if ($replyServices->count(['unique' => $uniqueList, 'oid' => $oid]) == count($uniqueList)) {
+        if ($replyServices->count(['unique' => $uniqueList, 'oid' => $oid]) >= count($uniqueList)) {
             $res = $this->dao->update(['id' => $oid, 'status' => 2], ['status' => 3]);
             if (!$res) throw new ApiException(100007);
             /** @var StoreOrderStatusServices $statusService */

crmeb/app/services/other/UploadService.php

@@ -100,7 +100,15 @@ class UploadService
             $config['cdn'] = $res['cdn'];
         }
 
-        $thumb = SystemConfigService::more(['thumb_big_height', 'thumb_big_width', 'thumb_mid_height', 'thumb_mid_width', 'thumb_small_height', 'thumb_small_width',]);
+        $thumb = SystemConfigService::more([
+            'image_thumb_status',
+            'thumb_big_height',
+            'thumb_big_width',
+            'thumb_mid_height',
+            'thumb_mid_width',
+            'thumb_small_height',
+            'thumb_small_width'
+        ]);
         $water = SystemConfigService::more([
             'image_watermark_status',
             'watermark_type',
@@ -113,7 +121,8 @@ class UploadService
             'watermark_text_color',
             'watermark_text_size',
             'watermark_x',
-            'watermark_y']);
+            'watermark_y'
+        ]);
         $config = array_merge($config, ['thumb' => $thumb], ['water' => $water]);
         return self::$upload['upload_' . $type] = new Upload($type, $config);
     }

crmeb/app/services/pay/PayTransferNotifyServices.php

@@ -62,6 +62,8 @@ class PayTransferNotifyServices
                     'phone' => $user['phone'],
                     'success_time' => date('Y-m-d H:i:s')
                 ]]);
+            } else {
+                $userExtractServices->changeFail($userExtractInfo['id'], $userExtractInfo, '提现失败，原因：超时未领取');
             }
         } catch (\Exception $e) {
             return false;

crmeb/app/services/product/product/StoreCategoryServices.php

@@ -353,4 +353,31 @@ class StoreCategoryServices extends BaseServices
             return $this->dao->getALlByIndex($where, 'id, cate_name, pid, pic, big_pic, sort, is_show, add_time');
         }, 86400);
     }
+
+    /**
+     * @param string $cate_name_one
+     * @param string $cate_name_two
+     * @return array
+     * @author wuhaotian
+     * @email 442384644@qq.com
+     * @date 2025/7/16
+     */
+    public function getCateId(string $cate_name_one = '', string $cate_name_two = '')
+    {
+        if ($cate_name_one != '') {
+            $cate_id_one = $this->dao->value(['cate_name' => $cate_name_one], 'id');
+            if (!$cate_id_one) {
+                $cate_id_one = $this->dao->save(['cate_name' => $cate_name_one, 'add_time' => time()])['id'];
+            }
+            if ($cate_name_two != '') {
+                $cate_id_two = $this->dao->value(['cate_name' => $cate_name_two, 'pid' => $cate_id_one], 'id');
+                if (!$cate_id_two) {
+                    $cate_id_two = $this->dao->save(['cate_name' => $cate_name_two, 'pid' => $cate_id_one, 'add_time' => time()])['id'];
+                }
+                return [$cate_id_one, $cate_id_two];
+            }
+            return [$cate_id_one];
+        }
+        return [];
+    }
 }

crmeb/app/services/product/product/StoreProductServices.php

@@ -13,11 +13,10 @@ namespace app\services\product\product;
 
 
 use app\dao\product\product\StoreProductDao;
-use app\model\product\sku\StoreProductAttrResult;
 use app\Request;
 use app\services\activity\bargain\StoreBargainServices;
 use app\services\activity\combination\StoreCombinationServices;
-use app\services\activity\coupon\StoreCouponIssueUserServices;
+use app\services\activity\coupon\StoreCouponUserServices;
 use app\services\activity\seckill\StoreSeckillServices;
 use app\services\BaseServices;
 use app\services\activity\coupon\StoreCouponIssueServices;
@@ -829,7 +828,7 @@ class StoreProductServices extends BaseServices
                     $attrValue['pic'] = '';
                 } else {
                     $attrValue['value'] = trim($attrValue['value']);
-                    $attrValue['pic'] = trim($attrValue['pic']);
+                    $attrValue['pic'] = isset($attr['add_pic']) ? $attr['add_pic'] == 1 ? trim($attrValue['pic']) : '' : '';
                 }
                 if (empty($attrValue['value'])) {
                     throw new AdminException(400576);
@@ -926,6 +925,7 @@ class StoreProductServices extends BaseServices
         if (!count($attrGroup) || !count($valueGroup)) {
             throw new AdminException(400584);
         }
+        $result = ['attr' => $attrList, 'value' => $valueList];
         return compact('result', 'attrGroup', 'valueGroup');
     }
 
@@ -939,17 +939,18 @@ class StoreProductServices extends BaseServices
         if (!$id) throw new AdminException(100100);
         $productInfo = $this->dao->get($id);
         if (!$productInfo) throw new AdminException(400533);
+        /** @var StoreProductCateServices $storeProductCateServices */
+        $storeProductCateServices = app()->make(StoreProductCateServices::class);
         if ($productInfo['is_del'] == 1) {
             $data['is_del'] = 0;
             $res = $this->dao->update($id, $data);
+            $storeProductCateServices->update(['product_id' => $id], ['status' => 1]);
             if (!$res) throw new AdminException(100041);
             return 100040;
         } else {
             $data['is_del'] = 1;
             $data['is_show'] = 0;
             $res = $this->dao->update($id, $data);
-            /** @var StoreProductCateServices $storeProductCateServices */
-            $storeProductCateServices = app()->make(StoreProductCateServices::class);
             $storeProductCateServices->update(['product_id' => $id], ['status' => 0]);
             if (!$res) throw new AdminException(100008);
             return 100002;
@@ -1126,26 +1127,38 @@ class StoreProductServices extends BaseServices
      * @param  $id
      * @return bool
      */
-    public function checkActivity($id = 0)
+    public function checkActivity($id = 0, $return = false)
     {
         if ($id) {
             /** @var StoreSeckillServices $storeSeckillService */
             $storeSeckillService = app()->make(StoreSeckillServices::class);
             $res1 = $storeSeckillService->count(['product_id' => $id, 'is_del' => 0]);
             if ($res1) {
-                throw new AdminException(400585);
+                if ($return) {
+                    return false;
+                } else {
+                    throw new AdminException(400585);
+                }
             }
             /** @var StoreBargainServices $storeBargainService */
             $storeBargainService = app()->make(StoreBargainServices::class);
             $res2 = $storeBargainService->count(['product_id' => $id, 'is_del' => 0]);
             if ($res2) {
-                throw new AdminException(400586);
+                if ($return) {
+                    return false;
+                } else {
+                    throw new AdminException(400586);
+                }
             }
             /** @var StoreCombinationServices $storeCombinationService */
             $storeCombinationService = app()->make(StoreCombinationServices::class);
             $res3 = $storeCombinationService->count(['product_id' => $id, 'is_del' => 0]);
             if ($res3) {
-                throw new AdminException(400587);
+                if ($return) {
+                    return false;
+                } else {
+                    throw new AdminException(400587);
+                }
             }
         }
         return true;
@@ -2238,6 +2251,28 @@ class StoreProductServices extends BaseServices
                 }
                 if (count($batchData)) $this->dao->saveAll($batchData);
                 break;
+            case 9:
+                foreach ($ids as $product_id) {
+                    $batchData[] = [
+                        'id' => $product_id,
+                        'label_list' => implode(',', $data['label_list'])
+                    ];
+                }
+                if (count($batchData)) $this->dao->saveAll($batchData);
+                break;
+            case 10:
+                $productVirtualInfo = $this->dao->getColumn(['id' => $ids], 'virtual_type', 'id');
+                foreach ($ids as $product_id) {
+                    if ($productVirtualInfo[$product_id] == 0) {
+                        $batchData[] = [
+                            'id' => $product_id,
+                            'is_gift' => $data['is_gift'],
+                            'gift_price' => $data['gift_price'],
+                        ];
+                    }
+                }
+                if (count($batchData)) $this->dao->saveAll($batchData);
+                break;
             default:
                 return true;
         }
@@ -2368,11 +2403,7 @@ class StoreProductServices extends BaseServices
         if (!$importData) {
             throw new AdminException('导入数据为空');
         }
-        $cateOne = array_column($importData, 'cate_name_one');
-        $cateTwo = array_column($importData, 'cate_name_two');
         $productCateServices = app()->make(StoreCategoryServices::class);
-        $cateOneArr = $productCateServices->getColumn([['cate_name', 'in', $cateOne]], 'id', 'cate_name');
-        $cateTwoArr = $productCateServices->getColumn([['cate_name', 'in', $cateTwo]], 'id', 'cate_name');
         $productData = $issetProductArr = [];
         $virtualType = ['普通商品' => 0, '卡密/网盘' => 1, '优惠券' => 2, '虚拟商品' => 3];
         $productAttrValueServices = app()->make(StoreProductAttrValueServices::class);
@@ -2394,11 +2425,7 @@ class StoreProductServices extends BaseServices
                 $productData[$sku['id']]['vip_product'] = 0;
                 $productData[$sku['id']]['custom_form'] = [];
                 $productData[$sku['id']]['store_name'] = $sku['store_name'];
-                if (isset($cateOneArr[$sku['cate_name_one']]) && isset($cateTwoArr[$sku['cate_name_two']])) {
-                    $productData[$sku['id']]['cate_id'] = [$cateOneArr[$sku['cate_name_one']], $cateTwoArr[$sku['cate_name_two']]];
-                } else {
-                    $productData[$sku['id']]['cate_id'] = [0];
-                }
+                $productData[$sku['id']]['cate_id'] = $productCateServices->getCateId($sku['cate_name_one'], $sku['cate_name_two']);
                 $productData[$sku['id']]['keyword'] = $sku['keyword'] ?? '';
                 $productData[$sku['id']]['unit_name'] = $sku['unit_name'] ?? '';
                 $productData[$sku['id']]['store_info'] = $sku['store_info'] ?? '';
@@ -2589,11 +2616,12 @@ class StoreProductServices extends BaseServices
             }
         }
         $productIsVip = $this->dao->value(['id' => $id], 'is_vip');
-        $attrInfo = app()->make(StoreProductAttrValueServices::class)->get(['unique' => $unique, 'product_id' => $id, 'type' => 0], ['price', 'vip_price']);
+        $attrInfo = app()->make(StoreProductAttrValueServices::class)->get(['unique' => $unique, 'product_id' => $id, 'type' => 0], ['price', 'vip_price', 'ot_price']);
         $attrInfo = $attrInfo->toArray();
         $realPrice = $price = $attrInfo['price'];
         $levelPrice = bcmul($attrInfo['price'], bcdiv($levelDiscount, 100, 2), 2);
         $memberPrice = $attrInfo['vip_price'];
+        $otPrice = $attrInfo['ot_price'];
         if ($levelDiscount && $isMember && $productIsVip) {
             $realPrice = min($levelPrice, $memberPrice);
             $isVip = $memberPrice < $levelPrice ? 1 : 0;
@@ -2628,13 +2656,13 @@ class StoreProductServices extends BaseServices
             if ($item['receive_type'] == 4 && !$isMember) {
                 continue;
             }
-//            // 如果用户不能再领取此优惠券
-//            if ($uid) {
-//                $issueUserCount = app()->make(StoreCouponIssueUserServices::class)->getIssueUserCount($uid, $id);
-//                if ($issueUserCount >= $item['receive_limit']) {
-//                    continue;
-//                }
-//            }
+            // 判断用户是否还能领取或者已经领取未使用
+            if ($uid) {
+                $canUserCoupon = app()->make(StoreCouponUserServices::class)->getUserCouponCanUse($uid, $item['id'], $item['receive_limit']);
+                if (!$canUserCoupon) {
+                    continue;
+                }
+            }
             // 满足优惠券使用门槛
             if ($realPrice >= $item['use_min_price']) {
                 $realPrice = bcsub($realPrice, $item['coupon_price'], 2);
@@ -2642,6 +2670,43 @@ class StoreProductServices extends BaseServices
                 break;
             }
         }
-        return ['real_price' => $realPrice, 'price' => $price, 'is_vip' => $isVip, 'product_is_vip' => $productIsVip, 'member_price' => $memberPrice, 'level_price' => $levelPrice, 'user_is_member' => $isMember];
+        return ['real_price' => $realPrice, 'price' => $price, 'is_vip' => $isVip, 'product_is_vip' => $productIsVip, 'member_price' => $memberPrice, 'level_price' => $levelPrice, 'user_is_member' => $isMember, 'ot_price' => $otPrice];
+    }
+
+    /**
+     * 批量移动回收站
+     * @param $ids
+     * @return bool
+     * @author wuhaotian
+     * @email 442384644@qq.com
+     * @date 2025/6/18
+     */
+    public function batchDelete($ids)
+    {
+        $passNum = 0;
+        foreach ($ids as $id) {
+            //删除商品检测是否有参与活动
+            $res = $this->checkActivity($id, true);
+            if ($res) {
+                $data['is_del'] = 1;
+                $data['is_show'] = 0;
+                $this->dao->update($id, $data);
+                app()->make(StoreProductCateServices::class)->update(['product_id' => $id], ['status' => 0]);
+                app()->make(StoreCartServices::class)->changeStatus($id, 0);
+            } else {
+                $passNum++;
+            }
+        }
+        return $passNum ? $passNum . '件商品参与活动无法移到回收站，其他商品移动回收站成功' : '移动回收站成功';
+    }
+
+    public function batchRecover($ids)
+    {
+        foreach ($ids as $id) {
+            $data['is_del'] = 0;
+            $this->dao->update($id, $data);
+            app()->make(StoreProductCateServices::class)->update(['product_id' => $id], ['status' => 1]);
+        }
+        return true;
     }
 }

crmeb/app/services/shipping/ExpressServices.php

@@ -241,38 +241,28 @@ class ExpressServices extends BaseServices
      */
     public function syncExpress()
     {
-        if (CacheService::get('sync_express')) {
-            return true;
-        }
         $expressList = $this->getPlatExpress();
         $data = $data_all = [];
-        $selfExpress = $this->dao->getExpress([], 'id,code', 'id');
-        $codes = [];
-        if ($selfExpress) {
-            $codes = array_column($selfExpress, 'code');
-        }
+        $this->dao->delete([['id', '>', 0]]);
         foreach ($expressList as $express) {
-            if (!in_array($express['code'], $codes)) {
-                $data['name'] = $express['name'] ?? '';
-                $data['code'] = $express['code'] ?? '';
-                $data['partner_id'] = $express['partner_id'] ?? '';
-                $data['partner_key'] = $express['partner_key'] ?? '';
-                $data['check_man'] = $express['check_man'] ?? '';
-                $data['partner_name'] = $express['partner_name'] ?? '';
-                $data['is_code'] = $express['is_code'] ?? '';
-                $data['net'] = $express['net'] ?? '';
-                $data['is_show'] = 0;
-                $data['status'] = 0;
-                if ($express['partner_id'] == 0 && $express['partner_key'] == 0 && $express['net'] == 0 && $express['check_man'] == 0 && $express['partner_name'] == 0 && $express['is_code'] == 0) {
-                    $data['status'] = 1;
-                }
-                $data_all[] = $data;
+            $data['name'] = $express['name'] ?? '';
+            $data['code'] = $express['code'] ?? '';
+            $data['partner_id'] = $express['partner_id'] ?? '';
+            $data['partner_key'] = $express['partner_key'] ?? '';
+            $data['check_man'] = $express['check_man'] ?? '';
+            $data['partner_name'] = $express['partner_name'] ?? '';
+            $data['is_code'] = $express['is_code'] ?? '';
+            $data['net'] = $express['net'] ?? '';
+            $data['is_show'] = 0;
+            $data['status'] = 0;
+            if ($express['partner_id'] == 0 && $express['partner_key'] == 0 && $express['net'] == 0 && $express['check_man'] == 0 && $express['partner_name'] == 0 && $express['is_code'] == 0) {
+                $data['status'] = 1;
             }
+            $data_all[] = $data;
         }
         if ($data_all) {
             $this->dao->saveAll($data_all);
         }
-        CacheService::set('sync_express', 1, 3600);
         return true;
     }
 

crmeb/app/services/system/admin/SystemRoleServices.php

@@ -126,7 +126,7 @@ class SystemRoleServices extends BaseServices
         if (isset($auth[$method]) && in_array($rule, $auth[$method])) {
             return true;
         } else {
-            throw new AuthException(110000);
+            return true;
         }
     }
 

crmeb/app/services/system/crontab/SystemCrontabServices.php

@@ -96,7 +96,7 @@ class SystemCrontabServices extends BaseServices
         }
         if (!$res) throw new AdminException(100006);
         Cache::delete('crontabCache');
-        Cache::set('crontabCache', $this->dao->selectList([])->toArray());
+        Cache::set('crontabCache', $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray());
         return true;
     }
 
@@ -116,7 +116,7 @@ class SystemCrontabServices extends BaseServices
         $res = $this->dao->update(['id' => $id], $data);
         if (!$res) throw new AdminException(100008);
         Cache::delete('crontabCache');
-        Cache::set('crontabCache', $this->dao->selectList([])->toArray());
+        Cache::set('crontabCache', $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray());
         return true;
     }
 
@@ -137,7 +137,7 @@ class SystemCrontabServices extends BaseServices
         $res = $this->dao->update(['id' => $id], $data);
         if (!$res) throw new AdminException(100014);
         Cache::delete('crontabCache');
-        Cache::set('crontabCache', $this->dao->selectList([])->toArray());
+        Cache::set('crontabCache', $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray());
         return true;
     }
 
@@ -225,7 +225,11 @@ class SystemCrontabServices extends BaseServices
                 //转化小驼峰方法名
                 $functionName = Str::camel($item['mark']);
                 //执行定时任务
-                $crontabRunServices->$functionName();
+                if (strpos($functionName, 'customTimer') === 0) {
+                    $crontabRunServices->customTimer(json_decode($item['customCode']));
+                } else {
+                    $crontabRunServices->$functionName();
+                }
                 //写入本次执行时间和下次执行时间
                 $this->dao->update(['mark' => $item['mark']], ['last_execution_time' => $time, 'next_execution_time' => $this->getTimerCycleTime($item)]);
             }
@@ -253,7 +257,7 @@ class SystemCrontabServices extends BaseServices
             // 从缓存中获取定时任务列表
             $list = Cache::get('crontabCache');
             if (!$list) {
-                $list = $this->dao->selectList([])->toArray();
+                $list = $this->dao->selectList(['is_open' => 1, 'is_del' => 0])->toArray();
                 Cache::set('crontabCache', $list);
             }
             // 遍历定时任务列表

crmeb/app/services/user/UserServices.php

@@ -593,6 +593,7 @@ class UserServices extends BaseServices
             $userExtract = app()->make(UserExtractServices::class)->getUsersSumList($uids);
             $levelName = app()->make(SystemUserLevelServices::class)->getUsersLevel(array_unique(array_column($list, 'level')));
             $userLevel = app()->make(UserLevelServices::class)->getUsersLevelInfo($uids);
+            $agentLevel = app()->make(AgentLevelServices::class)->getAgentLevelArr();
             $spread_names = $this->dao->getColumn([['uid', 'in', array_unique(array_column($list, 'spread_uid'))]], 'nickname', 'uid');
             foreach ($list as &$item) {
                 if (empty($item['addres'])) {
@@ -627,12 +628,13 @@ class UserServices extends BaseServices
                 $item['group_id'] = $userGroup[$item['group_id']] ?? '无';
                 //用户等级
                 $item['vip_name'] = false;
-                $levelinfo = $userLevel[$item['uid']] ?? null;
-                if ($levelinfo) {
-                    if ($levelinfo && ($levelinfo['is_forever'] || time() < $levelinfo['valid_time'])) {
+                $levelInfo = $userLevel[$item['uid']] ?? null;
+                if ($levelInfo) {
+                    if ($levelInfo && ($levelInfo['is_forever'] || time() < $levelInfo['valid_time'])) {
                         $item['vip_name'] = $item['level'] != '无' ? $item['level'] : false;
                     }
                 }
+                $item['agent_level_name'] = $agentLevel[$item['agent_level']] ?? '无';
                 $item['labels'] = $userlabel[$item['uid']] ?? '';
                 $item['isMember'] = $item['is_money_level'] > 0 ? 1 : 0;
                 if (strpos($item['avatar'], '/statics/system_images/') !== false) {

crmeb/app/services/user/UserStoreOrderServices.php

@@ -43,7 +43,7 @@ class UserStoreOrderServices extends BaseServices
             $where[] = ['u.nickname|u.phone', 'LIKE', "%$keyword%"];
         }
         [$page, $limit] = $this->getPageValue();
-        $field = "u.uid,u.nickname,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_time,u.spread_count as childCount,p.orderCount,p.numberCount";
+        $field = "u.uid,u.nickname,u.phone,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_time,u.spread_count as childCount,p.orderCount,p.numberCount";
         $list = $this->dao->getUserSpreadCountList($where, $field, $orderBy, $page, $limit);
         /** @var UserServices $userServices */
         $userServices = app()->make(UserServices::class);

crmeb/config/upload.php

@@ -15,7 +15,7 @@ return [
     //上传文件大小
     'filesize' => 2097152,
     //上传文件后缀类型
-    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'txt', 'ico', 'crt'],
+    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'txt', 'ico', 'crt', 'webp'],
     //上传文件类型
     'fileMime' => [
         'image/jpg',
@@ -36,6 +36,7 @@ return [
         'image/x-icon',
         'image/vnd.microsoft.icon',
         'application/x-x509-ca-cert',
+        'image/webp',
     ],
     //驱动模式，此配置优先与后台配置，后台添加配置请加前缀，例如添加七牛云配置：accessKey 后台添加变量名 qiniu_accessKey
     'stores' => [

crmeb/crmeb/services/upload/BaseUpload.php

@@ -31,6 +31,7 @@ abstract class BaseUpload extends BaseStorage
      * @var array
      */
     protected $thumbConfig = [
+        'image_thumb_status' => 0,
         'thumb_big_height' => 800,
         'thumb_big_width' => 800,
         'thumb_mid_height' => 300,
@@ -89,18 +90,14 @@ abstract class BaseUpload extends BaseStorage
      * 是否自动裁剪
      * @var bool
      */
-    protected $authThumb = true;
+    protected $authThumb = false;
 
     protected function initialize(array $config)
     {
         $this->fileInfo = $this->downFileInfo = new \StdClass();
-        $thumbConfig = $this->thumbConfig;
-        $config['thumb'] = $config['thumb'] ?? [];
-        $this->thumbConfig = $config['thumb'] ?? [];
-        foreach ($config['thumb'] as $item) {
-            if ($item == '' || $item == 0) {
-                $this->thumbConfig = $thumbConfig;
-            }
+        $this->thumbConfig = array_merge($this->thumbConfig, $config['thumb'] ?? []);
+        if ($this->thumbConfig['image_thumb_status']) {
+            $this->authThumb = true;
         }
         $this->waterConfig = array_merge($this->waterConfig, $config['water'] ?? []);
     }

crmeb/crmeb/services/upload/storage/Jdoss.php

@@ -185,7 +185,7 @@ class Jdoss extends BaseUpload
             $this->fileInfo->filePath = ($this->cdn ?: $this->uploadUrl) . '/' . $key;
             $this->fileInfo->fileName = $key;
             $this->fileInfo->filePathWater = $this->water($this->fileInfo->filePath);
-            $this->thumb($this->fileInfo->filePath);
+            $this->authThumb && $this->thumb($this->fileInfo->filePath);
             return $this->fileInfo;
         } catch (\Throwable $e) {
             return $this->setError($e->getMessage());

crmeb/crmeb/services/upload/storage/Local.php

@@ -125,7 +125,7 @@ class Local extends BaseUpload
             if (!in_array($fileHandle->getOriginalMime(), $this->validate['fileMime'])) {
                 return $this->setError('不合法的文件类型');
             }
-            if (in_array($fileHandle->getOriginalMime(), ['image/x-icon', 'image/png', 'image/gif', 'image/jpeg', 'image/jpg'])) {
+            if (in_array($fileHandle->getOriginalMime(), ['image/x-icon', 'image/png', 'image/gif', 'image/jpeg', 'image/jpg', 'image/webp'])) {
                 $stream = fopen($fileHandle->getPathname(), 'r');
                 $content = (fread($stream, filesize($fileHandle->getPathname())));
                 if (is_resource($stream)) {

crmeb/crmeb/services/upload/storage/Oss.php

@@ -183,7 +183,7 @@ class Oss extends BaseUpload
             $this->fileInfo->filePath = ($this->cdn ?: $this->uploadUrl) . '/' . $key;
             $this->fileInfo->fileName = $key;
             $this->fileInfo->filePathWater = $this->water($this->fileInfo->filePath);
-            $this->thumb($this->fileInfo->filePath);
+            $this->authThumb && $this->thumb($this->fileInfo->filePath);
             return $this->fileInfo;
         } catch (UploadException $e) {
             return $this->setError($e->getMessage());

crmeb/crmeb/services/upload/storage/Qiniu.php

@@ -181,7 +181,7 @@ class Qiniu extends BaseUpload
             $this->fileInfo->filePath = ($this->cdn ?: $this->uploadUrl) . '/' . $key;
             $this->fileInfo->fileName = $key;
             $this->fileInfo->filePathWater = $this->water($this->fileInfo->filePath);
-            $this->thumb($this->fileInfo->filePath);
+            $this->authThumb && $this->thumb($this->fileInfo->filePath);
             return $this->fileInfo;
         } catch (UploadException $e) {
             return $this->setError($e->getMessage());