blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修改订单

Browse Source
This commit is contained in:
邹景立 2021-03-24 17:29:29 +08:00
parent d684aa48a6
commit 176a7fa495
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/data/service/UserBalanceService.php
View File

@ -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']);
}

2
app/data/view/shop_order_send/config.html
View File

@ -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">

18
app/data/view/user/index.html
View File

@ -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}-->

6
app/data/view/user_balance/index.html
View File

@ -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>