From 176a7fa4950e1aa7c97f2c7d7bdb1102ec4a9b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 24 Mar 2021 17:29:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/UserBalanceService.php   |  6 ++++--
 app/data/view/shop_order_send/config.html |  2 +-
 app/data/view/user/index.html             | 18 +++++++++---------
 app/data/view/user_balance/index.html     |  6 +++---
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/data/service/UserBalanceService.php b/app/data/service/UserBalanceService.php
index 36c357b58..7c97e37ad 100644
--- a/app/data/service/UserBalanceService.php
+++ b/app/data/service/UserBalanceService.php
@@ -47,16 +47,18 @@ class UserBalanceService extends Service
      */
     public function confirm(string $orderNo): array
     {
-        $map = [['order_no', '=', $orderNo], ['status', '>=', 4]];
+        $map = [['status', '>=', 4], ['order_no', '=', $orderNo]];
         $order = $this->app->db->name('ShopOrder')->where($map)->find();
         if (empty($order)) throw new \think\admin\Exception('需处理的订单状态异常');
-        data_save('DataUserBalance', [
+
+        if ($order['reward_balance'] > 0) data_save('DataUserBalance', [
             'uid'    => $order['uid'],
             'code'   => $order['order_no'],
             'name'   => "订单余额充值",
             'remark' => "来自订单{$order['order_no']}的余额充值",
             'amount' => $order['reward_balance'],
         ], 'code', ['name' => '订单余额充值']);
+
         return $this->amount($order['uid']);
     }
 
diff --git a/app/data/view/shop_order_send/config.html b/app/data/view/shop_order_send/config.html
index 131f5688f..683d50c4e 100644
--- a/app/data/view/shop_order_send/config.html
+++ b/app/data/view/shop_order_send/config.html
@@ -3,7 +3,7 @@
 
         <label class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">发货人姓名</span>
-            <input class="layui-input" required placeholder="请输入发货姓名" name="name" value="{$vo.name|default=''}">
+            <input class="layui-input" required placeholder="请输入发货人姓名" name="name" value="{$vo.name|default=''}">
         </label>
 
         <label class="layui-form-item relative block">
diff --git a/app/data/view/user/index.html b/app/data/view/user/index.html
index 9f39c5290..352a290cf 100644
--- a/app/data/view/user/index.html
+++ b/app/data/view/user/index.html
@@ -35,13 +35,13 @@
                 <div class="inline-block">
                     <div>
                         {notempty name='vo.username'}
-                        姓名：<span class="color-blue">{$vo.username|default='-'}</span>
+                        用户姓名：<span class="color-blue">{$vo.username|default='-'}</span>
                         {else}
-                        昵称：<span class="color-blue">{$vo.nickname|default='-'}</span>
+                        用户昵称：<span class="color-blue">{$vo.nickname|default='-'}</span>
                         {/notempty}
                         <span class="margin-left-5">[ <b class="color-red">VIP{$vo.vip_code}</b> ] <b class="color-red">{$vo.vip_name}</b></span>
                     </div>
-                    <div>手机：<span class="color-blue">{$vo.phone|default='-'}</span></div>
+                    <div>用户手机：<span class="color-blue">{$vo.phone|default='-'}</span></div>
                 </div>
             </td>
             <td class="nowrap">
@@ -57,21 +57,21 @@
                 <div class="inline-block text-middle">
                     <div>
                         {notempty name='vo.from.username'}
-                        姓名：<span class="color-blue">{$vo.from.username|default='-'}</span>
+                        用户姓名：<span class="color-blue">{$vo.from.username|default='-'}</span>
                         {else}
-                        昵称：<span class="color-blue">{$vo.from.nickname|default='-'}</span>
+                        用户昵称：<span class="color-blue">{$vo.from.nickname|default='-'}</span>
                         {/notempty}
                         <span class="margin-left-5">[ <b class="color-red">VIP{$vo.from.vip_code}</b> ] <b class="color-red">{$vo.from.vip_name}</b></span>
                     </div>
-                    <div>手机：<span>{$vo.from.phone|default='-'}</span></div>
+                    <div>用户手机：<span>{$vo.from.phone|default='-'}</span></div>
                 </div>
                 {else}
                 <div class="color-desc">没有推荐人</div>
                 {/notempty}
             </td>
             <td class="nowrap sub-strong-blue">
-                <div>账户余额：累计充值 <b>{$vo.balance_total+0}</b> 元，已使用 <b>{$vo.balance_used+0}</b> 元</div>
-                <div>返利奖励：共奖励金额 <b>{$vo.rebate_total+$vo.rebate_lock}</b> 元 ( 含锁定 <b>{$vo.rebate_lock+0}</b> 元 ) 已提现 <b>{$vo.rebate_used+0}</b> 元</div>
+                <div>账户余额：累计充值 <b>{$vo.balance_total+0}</b> 元，已使用 <b>{$vo.balance_used+0}</b> 元，可用 <b>{:round($vo.balance_total-$vo.balance_used,2)+0}</b> 元</div>
+                <div>返利奖励：共奖励金额 <b>{$vo.rebate_total+$vo.rebate_lock}</b> 元 ( 含未到账 <b>{$vo.rebate_lock+0}</b> 元 ) 已提现 <b>{$vo.rebate_used+0}</b> 元，可提现 <b>{:round($vo.rebate_total-$vo.rebate_used,2)+0}</b> 元</div>
             </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>
@@ -79,7 +79,7 @@
             </td>
             <td class="nowrap">
 
-                <!--{if auth("parent")}-->
+                <!--{if auth("parent") and false}-->
                 <a class="layui-btn layui-btn-sm layui-btn-primary" data-width="900px" data-iframe="{:url('parent')}?uid={$vo.id}">修改上级</a>
                 <!--{/if}-->
 
diff --git a/app/data/view/user_balance/index.html b/app/data/view/user_balance/index.html
index 2fec3da56..afe2b595b 100644
--- a/app/data/view/user_balance/index.html
+++ b/app/data/view/user_balance/index.html
@@ -41,9 +41,9 @@
                     <div>用户等级：<span>[ <b class="color-red">VIP{$vo.user.vip_code}</b> ] <b class="color-red">{$vo.user.vip_name}</b></span></div>
                 </div>
             </td>
-            <td class="nowrap sub-strong-blue">
-                <div>充值金额：<b>{$vo.amount+0}</b> 元</div>
-                <div>升级等级：{if $vo.vip_upgrade > 0}
+            <td class="nowrap">
+                <div>交易金额：{if $vo.amount>=0}<b class="color-blue">{$vo.amount+0}</b>{else}<b class="color-red">{$vo.amount+0}</b>{/if} 元</div>
+                <div class="sub-strong-blue">升级等级：{if $vo.vip_upgrade > 0}
                     <span class="color-blue">升级到 [ <b>VIP{$vo.vip_upgrade}</b> ] <b>{$vo.vip_upgradeinfo.name|default=''}</b></span>
                     {else}
                     <span class="color-desc">不升级</span>