同步应用模块

app/data/controller/User.php

@@ -2,6 +2,7 @@
 
 namespace app\data\controller;
 
+use app\data\service\UserService;
 use think\admin\Controller;
 
 /**
@@ -34,6 +35,15 @@ class User extends Controller
         $query->order('id desc')->equal('status')->dateBetween('create_at')->page();
     }
 
+    /**
+     * 数据列表处理
+     * @param array $data
+     */
+    protected function _page_filter(array &$data)
+    {
+        UserService::instance()->buildByUid($data, 'from', 'fromer');
+    }
+
     /**
      * 修改用户状态
      * @auth true

app/data/service/PaymentService.php

@@ -5,7 +5,6 @@ namespace app\data\service;
 use app\data\service\payment\AlipayPaymentService;
 use app\data\service\payment\JoinPaymentService;
 use app\data\service\payment\WechatPaymentService;
-use think\admin\Service;
 use think\App;
 use think\Container;
 use think\Exception;
@@ -158,30 +157,33 @@ abstract class PaymentService
         } elseif (stripos($type, 'joinpay_') === 0) {
             return static::$driver[$code] = Container::getInstance()->make(JoinPaymentService::class, $vars);
         } else {
-            throw new \think\Exception(sprintf('支付驱动[%s]未定义', $type));
+            throw new Exception(sprintf('支付驱动[%s]未定义', $type));
         }
     }
 
     /**
-     * 根据通道编号获取配置参数
+     * 获取通道配置参数
      * @param string $code
+     * @param array $payment
      * @return array [code,type,params]
      * @throws Exception
      */
-    public static function config(string $code): array
+    public static function config(string $code, array $payment = []): array
     {
         try {
-            $map = ['code' => $code, 'status' => 1, 'deleted' => 0];
-            $payment = app()->db->name('DataPayment')->where($map)->find();
             if (empty($payment)) {
-                throw new \think\Exception("支付通道[#{$code}]禁用关闭");
+                $map = ['code' => $code, 'status' => 1, 'deleted' => 0];
+                $payment = app()->db->name('DataPayment')->where($map)->find();
+            }
+            if (empty($payment)) {
+                throw new Exception("支付通道[#{$code}]禁用关闭");
             }
             $params = @json_decode($payment['content'], true);
             if (empty($params)) {
-                throw new \think\Exception("支付通道[#{$code}]配置无效");
+                throw new Exception("支付通道[#{$code}]配置无效");
             }
             if (empty(static::TYPES[$payment['type']])) {
-                throw new \think\Exception("支付通道[@{$payment['type']}]匹配失败");
+                throw new Exception("支付通道[@{$payment['type']}]匹配失败");
             }
             return [$payment['code'], $payment['type'], $params];
         } catch (\Exception $exception) {
@@ -233,10 +235,9 @@ abstract class PaymentService
      */
     protected function createPaymentAction(string $orderNo, string $paymentTitle, string $paymentAmount)
     {
-        // 创建支付记录
         $this->app->db->name('DataPaymentItem')->insert([
             'payment_code' => $this->code, 'payment_type' => $this->type,
-            'order_name'   => $paymentTitle, 'order_amount' => $paymentAmount, 'order_no' => $orderNo,
+            'order_amount' => $paymentAmount, 'order_name' => $paymentTitle, 'order_no' => $orderNo,
         ]);
     }
 

app/data/service/UserService.php

@@ -57,17 +57,13 @@ class UserService extends Service
      * @param string $type 接口类型
      * @param integer $uuid 用户UID
      * @return array
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function get(string $type, int $uuid): array
     {
         $user = $this->app->db->name('DataUser')->where(['id' => $uuid, 'deleted' => 0])->findOrEmpty();
-        $data = $this->app->db->name('DataUserToken')->where(['uid' => $uuid, 'type' => $type])->findOrEmpty();
+        $data = $this->app->db->name('DataUserToken')->where(['uid' => $uuid, 'type' => $type])->where(function ($query) {
-        [$state, $message] = $this->checkUserToken($type, $data['token'] ?? '', $data);
+            $query->where(['tokenv' => ''])->whereOr(['tokenv' => $this->_buildTokenVerify()]);
-        if (empty($state)) throw new \think\Exception($message);
+        })->findOrEmpty();
         unset($user['deleted'], $user['password']);
         $user['token'] = ['token' => $data['token'], 'expire' => $data['time']];
         return $user;
@@ -80,10 +76,7 @@ class UserService extends Service
      * @param string $type 接口类型
      * @param boolean $force 强刷令牌
      * @return array
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function set(array $map, array $data, string $type, bool $force = false): array
     {
@@ -170,7 +163,7 @@ class UserService extends Service
             return [0, '请重新登录，登录认证无效', 0, 0];
         } elseif ($data['time'] < time()) {
             return [0, '请重新登录，登录认证已失效', 0, 0];
-        } elseif ($data['tokenv'] !== $this->_buildTokenVerify()) {
+        } elseif ($data['tokenv'] !== $this->_buildTokenVerify() && $token !== 'token') {
             return [0, '请重新登录，客户端已更换', 0, 0];
         } else {
             $this->expireUserToken($type, $token);
@@ -191,7 +184,7 @@ class UserService extends Service
         if (count($list) < 1) return $list;
         $uids = array_unique(array_column($list, $keys));
         $users = $this->app->db->name('DataUser')->whereIn('id', $uids)->column($column, 'id');
-        foreach ($list as &$vo) $vo[$bind] = $users[$vo['uid']] ?? [];
+        foreach ($list as &$vo) $vo[$bind] = $users[$vo[$keys]] ?? [];
         return $list;
     }
 

app/data/view/payment/index_search.html

@@ -7,6 +7,7 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入通道名称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付方式</label>
             <div class="layui-input-inline">
@@ -21,11 +22,13 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'-- 全部 --','0'=>'已禁用的记录','1'=>'已激活的记录'] as $k=>$v}
+                    <option value="">-- 全部 --</option>
+                    {foreach ['已禁用的记录','已激活的记录'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -34,16 +37,18 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
+    <script>window.form.render()</script>
 </fieldset>
 
-<script>window.form.render()</script>

app/data/view/shop_order_send/index_search.html

@@ -7,29 +7,34 @@
                 <input name="member_phone" value="{:input('member_phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">用户昵称</label>
             <label class="layui-input-inline">
                 <input name="member_nickname" value="{:input('member_nickname')}" placeholder="请输入用户昵称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
             <label class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
             <label class="layui-input-inline">
                 <input name="truck_number" value="{:input('truck_number')}" placeholder="请输入发货单号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'- 全部订单 -','0'=>'已取消的订单','1'=>'待发货的订单','2'=>'已发货的订单'] as $k=>$v}
+                    <option value="">-- 全部 --</option>
+                    {foreach ['已取消的订单','待发货的订单','已发货的订单'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -38,36 +43,42 @@
                 </select>
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">提交时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="address_datetime" value="{:input('address_datetime')}" placeholder="请选择提交时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="send_datetime" value="{:input('send_datetime')}" placeholder="请选择发货时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
             <label class="layui-input-inline">
                 <input name="address_name" value="{:input('address_name')}" placeholder="请输入收货姓名" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
             <label class="layui-input-inline">
                 <input name="address_phone" value="{:input('address_phone')}" placeholder="请输入收货手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">配送地址</label>
             <label class="layui-input-inline">
                 <input name="address_content" value="{:input('address_content')}" placeholder="请输入配送地址" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button type="submit" class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary">

app/data/view/shop_order_service/index_search.html

@@ -7,41 +7,48 @@
                 <input name="member_phone" value="{:input('member_phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">用户昵称</label>
             <label class="layui-input-inline">
                 <input name="member_nickname" value="{:input('member_nickname')}" placeholder="请输入用户昵称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐手机</label>
             <label class="layui-input-inline">
                 <input name="agent_phone" value="{:input('agent_phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐昵称</label>
             <label class="layui-input-inline">
                 <input name="agent_nickname" value="{:input('agent_nickname')}" placeholder="请输入用户昵称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
             <label class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
             <label class="layui-input-inline">
                 <input name="express_send_no" value="{:input('express_send_no')}" placeholder="请输入发货单号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
+                    <option value="">-- 全部 --</option>
+                    {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -50,11 +57,13 @@
                 </select>
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">付款状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="pay_state">
-                    {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
+                    <option value="">-- 全部 --</option>
+                    {foreach ['未支付的订单','已支付的订单'] as $k=>$v}
                     {if input('pay_state') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -63,54 +72,63 @@
                 </select>
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">下单时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at')}" placeholder="请选择下单时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="pay_datetime" value="{:input('pay_datetime')}" placeholder="请选择支付时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
             <label class="layui-input-inline">
                 <input name="express_name" value="{:input('express_name')}" placeholder="请输入收货姓名" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
             <label class="layui-input-inline">
                 <input name="express_phone" value="{:input('express_phone')}" placeholder="请输入收货手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货省份</label>
             <label class="layui-input-inline">
                 <input name="express_province" value="{:input('express_province')}" placeholder="请输入收货省份" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货城市</label>
             <label class="layui-input-inline">
                 <input name="express_city" value="{:input('express_city')}" placeholder="请输入收货城市" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货区域</label>
             <label class="layui-input-inline">
                 <input name="express_area" value="{:input('express_area')}" placeholder="请输入收货区域" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">详细地址</label>
             <label class="layui-input-inline">
                 <input name="express_address" value="{:input('express_address')}" placeholder="请输入详细地址" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/shop_truck_company/index_search.html

@@ -7,18 +7,21 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入快递名称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">快递编码</label>
             <label class="layui-input-inline">
                 <input name="code" value="{:input('code','')}" placeholder="请输入快递编码" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">添加时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择添加时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/shop_truck_template/index_search.html

@@ -7,18 +7,21 @@
                 <input name="code" value="{:input('code','')}" placeholder="请输入模板编号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">模板名称</label>
             <label class="layui-input-inline">
                 <input name="name" value="{:input('name','')}" placeholder="请输入模板名称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">添加时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择添加时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>

app/data/view/user/index.html

@@ -8,12 +8,10 @@
         <thead>
         <tr>
             <th class='list-table-check-td think-checkbox'>
-                <label>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
-                    <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
-                </label>
             </th>
-            <th class='nowrap'>姓名信息</th>
+            <th class='nowrap'>用户信息</th>
-            <th class='nowrap'>所在区域</th>
+            <th class='nowrap'>推荐人信息</th>
             <th class='nowrap'>注册时间</th>
             <th class='nowrap'></th>
         </tr>
@@ -36,7 +34,21 @@
                     <div>手机：<span>{$vo.phone|default='-'}</span></div>
                 </div>
             </td>
-            <td class="nowrap">{$vo.region_province|default=''}{$vo.region_city|default=''}{$vo.region_area|default=''}</td>
+            <td class="sub-span-blue nowrap">
+                {notempty name='vo.fromer'}
+                <div class="headimg" data-tips-image data-lazy-src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}"></div>
+                <div class="inline-block">
+                    {notempty name='vo.fromer.username'}
+                    <div>姓名：<span>{$vo.fromer.username|default='-'}</span></div>
+                    {else}
+                    <div>昵称：<span>{$vo.fromer.nickname|default='-'}</span></div>
+                    {/notempty}
+                    <div>手机：<span>{$vo.fromer.phone|default='-'}</span></div>
+                </div>
+                {else}
+                <div class="color-desc">没有推荐人</div>
+                {/notempty}
+            </td>
             <td class="nowrap">
                 使用状态：{if $vo.status eq 0}<b class="color-red margin-right-5">已冻结</b>{elseif $vo.status eq 1}<b class="color-green margin-right-5">已激活</b>{/if}<br>
                 注册时间：{$vo.create_at|format_datetime}

app/data/view/user/index_search.html

@@ -7,17 +7,20 @@
                 <input name="phone" value="{:input('phone')}" placeholder="请输入用户手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">姓名昵称</label>
+            <label class="layui-form-label">昵称姓名</label>
             <label class="layui-input-inline">
-                <input name="username" value="{:input('username')}" placeholder="请输入姓名昵称" class="layui-input">
+                <input name="username" value="{:input('username')}" placeholder="请输入昵称姓名" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'-- 全部 --','0'=>'已冻结的用户','1'=>'已激活的用户'] as $k=>$v}
+                    <option value="">-- 全部 --</option>
+                    {foreach ['已冻结的用户','已激活的用户'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -26,12 +29,14 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">注册时间</label>
             <div class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择注册时间" class="layui-input">
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>