更新v4.4.2版本

Author: evoxwht

README.md

@@ -11,7 +11,7 @@
 
  CRMEB技术团队（官网：www.crmeb.com)历经4年时间匠心之作！系统采用前后端分离技术，基于TP6+Uni-app框架开发；客户移动端采用uni-app开发，管理后台前端使用iviewUI开发。系统支持微信公众号端、微信小程序端、H5端、PC端多端账号同步，可快速打包生成APP；
 
- 赋能开发者，减少重复造轮子；系统支持自动检查安装环境一键安装部署，使用简单方便；围绕方便二次开发，系统内置强大灵活的权限管理，可以控制到每一个菜单；通过内置组合数据,管理碎片化数据,系统配置快速添加系统配置参数，内置钩子，方便二开；后台应用form-builder PHP快速生成现代化表单；并提供详细的使用文档、开发文档、接口文档、数据字典等相关文档；及十几个技术交流群、技术论坛答疑；帮助更多开发者快速上手，节省开发时间，提升开发效率；助力企业实现数字化经营！
+ 赋能开发者，减少重复造轮子；系统支持自动检查安装环境一键安装部署，使用简单方便；围绕方便二次开发，系统内置强大灵活的权限管理，可以控制到每一个菜单；通过内置组合数据,管理碎片化数据,系统配置快速添加系统配置参数，所有用户操作地方都内置钩子，代码严格分控制层（中间件、路由）、Services层、Dao层、Model层；后台应用form-builder PHP快速生成现代化表单；并提供详细的使用文档、开发文档、接口文档、数据字典等相关文档；及十几个技术交流群、技术论坛答疑；让您二开无忧，帮助更多开发者快速上手，节省开发时间，提升开发效率；助力企业实现数字化经营！
 
 <p align="center" >
 <a href="https://gitee.com/ZhongBangKeJi/CRMEB/blob/master/README.md"> 宽屏预览 </a>
@@ -52,7 +52,7 @@
 
 技术交流社区：<a href="https://q.crmeb.com"  target="_blank">https://q.crmeb.com
 
-
+ ![](readme/images/gitee打通版-横.jpg)
 [![](readme/images/1思维脑图功能清单.jpg)](http://s.crmeb.com/goods_detail/730)
 [![](readme/images/2高清UI设计图.jpg)](http://s.crmeb.com/goods_detail/728)
 [![](readme/images/3前后端接口文档.jpg)](http://s.crmeb.com/goods_detail/729)
@@ -106,6 +106,7 @@ Redis
     15.支持队列降低流量高峰，解除耦合，高可用;
     16.一键安装自动检查系统环境一键安装；
     17.移动端使用uni-app进行开发，方便编译成各种格式的代码；
+    18.严格代码规范，层次分明
 ~~~
 
 ## 页面展示

crmeb/LICENSE.txt

@@ -22,7 +22,7 @@
 3、电子文本形式的授权协议如同双方书面签署的协议一样，具有完全的和等同的法律效力。您一旦开始确认本协议并安装 CRMEB，即被视为完全理解并接受本协议的各项条款，在享有上述条款授予的权力的同时，受到相关的约束和限制。协议许可范围以外的行为，将直接违反本授权协议并构成侵权，我们有权随时终止授权，责令停止损害，并保留追究相关责任的权力。
 
 协议发布时间： 2017年8月01日
-版本最新更新： 2019年8月15日 By CRMEB
+版本最新更新： 2022年3月15日 By CRMEB
 
 CRMEB官方网站：http://www.crmeb.com
 CRMEB演示站：http://demo.crmeb.com

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

@@ -248,6 +248,10 @@ public function delete($id)
      */
     public function uploadType(SystemConfigServices $services, $type)
     {
+        $status = $this->services->count(['type' => $type, 'status' => 1]);
+        if (!$status && $type != 1) {
+            return app('json')->success('未有正在使用的存储空间');
+        }
         $services->update('upload_type', ['value' => json_encode($type)], 'menu_name');
         \crmeb\services\CacheService::clear();
         if ($type != 1) {

crmeb/app/model/system/config/SystemStorage.php

@@ -45,4 +45,24 @@ public function searchNameAttr($query, $value)
     {
         $query->where('name', $value);
     }
+
+    /**
+     * 类型搜索器
+     * @param $query
+     * @param $value
+     */
+    public function searchTypeAttr($query, $value)
+    {
+        if ($value) $query->where('type', $value);
+    }
+
+    /**
+     * 状态搜索器
+     * @param $query
+     * @param $value
+     */
+    public function searchStatusAttr($query, $value)
+    {
+        if ($value !== '') $query->where('status', $value);
+    }
 }

crmeb/app/services/message/wechat/MessageServices.php

@@ -47,6 +47,7 @@ public function wechatEventScan($message)
             if (strtolower($qrInfo['third_type']) == 'spread') {
                 try {
                     $spreadUid = $qrInfo['third_id'];
+                    $is_new = $wechatUser->saveUser($message->FromUserName);
                     $uid = $wechatUser->getFieldValue($message->FromUserName, 'openid', 'uid', ['user_type', '<>', 'h5']);
                     $userInfo = $userService->get($uid);
                     if ($spreadUid == $uid) {
@@ -55,7 +56,7 @@ public function wechatEventScan($message)
                         $response = '用户不存在';
                     } else if ($userInfo['spread_uid']) {
                         $response = '已有推荐人!';
-                    } else if (!$loginService->updateUserInfo(['code' => $spreadUid], $userInfo)) {
+                    } else if (!$loginService->updateUserInfo(['code' => $spreadUid], $userInfo, $is_new)) {
                         $response = '绑定推荐人失败!';
                     }
                 } catch (\Exception $e) {
@@ -65,6 +66,7 @@ public function wechatEventScan($message)
                 try {
                     $spreadUid = $qrInfo['third_id'];
                     $spreadInfo = $userService->get($spreadUid);
+                    $is_new = $wechatUser->saveUser($message->FromUserName);
                     $uid = $wechatUser->getFieldValue($message->FromUserName, 'openid', 'uid', ['user_type', '<>', 'h5']);
                     $userInfo = $userService->get($uid);
                     if ($spreadUid == $uid) {
@@ -77,7 +79,7 @@ public function wechatEventScan($message)
                         $response = '您是事业部,不能绑定成为别人的员工';
                     } else if ($userInfo->is_agent) {
                         $response = '您是代理商,不能绑定成为别人的员工';
-                    } else if ($loginService->updateUserInfo(['code' => $spreadUid, 'is_staff' => 1], $userInfo)) {
+                    } else if ($loginService->updateUserInfo(['code' => $spreadUid, 'is_staff' => 1], $userInfo, $is_new)) {
                         $response = '绑定店员成功!';
                     }
                 } catch (\Exception $e) {
@@ -91,6 +93,7 @@ public function wechatEventScan($message)
                     $qrcodeInfo = $wechatQrcodeService->qrcodeInfo($qrInfo['third_id']);
                     $spreadUid = $qrcodeInfo['uid'];
                     $spreadInfo = $userService->get($spreadUid);
+                    $is_new = $wechatUser->saveUser($message->FromUserName);
                     $uid = $wechatUser->getFieldValue($message->FromUserName, 'openid', 'uid', ['user_type', '<>', 'h5']);
                     $userInfo = $userService->get($uid);
                     if ($qrcodeInfo['status'] == 0 || $qrcodeInfo['is_del'] == 1 || ($qrcodeInfo['end_time'] < time() && $qrcodeInfo['end_time'] > 0)) {
@@ -101,7 +104,7 @@ public function wechatEventScan($message)
                         $response = '用户不存在';
                     } else if (!$spreadInfo) {
                         $response = '上级用户不存在';
-                    } else if ($loginService->updateUserInfo(['code' => $spreadUid], $userInfo)) {
+                    } else if ($loginService->updateUserInfo(['code' => $spreadUid], $userInfo, $is_new)) {
                         //写入扫码记录,返回内容
                         $response = $wechatQrcodeService->wechatQrcodeRecord($qrcodeInfo, $userInfo, $spreadInfo);
                     }

crmeb/app/services/order/StoreOrderRefundServices.php

@@ -894,22 +894,26 @@ public function applyRefund(int $id, int $uid, $order = [], array $cart_ids = []
                 }
                 $refund_num = bcadd((string)$refund_num, (string)$cart['cart_num'], 0);
             }
-            /** @var StoreOrderSplitServices $storeOrderSpliteServices */
-            $storeOrderSpliteServices = app()->make(StoreOrderSplitServices::class);
-            $cartInfos = $storeOrderSpliteServices->getSplitOrderCartInfo($id, $cart_ids, $order);
-            $total_price = $pay_postage = 0;
-            foreach ($cartInfos as $cart) {
-                $_info = is_string($cart['cart_info']) ? json_decode($cart['cart_info'], true) : $cart['cart_info'];
-                $total_price = bcadd((string)$total_price, bcmul((string)($_info['truePrice'] ?? 0), (string)$cart['cart_num'], 4), 2);
-                $pay_postage = bcadd((string)$pay_postage, (string)($_info['postage_price'] ?? 0), 2);
-            }
-            $refund_pay_price = bcadd((string)$total_price, (string)$pay_postage, 2);
-            //订单实际支付金额
-            $order_pay_price = bcsub((string)bcadd((string)$order['total_price'], (string)$order['pay_postage'], 2), (string)bcadd((string)$order['deduction_price'], (string)$order['coupon_price'], 2), 2);
-            if ($order_pay_price != $order['pay_price'] && $refund_pay_price != $order_pay_price) {//有改价
-                $refund_price = bcmul((string)bcdiv((string)$order['pay_price'], (string)$order_pay_price, 4), (string)$refund_pay_price, 2);
-            } else {
-                $refund_price = $refund_pay_price;
+            //总共申请多少件
+            $total_num = array_sum(array_column($cart_ids, 'cart_num'));
+            if ($total_num < $order['total_num']) {
+                /** @var StoreOrderSplitServices $storeOrderSpliteServices */
+                $storeOrderSpliteServices = app()->make(StoreOrderSplitServices::class);
+                $cartInfos = $storeOrderSpliteServices->getSplitOrderCartInfo($id, $cart_ids, $order);
+                $total_price = $pay_postage = 0;
+                foreach ($cartInfos as $cart) {
+                    $_info = is_string($cart['cart_info']) ? json_decode($cart['cart_info'], true) : $cart['cart_info'];
+                    $total_price = bcadd((string)$total_price, bcmul((string)($_info['truePrice'] ?? 0), (string)$cart['cart_num'], 4), 2);
+                    $pay_postage = bcadd((string)$pay_postage, (string)($_info['postage_price'] ?? 0), 2);
+                }
+                $refund_pay_price = bcadd((string)$total_price, (string)$pay_postage, 2);
+                //订单实际支付金额
+                $order_pay_price = bcsub((string)bcadd((string)$order['total_price'], (string)$order['pay_postage'], 2), (string)bcadd((string)$order['deduction_price'], (string)$order['coupon_price'], 2), 2);
+                if ($order_pay_price != $order['pay_price'] && $refund_pay_price != $order_pay_price) {//有改价
+                    $refund_price = bcmul((string)bcdiv((string)$order['pay_price'], (string)$order_pay_price, 4), (string)$refund_pay_price, 2);
+                } else {
+                    $refund_price = $refund_pay_price;
+                }
             }
         } else {
             foreach ($cartInfos as $cart) {

crmeb/app/services/order/StoreOrderServices.php

@@ -1487,6 +1487,7 @@ public function getOrderConfirmData(array $user, $cartId, bool $new, int $addres
         } else {
             $addr = [];
         }
+        if ($shipping_type == 2) $addr = [];
         /** @var StoreCartServices $cartServices */
         $cartServices = app()->make(StoreCartServices::class);
         $cartGroup = $cartServices->getUserProductCartListV1($user['uid'], $cartId, $new, $addr, $shipping_type);

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

@@ -187,7 +187,7 @@ public function menus($pid = '')
      */
     public function createData($data)
     {
-        if ($this->dao->getOne(['cate_name' => $data['cate_name']])) {
+        if ($this->dao->getOne(['cate_name' => $data['cate_name'], 'pid' => $data['pid']])) {
             throw new AdminException('该分类已经存在');
         }
         $data['add_time'] = time();
@@ -203,7 +203,7 @@ public function createData($data)
      */
     public function editData($id, $data)
     {
-        $cate = $this->dao->getOne(['cate_name' => $data['cate_name']]);
+        $cate = $this->dao->getOne(['cate_name' => $data['cate_name'], 'pid' => $data['pid']]);
         if ($cate && $cate['id'] != $id) {
             throw new AdminException('该分类已存在');
         }

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

@@ -252,7 +252,7 @@ public function getInfo(int $id)
         $productInfo['give_integral'] = floatval($productInfo['give_integral']);
         $productInfo['presale'] = boolval($productInfo['presale'] ?? 0);
         $productInfo['vip_product'] = boolval($productInfo['vip_product'] ?? 0);
-        $productInfo['presale_time'] = $productInfo['presale_start_time'] == 0 ? [] : [date('Y-m-d M:i:s', $productInfo['presale_start_time']), date('Y-m-d M:i:s', $productInfo['presale_end_time'])];
+        $productInfo['presale_time'] = $productInfo['presale_start_time'] == 0 ? [] : [date('Y-m-d H:i:s', $productInfo['presale_start_time']), date('Y-m-d H:i:s', $productInfo['presale_end_time'])];
         $productInfo['description'] = $storeDescriptionServices->getDescription(['product_id' => $id, 'type' => 0]);
         $productInfo['custom_form'] = json_decode($productInfo['custom_form'], true);
         /** @var StoreProductAttrServices $storeProductAttrServices */

crmeb/app/services/shipping/ExpressServices.php

@@ -33,6 +33,20 @@ class ExpressServices extends BaseServices
 {
     public $_cacheKey = "plat_express_list";
 
+    //物流查询物流公司code
+    public $express_code = [
+        'yunda' => 'yunda',
+        'yundakuaiyun' => 'yunda56',
+        'ems' => 'EMS',
+        'youzhengguonei' => 'chinapost',
+        'huitongkuaidi' => 'HTKY',
+        'baishiwuliu' => 'BSKY',
+        'shentong' => 'STO',
+        'jd' => 'JD',
+        'zhongtong' => 'ZTO',
+        'zhongtongkuaiyun' => 'ZTO56',
+    ];
+
     /**
      * 构造方法
      * ExpressServices constructor.
@@ -63,6 +77,7 @@ public function apiExpressList()
     {
         return $this->dao->getExpressList([], '*', 0, 0);
     }
+
     /**
      * 物流表单
      * @param array $formData
@@ -164,7 +179,7 @@ public function expressSelectForm(array $where = [])
 
     public function expressList($where = [])
     {
-        if(empty($where)) $where =  ['is_show' => 1];
+        if (empty($where)) $where = ['is_show' => 1];
         return $this->dao->getExpressList($where, 'id,name,code,partner_id,partner_key,net,account,key,net_name', 0, 0);
     }
 
@@ -180,6 +195,7 @@ public function query(string $cacheName, string $expressNum, string $com = null)
         $resultData = CacheService::get($cacheName, null);
         if ($resultData === null || !is_array($resultData)) {
             $data = [];
+            $com = $this->express_code[$com] ?? '';
             $cacheTime = 0;
             switch ((int)sys_config('logistics_type')) {
                 case 1:
@@ -196,7 +212,7 @@ public function query(string $cacheName, string $expressNum, string $com = null)
                     }
                     break;
                 case 2:
-                    $result = ExpressService::query($expressNum);
+                    $result = ExpressService::query($expressNum, $com);
                     if (is_array($result) &&
                         isset($result['result']) &&
                         isset($result['result']['deliverystatus']) &&