update v5.2.1

Author: evoxwht

LICENSE

@@ -1,4 +1,4 @@
-                      GNU GENERAL PUBLIC LICENSE 
+                      GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>

README.md

@@ -13,7 +13,7 @@ CRMEB开源商城系统PHP版
         <img src="https://img.shields.io/badge/Licence-GPL3.0-green.svg?style=flat" />
     </a>
     <a href="http://www.crmeb.com">
-        <img src="https://img.shields.io/badge/Edition-5.1-blue.svg" />
+        <img src="https://img.shields.io/badge/Edition-5.2-blue.svg" />
     </a>
      <a href="https://gitee.com/ZhongBangKeJi/CRMEB/repository/archive/master.zip">
         <img src="https://img.shields.io/badge/Download-240m-red.svg" />
@@ -115,9 +115,9 @@ Redis
 
 账号：demo 密码：crmeb.com
 
-H5端：http://v5.crmeb.net/（移动端打开）
+H5端：http://v5.crmeb.net/ （移动端打开）
 
-PC端：http://v5.crmeb.net/（电脑端打开）
+PC端：http://v5.crmeb.net/ （电脑端打开）
 
 APP下载：http://app.crmeb.cn/bzv （苹果手机直接在APP Store里搜索CRMEB下载）
 
@@ -153,6 +153,9 @@ APP下载：http://app.crmeb.cn/bzv （苹果手机直接在APP Store里搜索CR
 
 So~~想要用CRMEB开源商城系统做公益项目的朋友，可以来免费申请商业版系统哦！有需要的朋友，快去找官方客服咨询吧！
 
+![输入图片说明](readme/pic/gongyi1.jpg)
+![输入图片说明](readme/pic/gongyi2.jpg)
+
 ---
 ###  💎 捐赠
 赠人玫瑰，手留余香！CRMEB诚挚地邀请大家积极参与捐赠，我们会将捐赠获得的费用，悉数用于支持公益项目，让善意无限传递下去！

crmeb/.version

@@ -1,5 +1,5 @@
-version=CRMEB-KY v5.2.0
-version_code=520
+version=CRMEB-KY v5.2.1
+version_code=521
 platform=github
 app_id=ze7x9rxsv09l6pvsyo
 app_key=fuF7U9zaybLa5gageVQzxtxQMFnvU2OI

crmeb/app/adminapi/controller/UpgradeController.php

@@ -69,13 +69,13 @@ public function save()
             ['name', ''],
             ['grade', 0],
             ['image', ''],
-            ['one_brokerage', 0],
-            ['two_brokerage', 0],
+            ['one_brokerage_percent', 0],
+            ['two_brokerage_percent', 0],
             ['status', 0]]);
         if (!$data['name']) return app('json')->fail(400200);
         if (!$data['grade']) return app('json')->fail(400201);
         if (!$data['image']) return app('json')->fail(400202);
-        if ($data['two_brokerage'] > $data['one_brokerage']) {
+        if ($data['two_brokerage_percent'] > $data['one_brokerage_percent']) {
             return app('json')->fail(400203);
         }
         $grade = $this->services->get(['grade' => $data['grade'], 'is_del' => 0]);
@@ -121,13 +121,13 @@ public function update($id)
             ['name', ''],
             ['grade', 0],
             ['image', ''],
-            ['one_brokerage', 0],
-            ['two_brokerage', 0],
+            ['one_brokerage_percent', 0],
+            ['two_brokerage_percent', 0],
             ['status', 0]]);
         if (!$data['name']) return app('json')->fail(400200);
         if (!$data['grade']) return app('json')->fail(400201);
         if (!$data['image']) return app('json')->fail(400202);
-        if ($data['two_brokerage'] > $data['one_brokerage']) {
+        if ($data['two_brokerage_percent'] > $data['one_brokerage_percent']) {
             return app('json')->fail(400203);
         }
         if (!$levelInfo = $this->services->getLevelInfo((int)$id)) return app('json')->fail(400206);
@@ -139,8 +139,8 @@ public function update($id)
         $levelInfo->name = $data['name'];
         $levelInfo->grade = $data['grade'];
         $levelInfo->image = $data['image'];
-        $levelInfo->one_brokerage = $data['one_brokerage'];
-        $levelInfo->two_brokerage = $data['two_brokerage'];
+        $levelInfo->one_brokerage_percent = $data['one_brokerage_percent'];
+        $levelInfo->two_brokerage_percent = $data['two_brokerage_percent'];
         $levelInfo->status = $data['status'];
         $levelInfo->save();
         return app('json')->success(100001);

crmeb/app/adminapi/controller/v1/agent/AgentLevel.php

@@ -75,6 +75,7 @@ public function save()
             ['pid', 0],
             ['name', '']
         ]);
+        if (is_array($data['pid'])) $data['pid'] = end($data['pid']);
         if (!$data['name']) {
             return app('json')->fail(400100);
         }
@@ -108,6 +109,9 @@ public function update($id)
         if (!$data['name']) {
             return app('json')->fail(400100);
         }
+        if ($data['pid'] == $id) {
+            return app('json')->fail('上级分类不能是自己');
+        }
         $info = $this->service->get($id);
         $count = $this->service->count(['pid' => $id]);
         if ($count && $info['pid'] != $data['pid']) return app('json')->fail(400105);

crmeb/app/adminapi/controller/v1/file/SystemAttachmentCategory.php

@@ -87,6 +87,7 @@ public function save($id)
             ['postage', 0],//邮费
             ['custom_form', ''],
             ['virtual_type', 0],
+            ['is_commission', 0],
         ]);
         $this->validate($data, \app\adminapi\validate\marketing\StoreBargainValidate::class, 'save');
         if ($data['section_time']) {

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

@@ -43,6 +43,7 @@ public function index()
             ['coupon_title', ''],
             ['receive_type', ''],
             ['type', ''],
+            ['coupon_type', ''],
         ]);
         $list = $this->services->getCouponIssueList($where);
         return app('json')->success($list);
@@ -55,6 +56,7 @@ public function index()
     public function saveCoupon()
     {
         $data = $this->request->postMore([
+            ['id', 0],
             ['coupon_title', ''],
             ['coupon_price', 0.00],
             ['use_min_price', 0.00],

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

@@ -87,6 +87,7 @@ public function save($id)
             ['postage', 0],//邮费
             ['custom_form', ''],
             ['virtual_type', 0],
+            ['is_commission', 0],
         ]);
         $this->validate($data, \app\adminapi\validate\marketing\StoreSeckillValidate::class, 'save');
         $this->services->saveData($id, $data);

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

@@ -14,6 +14,7 @@
 use app\adminapi\validate\order\StoreOrderValidate;
 use app\jobs\OrderExpressJob;
 use app\services\serve\ServeServices;
+use app\services\wechat\WechatUserServices;
 use crmeb\services\FileService;
 use app\services\order\{StoreOrderCartInfoServices,
     StoreOrderDeliveryServices,
@@ -452,7 +453,7 @@ public function refund(StoreOrderRefundServices $services, $id)
         if (!$id) {
             return app('json')->fail(100100);
         }
-        return app('json')->success($services->refundOrderForm((int)$id));
+        return app('json')->success($services->refundOrderForm((int)$id, 'order'));
     }
 
     /**
@@ -467,7 +468,6 @@ public function update_refund(StoreOrderRefundServices $services, $id)
     {
         $data = $this->request->postMore([
             ['refund_price', 0],
-            ['type', 1]
         ]);
         if (!$id) {
             return app('json')->fail(100100);
@@ -476,44 +476,63 @@ public function update_refund(StoreOrderRefundServices $services, $id)
         if (!$order) {
             return app('json')->fail(400118);
         }
+
+        $refundData = [
+            'refund_reason' => '后台主动退款',
+            'refund_explain' => '后台主动退款',
+            'refund_img' => json_encode([]),
+        ];
+
+        $res = $services->applyRefund((int)$id, $order['uid'], $order, [], 1, (float)$data['refund_price'], $refundData);
+
+        if (!$res) {
+            return app('json')->fail('退款单生成失败');
+        }
+
+        $orderRefund = $services->get(['store_order_id' => $id]);
+
+
+        $data['refund_status'] = 2;
+        $data['refund_type'] = 6;
+        $data['refunded_time'] = time();
+
         //0元退款
-        if ($order['pay_price'] == 0 && in_array($order['refund_status'], [0, 1])) {
+        if ($orderRefund['refund_price'] == 0 && in_array($orderRefund['refund_type'], [1, 5])) {
             $refund_price = 0;
         } else {
-            if ($order['pay_price'] == $order['refund_price']) {
-                return app('json')->fail(400147);
-            }
             if (!$data['refund_price']) {
                 return app('json')->fail(400146);
             }
-            $refund_price = $data['refund_price'];
-            $data['refund_price'] = bcadd($data['refund_price'], $order['refund_price'], 2);
-            $bj = bccomp((string)$order['pay_price'], (string)$data['refund_price'], 2);
-            if ($bj < 0) {
-                return app('json')->fail(400148);
+            if ($orderRefund['refund_price'] == $orderRefund['refunded_price']) {
+                return app('json')->fail(400147);
             }
+            $refund_price = $data['refund_price'];
         }
-        if ($data['type'] == 1) {
-            $data['refund_status'] = 2;
-        } else if ($data['type'] == 2) {
-            $data['refund_status'] = 0;
+
+        $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['refund_type'] = 6;
-        $type = $data['type'];
-        unset($data['type']);
+
         $refund_data['pay_price'] = $order['pay_price'];
         $refund_data['refund_price'] = $refund_price;
         if ($order['refund_price'] > 0) {
+            mt_srand();
             $refund_data['refund_id'] = $order['order_id'] . rand(100, 999);
         }
-        //退款处理
-        $services->payOrderRefund($type, $order, $refund_data);
+        ($order['pid'] > 0) ? $refund_data['order_id'] = $this->services->value(['id' => (int)$order['pid']], 'order_id') : $refund_data['order_id'] = $order['order_id'];
+        /** @var WechatUserServices $wechatUserServices */
+        $wechatUserServices = app()->make(WechatUserServices::class);
+        $refund_data['open_id'] = $wechatUserServices->uidToOpenid((int)$order['uid'], 'routine') ?? '';
+        $refund_data['refund_no'] = $orderRefund['order_id'];
         //修改订单退款状态
-        if ($this->services->update($id, $data)) {
-            $services->storeProductOrderRefundY($data, $order, $refund_price);
+        unset($data['refund_price']);
+        if ($services->agreeRefund($orderRefund['id'], $refund_data)) {
+            $services->update($orderRefund['id'], $data);
             return app('json')->success(400149);
         } else {
-            $services->storeProductOrderRefundYFasle((int)$id, $refund_price);
+            $services->storeProductOrderRefundYFasle((int)$orderRefund['id'], $refund_price);
             return app('json')->fail(400150);
         }
     }
@@ -883,4 +902,24 @@ public function importExpress()
         }
         return app('json')->success('批量发货成功');
     }
+
+    /**
+     * 配货单
+     * @param $order_id
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author: 吴汐
+     * @email: 442384644@qq.com
+     * @date: 2023/10/11
+     */
+    public function printShipping($order_id)
+    {
+        if (!$order_id) {
+            return app('json')->fail('参数错误');
+        }
+        $data = $this->services->printShippingData($order_id);
+        return app('json')->success($data);
+    }
 }

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

@@ -340,7 +340,7 @@ public function save_basics(Request $request)
             if (!is_int($post['sign_give_point']) || $post['sign_give_point'] < 0) return app('json')->fail('签到赠送积分请填写大于等于0的整数');
         }
         if (isset($post['sign_give_exp'])) {
-            if (!is_int($post['sign_give_exp']) || $post['sign_give_exp'] < 0) return app('json')->fail('签到赠送经验请填写大于等于0的整数');
+            if ((int)$post['sign_give_exp'] < 0) return app('json')->fail('签到赠送经验请填写大于等于0的整数');
         }
         if (isset($post['integral_frozen'])) {
             if (!ctype_digit($post['integral_frozen']) || $post['integral_frozen'] < 0) return app('json')->fail('积分冻结天数请填写大于等于0的整数');
@@ -358,6 +358,9 @@ public function save_basics(Request $request)
         if (isset($post['customer_phone'])) {
             if (!ctype_digit($post['customer_phone']) || strlen($post['customer_phone']) > 11) return app('json')->fail('客服手机号为11位数字');
         }
+        if (isset($post['refund_time_available'])) {
+            if (!ctype_digit($post['refund_time_available'])) return app('json')->fail('售后期限必须为大于0的整数');
+        }
 
         foreach ($post as $k => $v) {
             $config_one = $this->services->getOne(['menu_name' => $k]);

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

@@ -20,12 +20,15 @@
 use app\services\system\SystemCrudDataService;
 use app\services\system\SystemCrudServices;
 use app\services\system\SystemMenusServices;
+use app\services\system\SystemRouteServices;
 use crmeb\services\CacheService;
 use crmeb\services\crud\enum\FormTypeEnum;
 use crmeb\services\crud\Make;
 use crmeb\services\crud\Service;
 use crmeb\services\FileService;
 use think\facade\App;
+use think\facade\Db;
+use think\facade\Env;
 use think\helper\Str;
 use think\Response;
 
@@ -548,13 +551,20 @@ public function delete(SystemMenusServices $services, $id)
             return app('json')->fail(100026);
         }
 
-        $services->transaction(function () use ($services, $info) {
-            if ($info->menu_ids) {
-                $services->deleteMenus($info->menu_ids);
-            }
+        $menusServices = app()->make(SystemMenusServices::class);
+        if ($info->menu_ids) {
+            $menusServices->deleteMenus($info->menu_ids);
+        }
+        if ($info->menu_id) {
+            $menusServices->deleteMenus([$info->menu_id]);
+        }
 
-            $info->delete();
-        });
+        $routeServices = app()->make(SystemRouteServices::class);
+        if ($info->route_ids) {
+            $routeServices->deleteRoutes($info->route_ids);
+        }
+
+        Db::query("DROP TABLE `" . Env::get('database.prefix', 'eb_') . $info->table_name . "`");
 
         if ($info->make_path) {
             $errorFile = [];
@@ -577,6 +587,8 @@ public function delete(SystemMenusServices $services, $id)
             }
         }
 
+        $info->delete();
+
 
         return app('json')->success(100002);
     }

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

@@ -106,7 +106,7 @@ public function edit(SystemMenusServices $services, $id)
         if (!$role) {
             return app('json')->fail(100100);
         }
-        $menus = $services->getMenus($this->adminInfo['level'] == 0 ? [] : $this->adminInfo['roles']);
+        $menus = $services->getMenus($this->adminInfo['level'] == 0 ? [] : $this->adminInfo['roles'], explode(',', $role['rules']));
         return app('json')->success(['role' => $role->toArray(), 'menus' => $menus]);
     }