Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

crmeb/app/adminapi/controller/PublicController.php

@@ -12,6 +12,8 @@
 namespace app\adminapi\controller;
 
 
+use app\Request;
+use app\services\system\attachment\SystemAttachmentServices;
 use crmeb\services\CacheService;
 use think\Response;
 
@@ -44,4 +46,28 @@ class PublicController
     {
         return app('json')->success(getWorkerManUrl());
     }
+
+    /**
+     * 扫码上传
+     * @param Request $request
+     * @param int $upload_type
+     * @param int $type
+     * @return Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/13
+     */
+    public function scanUpload(Request $request, $upload_type = 0, $type = 0)
+    {
+        [$file, $uploadToken] = $request->postMore([
+            ['file', 'file'],
+            ['uploadToken', '']
+        ], true);
+        $service = app()->make(SystemAttachmentServices::class);
+        if ($service->cacheDriver()->get('scan_upload') != $uploadToken) {
+            return app('json')->fail(410086);
+        }
+        $service->upload(0, $file, $upload_type, $type, '', $uploadToken);
+        return app('json')->success(100032);
+    }
 }

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

@@ -135,4 +135,50 @@ class SystemAttachment extends AuthController
         $res = $this->service->videoUpload($data, $_FILES['file']);
         return app('json')->success($res);
     }
+
+    /**
+     * 获取扫码上传页面链接以及参数
+     * @return \think\Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/13
+     */
+    public function scanUploadQrcode()
+    {
+        $uploadToken = md5(time());
+        $this->service->cacheDriver()->set('scan_upload', $uploadToken, 600);
+        $url = sys_config('site_url') . '/app/upload?token=' . $uploadToken;
+        return app('json')->success(['url' => $url]);
+    }
+
+    /**
+     * 获取扫码上传的图片数据
+     * @param $scan_token
+     * @return \think\Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/13
+     */
+    public function scanUploadImage($scan_token)
+    {
+        return app('json')->success($this->service->scanUploadImage($scan_token));
+    }
+
+    /**
+     * 网络图片上传
+     * @return \think\Response
+     * @throws \Exception
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/13
+     */
+    public function onlineUpload()
+    {
+        $data = $this->request->postMore([
+            ['pid', 0],
+            ['images', []]
+        ]);
+        $this->service->onlineUpload($data);
+        return app('json')->success(100032);
+    }
 }

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

@@ -252,7 +252,10 @@ class StoreOrder extends AuthController
             ['sh_delivery_id', ''],//送货人电话
             ['sh_delivery_uid', ''],//送货人ID
 
-            ['fictitious_content', '']//虚拟发货内容
+            ['fictitious_content', ''],//虚拟发货内容
+
+            ['day_type', 0], //顺丰传 0今天，1明天，2后台
+            ['pickup_time', []],//开始时间 9:00，结束时间 10:00  开始时间和结束时间之间不能小于一个小时
         ]);
         return app('json')->success(100010, $services->delivery((int)$id, $data));
     }
@@ -286,7 +289,10 @@ class StoreOrder extends AuthController
 
             ['fictitious_content', ''],//虚拟发货内容
 
-            ['cart_ids', []]
+            ['cart_ids', []],
+
+            ['day_type', 0], //顺丰传 0今天，1明天，2后台
+            ['pickup_time', []],//开始时间 9:00，结束时间 10:00  开始时间和结束时间之间不能小于一个小时
         ]);
         if (!$id) {
             return app('json')->fail(100100);

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

@@ -19,6 +19,7 @@ use app\services\product\product\StoreProductServices;
 use crmeb\services\FileService;
 use app\services\other\UploadService;
 use think\facade\App;
+use think\Request;
 
 /**
  * Class StoreProduct
@@ -339,10 +340,21 @@ class StoreProduct extends AuthController
      * @return mixed
      * @throws \Exception
      */
-    public function getTempKeys()
+    public function getTempKeys(Request $request)
     {
         $upload = UploadService::init();
-        $re = $upload->getTempKeys();
+        $type = (int)sys_config('upload_type', 1);
+        $key = $request->get('key', '');
+        $path = $request->get('path', '');
+        $contentType = $request->get('contentType', '');
+        if ($type === 5) {
+            if (!$key || !$contentType) {
+                return app('json')->fail('缺少参数');
+            }
+            $re = $upload->getTempKeys($key, $path, $contentType);
+        } else {
+            $re = $upload->getTempKeys();
+        }
         return $re ? app('json')->success($re) : app('json')->fail(100016);
     }
 

crmeb/app/adminapi/route/file.php

@@ -42,6 +42,13 @@ Route::group('file', function () {
     Route::get('upload_type', 'v1.file.SystemAttachment/uploadType')->option(['real_name' => '上传类型']);
     //分片上传本地视频
     Route::post('video_upload', 'v1.file.SystemAttachment/videoUpload')->option(['real_name' => '分片上传本地视频']);
+
+    //获取扫码上传页面链接以及参数
+    Route::get('scan_upload/qrcode', 'v1.file.SystemAttachment/scanUploadQrcode')->option(['real_name' => '扫码上传页面链接']);
+    //获取扫码上传的图片数据
+    Route::get('scan_upload/image/:scan_token', 'v1.file.SystemAttachment/scanUploadImage')->option(['real_name' => '获取扫码上传的图片数据']);
+    //网络图片上传
+    Route::post('online_upload', 'v1.file.SystemAttachment/onlineUpload')->option(['real_name' => '网络图片上传']);
 })->middleware([
     \app\http\middleware\AllowOriginMiddleware::class,
     \app\adminapi\middleware\AdminAuthTokenMiddleware::class,

crmeb/app/adminapi/route/route.php

@@ -36,6 +36,10 @@ Route::group(function () {
     Route::get('get_workerman_url', 'PublicController/getWorkerManUrl')->option(['real_name' => '获取客服数据']);
     //测试
     Route::get('index', 'Test/index')->option(['real_name' => '测试地址']);
+
+    //扫码上传图片
+    Route::post('image/scan_upload', 'PublicController/scanUpload')->option(['real_name' => '扫码上传图片']);
+
 })->middleware(AllowOriginMiddleware::class)->option(['mark' => 'login', 'mark_name' => '登录相关']);
 
 /**

crmeb/app/api/controller/v1/order/StoreOrderController.php

@@ -716,6 +716,7 @@ class StoreOrderController
         if (!$order || $uid != $order['uid']) {
             return app('json')->fail(410173);
         }
+        if ($order['pid'] == -1) return app('json')->fail('主订单已拆单，请刷新页面');
         $refundData = [
             'refund_reason' => $data['text'],
             'refund_explain' => $data['refund_reason_wap_explain'],

crmeb/app/dao/system/attachment/SystemAttachmentDao.php

@@ -92,4 +92,20 @@ class SystemAttachmentDao extends BaseDao
     {
         $this->getModel()->whereTime('time', 'yesterday')->where('module_type', 2)->delete();
     }
+
+    /**
+     * 获取扫码上传的图片数据
+     * @param $scan_token
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/13
+     */
+    public function scanUploadImage($scan_token)
+    {
+        return $this->getModel()->where('scan_token', $scan_token)->field('att_dir,att_id')->select()->toArray();
+    }
 }

crmeb/app/services/message/notice/SmsService.php

@@ -66,12 +66,12 @@ class SmsService extends NoticeService
             $this->isOpen = $this->noticeInfo['is_sms'] === 1;
             $mark = $this->noticeInfo['mark'];
             if ($this->isOpen) {
-                try{
+                try {
                     /** @var SmsService $smsServices */
                     $smsServices = app()->make(SmsService::class);
                     $smsServices->send(true, $phone, $data, $mark);
                     return true;
-                }catch (\Throwable $e) {
+                } catch (\Throwable $e) {
                     Log::error('发送短信失败,失败原因:' . $e->getMessage());
                 }
                 //SmsJob::dispatch('doJob', [$phone, $data, $mark]);
@@ -111,7 +111,7 @@ class SmsService extends NoticeService
             }
             $smsMake = $services->sms($type);
             //发送短信
-            $res = $smsMake->send($phone, $templateId, $data);
+            $res = $smsMake->send($phone, $templateId, $data, sys_config('yihaotong_sms_appid', ''));
             if ($res === false) {
                 throw new ApiException($smsMake->getError());
             }

crmeb/app/services/order/StoreOrderDeliveryServices.php

@@ -440,6 +440,12 @@ class StoreOrderDeliveryServices extends BaseServices
         /** @var StoreOrderCartInfoServices $orderInfoServices */
         $orderInfoServices = app()->make(StoreOrderCartInfoServices::class);
         $storeName = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id);
+
+        if (count($data['pickup_time']) == 2) {
+            $data['pickup_start_time'] = $data['pickup_time'][0];
+            $data['pickup_end_time'] = $data['pickup_time'][1];
+        }
+
         // 发货信息录入
         $res = [];
         switch ($type) {
@@ -518,7 +524,7 @@ class StoreOrderDeliveryServices extends BaseServices
             if (!sys_config('config_export_open', 0)) {
                 throw new AdminException(400528);
             }
-            $dump = $expressService->express()->dump($expData);
+            $dump = $expressService->express()->dump($expData, sys_config('yihaotong_face_appid', ''));
             $orderInfo->delivery_id = $dump['kuaidinum'];
             $data['express_dump'] = json_encode([
                 'com' => $expData['com'],
@@ -561,16 +567,19 @@ class StoreOrderDeliveryServices extends BaseServices
             $expData['temp_id'] = $data['express_temp_id'];
             $expData['weight'] = $this->getOrderSumWeight($id);
             $expData['cargo'] = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id, true);
-            if (!sys_config('config_shippment_open', 0)) {
-                throw new AdminException('商家寄件未开启无法寄件');
-            }
-            $dump = $expressService->express()->shippmentCreateOrder($expData);
+            $expData['day_type'] = $data['day_type'];
+            $expData['pickup_start_time'] = $data['pickup_start_time'];
+            $expData['pickup_end_time'] = $data['pickup_end_time'];
+//            if (!sys_config('config_shippment_open', 0)) {
+//                throw new AdminException('商家寄件未开启无法寄件');
+//            }
+            $dump = $expressService->express()->shippmentCreateOrder($expData, sys_config('yihaotong_send_appid', ''));
             $orderInfo->delivery_id = $dump['kuaidinum'] ?? '';
             $data['express_dump'] = json_encode([
-                'com' => $expData['com'],
-                'from_name' => $expData['from_name'],
-                'from_tel' => $expData['from_tel'],
-                'from_addr' => $expData['from_addr'],
+                'com' => $expData['kuaidicom'],
+                'from_name' => $expData['send_real_name'],
+                'from_tel' => $expData['send_phone'],
+                'from_addr' => $expData['send_address'],
                 'temp_id' => $expData['temp_id'],
                 'cargo' => $expData['cargo'],
             ]);

crmeb/app/services/pay/OrderPayServices.php

@@ -106,7 +106,7 @@ class OrderPayServices
      */
     public function beforePay(array $orderInfo, string $payType, array $options = [])
     {
-        $wehcat = $payType == PayServices::WEIXIN_PAY;
+        $wechat = $payType == PayServices::WEIXIN_PAY;
 
         $payType = $this->getPayType($payType);
 
@@ -136,8 +136,8 @@ class OrderPayServices
                 $options['openid'] = $openid;
                 break;
             case PayServices::ALLIN_PAY:
-                if ($wehcat) {
-                    $options['wechat'] = $wehcat;
+                if ($wechat) {
+                    $options['wechat'] = $wechat;
                 }
                 break;
         }

crmeb/app/services/product/product/CopyTaobaoServices.php

@@ -55,7 +55,7 @@ class CopyTaobaoServices extends BaseServices
             case 1://平台
                 /** @var ServeServices $services */
                 $services = app()->make(ServeServices::class);
-                $resultData = $services->copy('copy')->goods($url);
+                $resultData = $services->copy('copy')->goods($url, sys_config('yihaotong_copy_appid', ''));
                 if (isset($resultData['description_image']) && is_string($resultData['description_image'])) {
                     $resultData['description_image'] = json_decode($resultData['description_image'], true);
                 }

crmeb/app/services/shipping/ExpressServices.php

@@ -203,7 +203,7 @@ class ExpressServices extends BaseServices
                 case 1:
                     /** @var ServeServices $services */
                     $services = app()->make(ServeServices::class);
-                    $result = $services->express()->query($expressNum, $com, $phone);
+                    $result = $services->express()->query($expressNum, $com, $phone, sys_config('yihaotong_express_appid', ''));
                     if (isset($result['ischeck']) && $result['ischeck'] == 1) {
                         $cacheTime = 0;
                     } else {

crmeb/app/services/system/attachment/SystemAttachmentServices.php

@@ -14,6 +14,7 @@ namespace app\services\system\attachment;
 
 use app\services\BaseServices;
 use app\dao\system\attachment\SystemAttachmentDao;
+use app\services\product\product\CopyTaobaoServices;
 use crmeb\exceptions\AdminException;
 use crmeb\exceptions\ApiException;
 use crmeb\exceptions\UploadException;
@@ -25,6 +26,7 @@ use app\services\other\UploadService;
  * @package app\services\attachment
  * @method getYesterday() 获取昨日生成数据
  * @method delYesterday() 删除昨日生成数据
+ * @method scanUploadImage($scan_token) 获取扫码上传的图片数据
  */
 class SystemAttachmentServices extends BaseServices
 {
@@ -109,7 +111,7 @@ class SystemAttachmentServices extends BaseServices
      * @param int $type
      * @return mixed
      */
-    public function upload(int $pid, string $file, int $upload_type, int $type, $menuName)
+    public function upload(int $pid, string $file, int $upload_type, int $type, $menuName, $uploadToken = '')
     {
         $realName = false;
         if ($upload_type == 0) {
@@ -139,6 +141,7 @@ class SystemAttachmentServices extends BaseServices
                     $data['module_type'] = 1;
                     $data['time'] = $fileInfo['time'] ?? time();
                     $data['pid'] = $pid;
+                    $data['scan_token'] = $uploadToken;
                     $this->dao->save($data);
                 }
                 return $res->filePath;
@@ -282,4 +285,54 @@ class SystemAttachmentServices extends BaseServices
         }
         return $res;
     }
+
+    /**
+     * 网络图片上传
+     * @param $data
+     * @return bool
+     * @throws \Exception
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/06/13
+     */
+    public function onlineUpload($data)
+    {
+        //生成附件目录
+        if (make_path('attach', 3, true) === '') {
+            throw new AdminException(400555);
+        }
+
+        //上传图片
+        /** @var SystemAttachmentServices $systemAttachmentService */
+        $systemAttachmentService = app()->make(SystemAttachmentServices::class);
+        $siteUrl = sys_config('site_url');
+
+        foreach ($data['images'] as $image) {
+            $uploadValue = app()->make(CopyTaobaoServices::class)->downloadImage($image);
+            if (is_array($uploadValue)) {
+                //TODO 拼接图片地址
+                if ($uploadValue['image_type'] == 1) {
+                    $imagePath = $siteUrl . $uploadValue['path'];
+                } else {
+                    $imagePath = $uploadValue['path'];
+                }
+                //写入数据库
+                if (!$uploadValue['is_exists']) {
+                    $systemAttachmentService->save([
+                        'name' => $uploadValue['name'],
+                        'real_name' => $uploadValue['name'],
+                        'att_dir' => $imagePath,
+                        'satt_dir' => $imagePath,
+                        'att_size' => $uploadValue['size'],
+                        'att_type' => $uploadValue['mime'],
+                        'image_type' => $uploadValue['image_type'],
+                        'module_type' => 1,
+                        'time' => time(),
+                        'pid' => $data['pid']
+                    ]);
+                }
+            }
+        }
+        return true;
+    }
 }

crmeb/crmeb/services/copyproduct/storage/Copy.php

@@ -49,12 +49,14 @@ class Copy extends BaseCopyProduct
     /** 复制商品
      * @param string $url
      * @param array $options
+     * @param string $yihaotongCopyAppid
      * @return mixed
      */
-    public function goods(string $url, array $options = [])
+    public function goods(string $url, array $options = [], string $yihaotongCopyAppid = '')
     {
         $param['url'] = $url;
-        return $this->accessToken->httpRequest(self::PRODUCT_GOODS, $param);
+        $header = $yihaotongCopyAppid != '' ? ['AppId:' . $yihaotongCopyAppid] : [];
+        return $this->accessToken->httpRequest(self::PRODUCT_GOODS, $param, 'post', true, $header);
     }
 
 

crmeb/crmeb/services/express/storage/Express.php

@@ -49,7 +49,7 @@ class Express extends BaseExpress
     //获取物流公司信息
     const SHIPMENT_KUAIDI_NUMS = 'v2/shipment/get_kuaidi_coms';
     //创建商家寄件订单
-    const SHIPMENT_CREATE_ORDER = 'v2/v2/shipment/create_order';
+    const SHIPMENT_CREATE_ORDER = 'v2/shipment/create_order';
     //取消商家寄件
     const SHIPMENT_CANCEL_ORDER = 'v2/shipment/cancel_order';
     //获取商家寄件订单列表
@@ -74,7 +74,17 @@ class Express extends BaseExpress
      */
     public function getKuaidiComs()
     {
-        return $this->accessToken->httpRequest(self::SHIPMENT_KUAIDI_NUMS, [], 'GET');
+        $list = $this->accessToken->httpRequest(self::SHIPMENT_KUAIDI_NUMS, [], 'GET');
+        foreach ($list as &$item) {
+            $item['code'] = $item['value'];
+            $item['value'] = $item['label'];
+            $num = 1;
+            foreach ($item['list'] as &$value) {
+                $value['title'] = $item['label'] . '模版' . $num;
+                $num++;
+            }
+        }
+        return $list;
     }
 
     /**
@@ -85,7 +95,7 @@ class Express extends BaseExpress
      * @email 136327134@qq.com
      * @date 2023/5/15
      */
-    public function shippmentCreateOrder(array $data)
+    public function shippmentCreateOrder(array $data, string $yihaotongSendAppid = '')
     {
         $siid = sys_config('config_export_siid');
         $param = [
@@ -99,11 +109,15 @@ class Express extends BaseExpress
             'call_back_url' => sys_config('site_url') . '/api/order_call_back',
             'return_type' => $siid ? '10' : '20',
             'siid' => $siid,
-            'tempid' => $data['tempid'],
+            'tempid' => $data['temp_id'],
             'cargo' => $data['cargo'],
             'weight' => $data['weight'],
+            'day_type' => $data['day_type'],
+            'pickup_start_time' => $data['pickup_start_time'],
+            'pickup_end_time' => $data['pickup_end_time'],
         ];
-        return $this->accessToken->httpRequest(self::SHIPMENT_CREATE_ORDER, $param);
+        $header = $yihaotongSendAppid != '' ? ['AppId:' . $yihaotongSendAppid] : [];
+        return $this->accessToken->httpRequest(self::SHIPMENT_CREATE_ORDER, $param, 'post', true, $header);
     }
 
     /**
@@ -202,7 +216,7 @@ class Express extends BaseExpress
      * @return 物流状态：status 0在途，1揽收，2疑难，3签收，4退签，5派件，6退回，7转单，10待清关，11清关中，12已清关，13清关异常，14收件人拒签
      * @return 物流详情 content
      */
-    public function query(string $num, string $com = '', $phone = '')
+    public function query(string $num, string $com = '', $phone = '', $yihaotongExpressAppid = '')
     {
         $param = [
             'com' => $com,
@@ -212,15 +226,20 @@ class Express extends BaseExpress
         if ($com === null) {
             unset($param['com']);
         }
-        return $this->accessToken->httpRequest(self::EXPRESS_QUERY, $param);
+        $header = $yihaotongExpressAppid != '' ? ['AppId:' . $yihaotongExpressAppid] : [];
+        return $this->accessToken->httpRequest(self::EXPRESS_QUERY, $param, 'post', true, $header);
     }
 
     /**
      * 电子面单打印
      * @param array $data 必需参数: com(快递公司编码)、to_name(寄件人)、to_tel（寄件人电话）、to_addr（寄件人详细地址）、from_name（收件人）、from_tel（收件人电话)、from_addr（收件人地址）、temp_id（电子面单模板ID）、siid（云打印机编号）、count（商品数量）
+     * @param string $yihaotongFaceAppid
      * @return bool|mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
-    public function dump($data)
+    public function dump($data, $yihaotongFaceAppid = '')
     {
         $param = $data;
         $param['com'] = $data['com'] ?? '';
@@ -264,6 +283,7 @@ class Express extends BaseExpress
         if (!sys_config('config_export_siid')) {
             $header = ['version:v1.1'];
         }
+        $header = array_merge($header, $yihaotongFaceAppid != '' ? ['AppId:' . $yihaotongFaceAppid] : []);
         return $this->accessToken->httpRequest(self::EXPRESS_DUMP, $param, 'POST', true, $header);
     }
 

crmeb/crmeb/services/pay/storage/AliPay.php

@@ -50,7 +50,7 @@ class AliPay extends BasePay implements PayInterface
             $code = true;
         }
 
-        return AliPayService::instance()->create($body, $orderId, $totalFee, $attach, $options['uitUrl'] ?? '', $options['siteUrl'] ?? '', $code);
+        return AliPayService::instance()->create($body, $orderId, $totalFee, $attach, $options['quitUrl'] ?? '', $options['siteUrl'] ?? '', $code);
     }
 
     /**

crmeb/crmeb/services/sms/storage/Yihaotong.php

@@ -196,26 +196,28 @@ class Yihaotong extends BaseSms
 
     /**
      * 发送短信
-     * @param $phone
-     * @param $template
-     * @param $param
+     * @param string $phone
+     * @param string $templateId
+     * @param array $data
+     * @param string $yihaotongSmsAppid
      * @return bool|string
      */
-    public function send(string $phone, string $templateId, array $data = [])
+    public function send(string $phone, string $templateId, array $data = [], string $yihaotongSmsAppid = '')
     {
         if (!$phone) {
             throw new AdminException(400719);
         }
         $param = [
             'phone' => $phone,
-            'host' =>  request()->host()
+            'host' => request()->host()
         ];
         $param['temp_id'] = $templateId;
         if (is_null($param['temp_id'])) {
             throw new AdminException(400720);
         }
         $param['param'] = json_encode($data);
-        return $this->accessToken->httpRequest(self::SMS_SEND, $param);
+        $header = $yihaotongSmsAppid != '' ? ['AppId:' . $yihaotongSmsAppid] : [];
+        return $this->accessToken->httpRequest(self::SMS_SEND, $param, 'post', true, $header);
     }
 
     /**

crmeb/crmeb/services/upload/extend/obs/Client.php

@@ -431,6 +431,7 @@ class Client extends BaseClient
         }
     }
 
+
     /**
      * 地域名称
      * @return \string[][]

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

@@ -345,19 +345,23 @@ class Jdoss extends BaseUpload
      * 获取OSS上传密钥
      * @return mixed|void
      */
-    public function getTempKeys($key = '', $path = '', $expires = '+10 minutes')
+    public function getTempKeys($key = '', $path = '', $contentType = '', $expires = '+10 minutes')
     {
         try {
             $app = $this->app();
-            $cmd = $app->getCommand([
+            $cmd = $app->getCommand(
                 'PutObject', [
                     'Bucket' => $this->storageName,
                     'Key' => $key,
-                    'SourceFile' => $path
+                    'SourceFile' => $path,
+                    'ContentType' => $contentType
                 ]
-            ]);
+            );
             $request = $app->createPresignedRequest($cmd, $expires);
-            return (string)$request->getUri();
+            return [
+                'url' => (string)$request->getUri(),
+                'type' => 'JDOSS'
+            ];
         } catch (\Throwable $e) {
             return $this->setError($e->getMessage());
         }

crmeb/crmeb/services/upload/storage/Obs.php

@@ -202,7 +202,7 @@ class Obs extends BaseUpload
     public function getDomian($name, $region)
     {
         try {
-            $res = $this->app()->GetBucketDomain($name, $region);
+            $res = $this->app()->getBucketDomain($name, $region);
             if ($res) {
                 $domainRules = $res->toArray()['ListBucketCustomDomainsResult'];
                 return array_column($domainRules, 'DomainName');
@@ -231,7 +231,7 @@ class Obs extends BaseUpload
     public function setBucketCors(string $name, string $region)
     {
         try {
-            $this->app()->PutBucketCors($name, $region, [
+            $this->app()->putBucketCors($name, $region, [
                 'AllowedHeader' => ['*'],
                 'AllowedMethod' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
                 'AllowedOrigin' => ['*'],
@@ -244,9 +244,17 @@ class Obs extends BaseUpload
         }
     }
 
+    /**
+     * @return array
+     * @date 2023/6/13
+     */
     public function getTempKeys()
     {
-        // TODO: Implement getTempKeys() method.
+        return [
+            'access_key' => $this->accessKey,
+            'secret_key' => $this->secretKey,
+            'type' => 'OBS'
+        ];
     }
 
     /**

crmeb/crmeb/services/upload/storage/Tyoss.php

@@ -331,7 +331,7 @@ class Tyoss extends BaseUpload
     public function getDomian($name, $region)
     {
         try {
-            $res = $this->app()->GetBucketDomain($name, $region);
+            $res = $this->app()->getBucketDomain($name, $region);
             if ($res) {
                 $domainRules = $res->toArray()['ListBucketCustomDomainsResult'];
                 return array_column($domainRules, 'DomainName');
@@ -360,7 +360,7 @@ class Tyoss extends BaseUpload
     public function setBucketCors(string $name, string $region)
     {
         try {
-            $this->app()->PutBucketCors($name, $region, [
+            $this->app()->putBucketCors($name, $region, [
                 'AllowedHeader' => ['*'],
                 'AllowedMethod' => ['PUT', 'GET', 'POST', 'DELETE', 'HEAD'],
                 'AllowedOrigin' => ['*'],
@@ -372,9 +372,18 @@ class Tyoss extends BaseUpload
             return $this->setError($e->getMessage());
         }
     }
+
+    /**
+     * @return array
+     * @date 2023/6/13
+     */
     public function getTempKeys()
     {
-        // TODO: Implement getTempKeys() method.
+        return [
+            'access_key' => $this->accessKey,
+            'secret_key' => $this->secretKey,
+            'type' => 'TYOSS'
+        ];
     }
 
     /**

crmeb/public/install/crmeb.sql

@@ -29451,6 +29451,7 @@ CREATE TABLE IF NOT EXISTS `eb_system_attachment` (
   `image_type` tinyint(1) UNSIGNED NOT NULL DEFAULT '1' COMMENT '图片上传类型 1本地 2七牛云 3OSS 4COS ',
   `module_type` tinyint(1) UNSIGNED NOT NULL DEFAULT '1' COMMENT '图片上传模块类型 1 后台上传 2 用户生成',
   `real_name` varchar(255) NOT NULL DEFAULT '' COMMENT '原始文件名',
+  `scan_token` varchar(32) NOT NULL DEFAULT '' COMMENT '扫码上传的token',
   PRIMARY KEY (`att_id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=92 DEFAULT CHARSET=utf8 COMMENT='附件管理表';
 
@@ -33605,8 +33606,8 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (116, 'order_seckill_time', 'text', 'number', 27, '', 0, '', 100, 0, '1', '秒杀未支付订单取消时间', '秒杀未支付订单取消时间，单位（小时），如果为0将使用默认活动取消时间，优先使用单独活动配置', 0, 1),
 (117, 'order_pink_time', 'text', 'number', 27, '', 0, '', 100, 0, '1', '拼团未支付取消订单时间', '拼团未支付取消订单时间,单位（小时），如果为0将使用默认活动取消时间，优先使用单独活动配置', 0, 1),
 (122, 'system_delivery_time', 'text', 'number', 27, '', 0, 'required:true,digits:true,min:0', 100, 0, '7', '自动收货时间', '系统自动收货时间,单位(天),0为不设置自动收货', 80, 1),
-(123, 'sms_account', 'text', 'input', 18, '', 0, '', 100, 0, '\"\"', '一号通账号', '短信后台的登录账号', 0, 1),
-(137, 'sms_token', 'text', 'input', 18, '', 0, '', 100, 0, '\"\"', '一号通密码', '短信后台的登录密码)', 0, 1),
+(123, 'sms_account', 'text', 'input', 18, '', 1, '', 0, 0, '\"\"', '一号通AccessKey', '一号通账号内创建的AccessKey', 10, 1),
+(137, 'sms_token', 'text', 'input', 18, '', 1, '', 0, 0, '\"\"', '一号通SecretKey', '一号通账号内创建的SecretKey', 9, 1),
 (138, 'h5_avatar', 'upload', 'input', 101, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/default_avatar.jpeg\"', '用户默认头像', '用户默认头像，后台添加用户以及用户登录的默认头像显示，尺寸(80*80)', 3, 1),
 (139, 'offline_pay_status', 'radio', 'input', 109, '1=>开启\n2=>关闭', 1, '', 0, 0, '\"1\"', '线下支付', '线下支付请选择开启或关闭', 89, 1),
 (141, 'recharge_switch', 'radio', 'input', 28, '1=>开启\n0=>关闭', 1, '', 0, 0, '0', '小程序充值开关', '仅小程序端的充值开关，小程序提交审核前,需要关闭此功能', 4, 1),
@@ -33764,7 +33765,19 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (435, 'icp_url', 'text', 'input', 26, '', 1, '', 0, 0, '\"https:\\/\\/beian.miit.gov.cn\"', 'ICP备案链接', 'H5和PC底部显示的ICP备案号点击跳转的链接', 9, 1),
 (436, 'network_security_url', 'text', 'input', 26, '', 1, '', 0, 0, '\"https:\\/\\/www.beian.gov.cn\"', '网安备案链接', 'H5和PC底部显示的网安备案号点击跳转的链接', 7, 1),
 (437, 'agent_apply_open', 'radio', 'input', 72, '1=>开启\n0=>关闭', 1, '', 0, 0, '1', '代理商申请开关', '控制移动端我的推广页面的代理商申请按钮是否显示', 0, 1),
-(438, 'order_shipping_open', 'radio', 'input', 7, '1=>开启\n0=>关闭', 1, '', 0, 0, '0', '小程序发货信息管理服务', '小程序有订单发货管理时，请打开此开关，否则会导致订单资金冻结', 0, 1);
+(438, 'order_shipping_open', 'radio', 'input', 7, '1=>开启\n0=>关闭', 1, '', 0, 0, '0', '小程序发货信息管理服务', '小程序有订单发货管理时，请打开此开关，否则会导致订单资金冻结', 0, 1),
+(440, 'jd_accessKey', 'text', 'input', 110, '', 1, '', 100, 0, '\"\"', '京东云accessKey', '京东云accessKey', 0, 1),
+(441, 'jd_secretKey', 'text', 'input', 110, '', 1, '', 100, 0, '\"\"', '京东云secretKey', '京东云secretKey', 0, 1),
+(442, 'hw_accessKey', 'text', 'input', 111, '', 1, '', 100, 0, '\"\"', '华为云accessKey', '华为云accessKey', 0, 1),
+(443, 'hw_secretKey', 'text', 'input', 111, '', 1, '', 100, 0, '\"\"', '华为云secretKey', '华为云secretKey', 0, 1),
+(444, 'ty_secretKey', 'text', 'input', 112, '', 1, '', 100, 0, '\"\"', '天翼云secretKey', '天翼云secretKey', 0, 1),
+(445, 'ty_accessKey', 'text', 'input', 112, '', 1, '', 100, 0, '\"\"', '天翼云accessKey', '天翼云accessKey', 0, 1),
+(446, 'coupon_return_open', 'radio', 'input', 27, '1=>退还\n0=>不退还', 1, '', 0, 0, '\"1\"', '优惠券退还状态', '优惠券是否退回开关，商品成功退款后，退回/不退回使用的优惠券', 0, 1),
+(447, 'yihaotong_sms_appid', 'text', 'input', 18, '', 1, '', 0, 0, '\"\"', '短信服务AppId', '一号通应用管理内短信服务的appid，不填写则使用默认的应用appid', 0, 1),
+(448, 'yihaotong_send_appid', 'text', 'input', 18, '', 1, '', 0, 0, '\"\"', '商家寄件AppId', '一号通应用管理内商家寄件的appid，不填写则使用默认的应用appid', 0, 1),
+(449, 'yihaotong_face_appid', 'text', 'input', 18, '', 1, '', 100, 0, '\"\"', '面单打印AppId', '一号通应用管理内面单打印的appid，不填写则使用默认的应用appid', 0, 1),
+(450, 'yihaotong_express_appid', 'text', 'input', 18, '', 1, '', 100, 0, '\"\"', '物流查询AppId', '一号通应用管理内物流查询的appid，不填写则使用默认的应用appid', 0, 1),
+(451, 'yihaotong_copy_appid', 'text', '', 18, '', 1, '', 100, 0, '\"\"', '商品采集AppId', '一号通应用管理内商品采集的appid，不填写则使用默认的应用appid', 0, 1);
 
 -- --------------------------------------------------------
 
@@ -33846,7 +33859,10 @@ INSERT INTO `eb_system_config_tab` (`id`, `pid`, `title`, `eng_title`, `status`,
 (106, 5, '机器翻译配置', 'online_translation', 1, 0, '', 0, 0),
 (107, 21, '飞鹅云配置', 'fey_config', 1, 0, '', 3, 0),
 (108, 23, '通联支付', 'allinpay', 1, 0, '', 3, 0),
-(109, 23, '基础配置', 'pay_basic', 1, 0, '', 3, 100);
+(109, 23, '基础配置', 'pay_basic', 1, 0, '', 3, 100),
+(110, 79, '京东云配置', 'jd_oss_config', 0, 0, '', 0, 0),
+(111, 79, '华为云配置', 'obs_config', 0, 0, '', 0, 0),
+(112, 79, '天翼云配置', 'ty_oss_config', 0, 0, '', 0, 0);
 
 -- --------------------------------------------------------
 

template/uni-app/pages/goods/cashier/index.vue

@@ -293,7 +293,7 @@
 					// #endif
 				}).then(res => {
 					let status = res.data.status,
-						orderId = res.data.result.orderId,
+						orderId = res.data.result.order_id,
 						jsConfig = res.data.result.jsConfig,
 						goPages = '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=' +
 						res
@@ -336,7 +336,7 @@
 								}
 							})
 							this.jumpData = {
-								orderId: res.data.result.orderId,
+								orderId: res.data.result.order_id,
 								msg: res.msg,
 							}
 							// #endif