v1.1.43

README.md

@@ -10,7 +10,41 @@
 
 ## 更新日志
 
+### v1.1.43
+
+```
+优化：mysql5.7环境数据排序问题
+优化：秒杀商品不允许付款减库存
+优化：小票打印机API记录日志
+优化：调整拼团拼单失效时间
+修复：后台订单导出未下载问题
+修复：后台添加角色cdn资源加载超时
+修复：后台分销提现列表打款方式
+修复：拼团订单手动退款权限问题
+修复：验证会员等级权重是否存在
+修复：超管后台判断商家用户名重复
+--------------------------------
+注：本次更新须重新发布小程序
+```
+
+### v1.1.42 
+
+```
+新增：分享小程序直播间绑定分销关系
+修复：小程序端ID selectors报错问题
+修复：后台直播间管理置顶报错
+修复：取消确认弹框后未关闭loading
+修复：直播间列表为空时同步失败
+修复：收货地址过长发送订阅消息失败
+修复：后台审核拼团订单退货报错
+修复：小程序端未配置订阅消息提交表单
+修复：小程序端秒杀商品分享时无标题
+--------------------------------
+注：本次更新须重新发布小程序
+```
+
 ### v1.1.41
+
 ```
 新增：微信小程序订阅消息
 修复：多开小程序直播间同步ID问题

doc/database/upgrade/v1.1.43.sql

@@ -0,0 +1,2 @@
+
+UPDATE `yoshop_store_access` SET `url`='apps.sharing.order.operate/refund' WHERE (`access_id`='10323');

doc/更新日志.txt

@@ -1,4 +1,20 @@
 
+### v1.1.43 更新日志 ###
+
+优化：mysql5.7环境数据排序问题
+优化：秒杀商品不允许付款减库存
+优化：小票打印机API记录日志
+优化：调整拼团拼单失效时间
+修复：后台订单导出未下载问题
+修复：后台添加角色cdn资源加载超时
+修复：后台分销提现列表打款方式
+修复：拼团订单手动退款权限问题
+修复：验证会员等级权重是否存在
+修复：超管后台判断商家用户名重复
+--------------------------------
+注：本次更新须重新发布小程序
+
+
 ### v1.1.42 更新日志 ###
 
 新增：分享小程序直播间绑定分销关系

source/application/admin/model/Wxapp.php

@@ -53,7 +53,7 @@ class Wxapp extends WxappModel
             $this->error = '确认密码不正确';
             return false;
         }
-        if (StoreUser::checkExist($data['store_name'])) {
+        if (StoreUser::checkExist($data['user_name'])) {
             $this->error = '商家用户名已存在';
             return false;
         }

source/application/api/model/bargain/Active.php

@@ -100,7 +100,7 @@ class Active extends ActiveModel
         ], $param);
         // 排序规则
         if ($params['sortType'] === 'all') {
-            $this->order(['sort' => 'asc']);
+            $this->order(['sort' => 'asc', $this->getPk() => 'desc']);
         } elseif ($params['sortType'] === 'sales') {
             $this->order(['active_sales' => 'desc']);
         } elseif ($params['sortType'] === 'price') {
@@ -112,7 +112,7 @@ class Active extends ActiveModel
             ->where('end_time', '>=', time())
             ->where('status', '=', 1)
             ->where('is_delete', '=', 0)
-            ->order(['sort' => 'asc'])
+            ->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->paginate($params['listRows'], false, [
                 'query' => \request()->request()
             ]);

source/application/common.php

@@ -224,7 +224,7 @@ function export_excel($fileName, $tileArray = [], $dataArray = [])
     // ob_end_clean();
     ob_start();
     header("Content-Type: text/csv");
-    header("Content-Disposition:filename=" . $fileName);
+    header("Content-Disposition:attachment;filename=" . $fileName);
     $fp = fopen('php://output', 'w');
     fwrite($fp, chr(0xEF) . chr(0xBB) . chr(0xBF));// 转码 防止乱码(比如微信昵称)
     fputcsv($fp, $tileArray);
@@ -266,7 +266,7 @@ function get_version()
 {
     static $version = null;
     if ($version) {
-        return $version;
+        return $version['version'];
     }
     $file = dirname(ROOT_PATH) . '/version.json';
     if (!file_exists($file)) {

source/application/common/enum/dealer/withdraw/PayType.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\enum\dealer\withdraw;
+
+use app\common\enum\EnumBasics;
+
+/**
+ * 枚举类：分销商提现打款方式
+ * Class PayType
+ * @package app\common\enum\dealer\withdraw
+ */
+class PayType extends EnumBasics
+{
+    // 微信
+    const WECHAT = 10;
+
+    // 支付宝
+    const ALIPAY = 20;
+
+    // 银行卡
+    const BANK_CARD = 30;
+
+    /**
+     * 获取枚举类型值
+     * @return array
+     */
+    public static function data()
+    {
+        return [
+            self::WECHAT => [
+                'name' => '微信',
+                'value' => self::WECHAT,
+            ],
+            self::ALIPAY => [
+                'name' => '支付宝',
+                'value' => self::ALIPAY,
+            ],
+            self::BANK_CARD => [
+                'name' => '银行卡',
+                'value' => self::BANK_CARD,
+            ]
+        ];
+    }
+
+}

source/application/common/library/printer/engine/Feie.php

@@ -2,6 +2,7 @@
 
 namespace app\common\library\printer\engine;
 
+use app\common\library\helper;
 use app\common\library\printer\party\FeieHttpClient;
 
 /**
@@ -36,11 +37,15 @@ class Feie extends Basics
             return false;
         }
         // 处理返回结果
-        $result = json_decode($client->getContent());
+        $result = helper::jsonDecode($client->getContent());
-        log_write($result);
+        // 记录日志
+        log_write([
+            'describe' => 'Feie PrintTicket',
+            'result' => $result
+        ]);
         // 返回状态
-        if ($result->ret != 0) {
+        if ($result['ret'] != 0) {
-            $this->error = $result->msg;
+            $this->error = $result['msg'];
             return false;
         }
         return true;

source/application/common/library/printer/engine/PrintCenter.php

@@ -2,7 +2,13 @@
 
 namespace app\common\library\printer\engine;
 
+use app\common\library\helper;
 
+/**
+ * 365云打印引擎
+ * Class PrintCenter
+ * @package app\common\library\printer\engine
+ */
 class PrintCenter extends Basics
 {
     /** @const API地址 */
@@ -31,11 +37,15 @@ class PrintCenter extends Basics
         // API请求：开始打印
         $result = file_get_contents(self::API, false, $context);
         // 处理返回结果
-        $result = json_decode($result);
+        $result = helper::jsonDecode($result);
-        log_write($result);
+        // 记录日志
+        log_write([
+            'describe' => 'PrintCenter(365) PrintTicket',
+            'result' => $result
+        ]);
         // 返回状态
-        if ($result->responseCode != 0) {
+        if ($result['responseCode'] != 0) {
-            $this->error = $result->msg;
+            $this->error = $result['msg'];
             return false;
         }
         return true;

source/application/common/model/Delivery.php

@@ -40,7 +40,7 @@ class Delivery extends BaseModel
     public static function getAll()
     {
         $model = new static;
-        return $model->order(['sort' => 'asc'])->select();
+        return $model->order(['sort' => 'asc', $model->getPk() => 'desc'])->select();
     }
 
     /**
@@ -51,7 +51,7 @@ class Delivery extends BaseModel
     public function getList()
     {
         return $this->with(['rule'])
-            ->order(['sort' => 'asc'])
+            ->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->paginate(15, false, [
                 'query' => Request::instance()->request()
             ]);
@@ -80,7 +80,7 @@ class Delivery extends BaseModel
     {
         return $this->with(['rule'])
             ->where('delivery_id', 'in', $deliveryIds)
-            ->order(['sort' => 'asc'])
+            ->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->select();
     }
 

source/application/common/model/Express.php

@@ -21,7 +21,7 @@ class Express extends BaseModel
     public static function getAll()
     {
         $model = new static;
-        return $model->order(['sort' => 'asc'])->select();
+        return $model->order(['sort' => 'asc', $this->getPk() => 'desc'])->select();
     }
 
     /**
@@ -31,7 +31,7 @@ class Express extends BaseModel
      */
     public function getList()
     {
-        return $this->order(['sort' => 'asc'])
+        return $this->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->paginate(15, false, [
                 'query' => Request::instance()->request()
             ]);

source/application/common/model/Printer.php

@@ -65,7 +65,7 @@ class Printer extends BaseModel
     public static function getAll()
     {
         return (new static)->where('is_delete', '=', 0)
-            ->order(['sort' => 'asc'])->select();
+            ->order(['sort' => 'asc', $this->getPk() => 'desc'])->select();
     }
 
     /**
@@ -76,7 +76,7 @@ class Printer extends BaseModel
     public function getList()
     {
         return $this->where('is_delete', '=', 0)
-            ->order(['sort' => 'asc'])
+            ->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->paginate(15, false, [
                 'query' => Request::instance()->request()
             ]);

source/application/common/model/WxappHelp.php

@@ -20,7 +20,7 @@ class WxappHelp extends BaseModel
      */
     public function getList()
     {
-        return $this->order(['sort' => 'asc'])->select();
+        return $this->order(['sort' => 'asc', $this->getPk() => 'desc'])->select();
     }
 
     /**

source/application/common/model/sharp/Goods.php

@@ -58,7 +58,7 @@ class Goods extends BaseModel
         $list = $this->with(['sku'])
             ->where('sharp_goods_id', 'in', $goodsIds)
             ->where('is_delete', '=', 0)
-            ->order(['sort' => 'asc'])
+            ->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->paginate($param['limit'], false, [
                 'query' => \request()->request()
             ]);

source/application/common/model/user/Grade.php

@@ -105,6 +105,7 @@ class Grade extends BaseModel
         $model = new static;
         $gradeId > 0 && $model->where('grade_id', '<>', (int)$gradeId);
         return $model->where('weight', '=', (int)$weight)
+            ->where('is_delete', '=', 0)
             ->value('grade_id');
     }
 

source/application/store/model/ReturnAddress.php

@@ -18,7 +18,7 @@ class ReturnAddress extends ReturnAddressModel
      */
     public function getList()
     {
-        return $this->order(['sort' => 'asc'])
+        return $this->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->where('is_delete', '=', 0)
             ->paginate(15, false, [
                 'query' => \request()->request()
@@ -34,7 +34,7 @@ class ReturnAddress extends ReturnAddressModel
      */
     public function getAll()
     {
-        return $this->order(['sort' => 'asc'])
+        return $this->order(['sort' => 'asc', $this->getPk() => 'desc'])
             ->where('is_delete', '=', 0)
             ->select();
     }

source/application/store/model/dealer/Withdraw.php

@@ -8,6 +8,7 @@ use app\common\model\dealer\Withdraw as WithdrawModel;
 use app\common\library\wechat\WxPay;
 use app\common\service\Order as OrderService;
 use app\common\service\Message as MessageService;
+use app\common\enum\dealer\withdraw\PayType as PayTypeEnum;
 use app\common\enum\dealer\withdraw\ApplyStatus as ApplyStatusEnum;
 
 /**
@@ -34,7 +35,7 @@ class Withdraw extends WithdrawModel
      */
     public function getPayTypeAttr($value)
     {
-        return ['text' => ApplyStatusEnum::data()[$value]['name'], 'value' => $value];
+        return ['text' => PayTypeEnum::data()[$value]['name'], 'value' => $value];
     }
 
     /**

source/application/store/view/apps/dealer/withdraw/index.php

@@ -77,7 +77,7 @@
                                     <p>手机号</p>
                                 </th>
                                 <th>提现金额</th>
-                                <th>提现方式</th>
+                                <th>打款方式</th>
                                 <th>提现信息</th>
                                 <th class="am-text-center">审核状态</th>
                                 <th>申请时间</th>

source/application/store/view/apps/sharp/goods/step2.php

@@ -136,14 +136,14 @@
                                 <div class="am-u-sm-9 am-u-md-6 am-u-lg-5 am-u-end">
                                     <label class="am-radio-inline">
                                         <input type="radio" name="goods[deduct_stock_type]" value="10" data-am-ucheck
-                                            <?= $goods['deduct_stock_type'] == 10 ? 'checked' : '' ?> >
+                                            checked>
                                         下单减库存
                                     </label>
-                                    <label class="am-radio-inline">
+                                    <!-- <label class="am-radio-inline">
                                         <input type="radio" name="goods[deduct_stock_type]" value="20" data-am-ucheck
                                             <?= $goods['deduct_stock_type'] == 20 ? 'checked' : '' ?> >
                                         付款减库存
-                                    </label>
+                                    </label> -->
                                 </div>
                             </div>
 

source/application/store/view/setting/express/company.php

@@ -1854,6 +1854,11 @@
                                 <td>jixianda
                                 </td>
                             </tr>
+                            <tr>
+                                <td>极兔速递</td>
+                                <td>jtexpress
+                                </td>
+                            </tr>
                             <tr>
                                 <td>凡宇快递</td>
                                 <td>fanyukuaidi

source/application/store/view/store/role/add.php

@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css"/>
+<link rel="stylesheet" href="assets/common/plugins/jstree/themes/default/style.min.css"/>
 <div class="row-content am-cf">
     <div class="row">
         <div class="am-u-sm-12 am-u-md-12 am-u-lg-12">

source/application/store/view/store/role/edit.php

@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.2.1/themes/default/style.min.css"/>
+<link rel="stylesheet" href="assets/common/plugins/jstree/themes/default/style.min.css"/>
 <div class="row-content am-cf">
     <div class="row">
         <div class="am-u-sm-12 am-u-md-12 am-u-lg-12">

source/application/task/behavior/sharing/Active.php

@@ -45,7 +45,7 @@ class Active
                 }
             } catch (\Exception $e) {
             }
-            Cache::set('__task_space__sharing_active__' . $model::$wxapp_id, time(), 1);
+            Cache::set('__task_space__sharing_active__' . $model::$wxapp_id, time(), 10);
         }
         return true;
     }

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.42"
+  "version": "1.1.43"
 }