提交代码
This commit is contained in:
parent
b8335c500d
commit
376cd970c2
|
|
@ -120,7 +120,7 @@ class Finance extends Base
|
|||
|
||||
|
||||
/**
|
||||
* 星岚币明细
|
||||
* 吧唧币明细
|
||||
*/
|
||||
public function integral_list(Request $request)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@ class Order extends Base
|
|||
->setCellValue('G1', '折扣金额')
|
||||
->setCellValue('H1', '微信支付')
|
||||
->setCellValue('I1', '余额抵扣')
|
||||
->setCellValue('J1', '星岚币抵扣')
|
||||
->setCellValue('J1', '吧唧币抵扣')
|
||||
->setCellValue('K1', '积分支付')
|
||||
->setCellValue('L1', '时间');
|
||||
//设置A列水平居中
|
||||
|
|
@ -571,7 +571,7 @@ class Order extends Base
|
|||
$objPHPExcel->getActiveSheet()->setCellValue('G' . $line, $value['order_zhe_total']);#折扣金额
|
||||
$objPHPExcel->getActiveSheet()->setCellValue('H' . $line, $value['price']);#微信支付
|
||||
$objPHPExcel->getActiveSheet()->setCellValue('I' . $line, $value['use_money']);#余额抵扣
|
||||
$objPHPExcel->getActiveSheet()->setCellValue('J' . $line, $value['use_integral']);#星岚币抵扣
|
||||
$objPHPExcel->getActiveSheet()->setCellValue('J' . $line, $value['use_integral']);#吧唧币抵扣
|
||||
$objPHPExcel->getActiveSheet()->setCellValue('K' . $line, $value['use_score']);#积分支付
|
||||
$objPHPExcel->getActiveSheet()->setCellValue('L' . $line, $addtime);#时间
|
||||
|
||||
|
|
|
|||
|
|
@ -140,13 +140,13 @@ class User extends Base
|
|||
$money = $money * -1;
|
||||
}
|
||||
$res[] = UserModel::changeMoney($id, $money, 1, '后台变动');
|
||||
} elseif ($type == 2) {#星岚币
|
||||
} elseif ($type == 2) {#吧唧币
|
||||
if (RegInt($money)) {
|
||||
return $this->renderError('修改数量不规范,请输入大于0的整数');
|
||||
}
|
||||
if ($type_is == 2) {
|
||||
if ($money > $user_info['integral']) {
|
||||
return $this->renderError('账号星岚币扣除数量不足');
|
||||
return $this->renderError('账号吧唧币扣除数量不足');
|
||||
}
|
||||
$money = $money * -1;
|
||||
}
|
||||
|
|
@ -411,7 +411,7 @@ class User extends Base
|
|||
$profit_loss_total = 0;
|
||||
$money = 0;
|
||||
foreach ($data['list'] as $k => &$v) {
|
||||
#公式 (充值余额 + 星岚币 + 微信支付 - 余额 - 背包赏品
|
||||
#公式 (充值余额 + 吧唧币 + 微信支付 - 余额 - 背包赏品
|
||||
$cz_money = ProfitMoney::field('change_money')->where('user_id', '=', $v['id'])->where('type', '=', 1)->where('change_money', '>', 0)->where($where)->sum('change_money');
|
||||
$wx_money = ProfitMoney::field('change_money')->where('user_id', '=', $v['id'])->where('type', '=', 2)->where('change_money', '>', 0)->where($where)->sum('change_money');
|
||||
$cz_yue = $cz_money + $wx_money;
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>用户信息</th>
|
||||
<th>变化星岚币数量</th>
|
||||
<th>变后星岚币数量</th>
|
||||
<th>变化吧唧币数量</th>
|
||||
<th>变后吧唧币数量</th>
|
||||
<th>描述</th>
|
||||
<th>变化时间</th>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<th>总金额</th>
|
||||
<th>微信支付</th>
|
||||
<th>消费余额</th>
|
||||
<th>星岚币</th>
|
||||
<th>吧唧币</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">折扣金额</p> :{$vo['order_zhe_total']}</div>
|
||||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">微信支付</p> :{$vo['price']}</div>
|
||||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">余额抵扣</p> :{$vo['use_money']}</div>
|
||||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">星岚币抵扣</p> :{$vo['use_integral']}</div>
|
||||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">吧唧币抵扣</p> :{$vo['use_integral']}</div>
|
||||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">积分支付</p> :{$vo['use_score']}</div>
|
||||
<div style="display: flex;font-weight: bold;"><p style="width: 60px;display: inline">优惠券抵扣</p> :{$vo['use_coupon']}</div>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<th>用户信息</th>
|
||||
<th>推荐人</th>
|
||||
<th>余额</th>
|
||||
<th>星岚币</th>
|
||||
<th>吧唧币</th>
|
||||
<th>积分</th>
|
||||
<th>状态</th>
|
||||
<th>时间</th>
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
<br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,1,'余额')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>
|
||||
</td>
|
||||
<td>{$vo['integral']}
|
||||
<br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,2,'星岚币')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>
|
||||
<br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,2,'吧唧币')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>
|
||||
</td>
|
||||
<td>{$vo['score']}
|
||||
<br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,3,'积分')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<tr>
|
||||
<th>用户信息</th>
|
||||
<th>充值余额</th>
|
||||
<!--<th>充值星岚币</th>-->
|
||||
<!--<th>充值吧唧币</th>-->
|
||||
<th>微信支付</th>
|
||||
<th>余额</th>
|
||||
<th>背包赏品</th>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<tr>
|
||||
<th>用户信息</th>
|
||||
<th>余额</th>
|
||||
<th>星岚币</th>
|
||||
<th>吧唧币</th>
|
||||
<th>积分</th>
|
||||
<th>佣金</th>
|
||||
<th>状态</th>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<!-- <br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,1,'余额')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>-->
|
||||
</td>
|
||||
<td>{$vo['integral']}
|
||||
<!-- <br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,2,'星岚币')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>-->
|
||||
<!-- <br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,2,'吧唧币')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>-->
|
||||
</td>
|
||||
<td>{$vo['score']}
|
||||
<!-- <br/><a style="text-decoration:none" name="{$vo.nickname}" onClick="chongzhi({$vo.id},this.name,3,'积分')"class="layui-btn layui-btn-danger layui-btn-xs">充值</a>-->
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ class CardGoods extends Base
|
|||
#订单金额 微信支付金额
|
||||
$order_total = $order_zhe_total = $price = bcmul("$box_price", "$prize_num", 2);
|
||||
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1) {
|
||||
if ($user['integral'] >= $price) {
|
||||
|
|
@ -442,7 +442,7 @@ class CardGoods extends Base
|
|||
//订单金额 微信支付金额
|
||||
$order_total = $order_zhe_total = $price = bcmul("$goods_price", "$num", 2);
|
||||
|
||||
//星岚币抵扣
|
||||
//吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1) {
|
||||
if ($user['integral'] >= $price) {
|
||||
|
|
@ -486,7 +486,7 @@ class CardGoods extends Base
|
|||
'order_zhe_total' => $order_zhe_total,#订单折扣金额
|
||||
'price' => $price,#微信支付
|
||||
'use_money' => $use_money,#余额抵扣
|
||||
'use_integral' => $use_integral,#星岚币抵扣
|
||||
'use_integral' => $use_integral,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
// 'zhe' => $zhe,#会员折扣
|
||||
'goods_id' => $card_id,
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ class Cardextractor extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1) {
|
||||
if ($user['integral'] >= $price) {
|
||||
|
|
@ -411,7 +411,7 @@ class Cardextractor extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1) {
|
||||
if ($user['integral'] >= $price) {
|
||||
|
|
@ -454,7 +454,7 @@ class Cardextractor extends Base
|
|||
'order_zhe_total' => $order_zhe_total,#订单折扣金额
|
||||
'price' => $price,#微信支付
|
||||
'use_money' => $use_money,#余额抵扣
|
||||
'use_integral' => $use_integral,#星岚币抵扣
|
||||
'use_integral' => $use_integral,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
'zhe' => $zhe,#会员折扣
|
||||
'goods_id' => $goods_id,
|
||||
|
|
|
|||
|
|
@ -597,7 +597,7 @@ class Goods extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1 && $goods['type'] != 10) {
|
||||
$price = $price * 100;
|
||||
|
|
@ -632,7 +632,7 @@ class Goods extends Base
|
|||
$zhe = 0;
|
||||
#微信支付
|
||||
$price = 0;
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
#余额抵扣
|
||||
$use_money = 0;
|
||||
|
|
@ -795,7 +795,7 @@ class Goods extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1 && $goods['type'] != 10) {
|
||||
$price = $price * 100;
|
||||
|
|
@ -831,7 +831,7 @@ class Goods extends Base
|
|||
$zhe = 0;
|
||||
#微信支付
|
||||
$price = 0;
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
#余额抵扣
|
||||
$use_money = 0;
|
||||
|
|
@ -958,7 +958,7 @@ class Goods extends Base
|
|||
'order_zhe_total' => $order_zhe_total,#订单折扣金额
|
||||
'price' => $price,#微信支付
|
||||
'use_money' => $use_money,#余额抵扣
|
||||
'use_integral' => $use_integral,#星岚币抵扣
|
||||
'use_integral' => $use_integral,#吧唧币抵扣
|
||||
'use_score' => $use_score,#积分抵扣
|
||||
'zhe' => $zhe,#会员折扣
|
||||
'goods_id' => $goods_id,
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ class Infinite extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
// if ($use_integral_is == 1) {
|
||||
// if ($user['integral'] >= $price) {
|
||||
|
|
@ -594,7 +594,7 @@ class Infinite extends Base
|
|||
$zhe_bl = bcdiv("$zhe", "10", 2);
|
||||
$order_zhe_total = $price = bcmul("$price", "$zhe_bl", 2);
|
||||
}
|
||||
#星岚币抵扣
|
||||
#吧唧币抵扣
|
||||
$use_integral = 0;
|
||||
if ($use_integral_is == 1 && $goods['type'] != 10) {
|
||||
$price = $price * 100;
|
||||
|
|
@ -646,7 +646,7 @@ class Infinite extends Base
|
|||
'order_zhe_total' => $order_zhe_total,#订单折扣金额
|
||||
'price' => $price,#微信支付
|
||||
'use_money' => $use_money,#余额抵扣
|
||||
'use_integral' => $use_integral,#星岚币抵扣
|
||||
'use_integral' => $use_integral,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
'zhe' => $zhe,#会员折扣
|
||||
'goods_id' => $goods_id,
|
||||
|
|
@ -791,7 +791,7 @@ class Infinite extends Base
|
|||
'order_zhe_total' => 0,#订单折扣金额
|
||||
'price' => 0,#微信支付
|
||||
'use_money' => 0,#余额抵扣
|
||||
'use_integral' => 0,#星岚币抵扣
|
||||
'use_integral' => 0,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
'zhe' => 0,#会员折扣
|
||||
'goods_id' => $goods_id,
|
||||
|
|
@ -1082,7 +1082,7 @@ class Infinite extends Base
|
|||
'order_zhe_total' => 0,#订单折扣金额
|
||||
'price' => 0,#微信支付
|
||||
'use_money' => 0,#余额抵扣
|
||||
'use_integral' => 0,#星岚币抵扣
|
||||
'use_integral' => 0,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
'zhe' => 0,#会员折扣
|
||||
'goods_id' => $goods_id,
|
||||
|
|
@ -1183,7 +1183,7 @@ class Infinite extends Base
|
|||
'order_zhe_total' => 0,#订单折扣金额
|
||||
'price' => 0,#微信支付
|
||||
'use_money' => 0,#余额抵扣
|
||||
'use_integral' => 0,#星岚币抵扣
|
||||
'use_integral' => 0,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
'zhe' => 0,#会员折扣
|
||||
'goods_id' => $goods_id,
|
||||
|
|
|
|||
|
|
@ -514,7 +514,7 @@ class Notify extends Base
|
|||
if ($order['use_money'] > 0) {
|
||||
$res[] = User::changeMoney($order['user_id'], -$order['use_money'], 3, '购买盒子' . $order['goods_title']);
|
||||
}
|
||||
#扣星岚币
|
||||
#扣吧唧币
|
||||
if ($order['use_integral'] > 0) {
|
||||
$res[] = User::changeIntegral($order['user_id'], -$order['use_integral'], 2, '购买盒子' . $order['goods_title']);
|
||||
}
|
||||
|
|
@ -1104,7 +1104,7 @@ class Notify extends Base
|
|||
if ($order['use_money'] > 0) {
|
||||
$res[] = User::changeMoney($order['user_id'], -$order['use_money'], 3, '购买盒子' . $order['goods_title']);
|
||||
}
|
||||
#扣星岚币
|
||||
#扣吧唧币
|
||||
if ($order['use_integral'] > 0) {
|
||||
$res[] = User::changeIntegral($order['user_id'], -$order['use_integral'], 2, '购买盒子' . $order['goods_title']);
|
||||
}
|
||||
|
|
@ -1520,7 +1520,7 @@ class Notify extends Base
|
|||
if ($order['use_money'] > 0) {
|
||||
$res[] = User::changeMoney($order['user_id'], -$order['use_money'], 3, '购买盒子' . $order['goods_title']);
|
||||
}
|
||||
#扣星岚币
|
||||
#扣吧唧币
|
||||
if ($order['use_integral'] > 0) {
|
||||
$res[] = User::changeIntegral($order['user_id'], -$order['use_integral'], 2, '购买盒子' . $order['goods_title']);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class QuanYi extends Base
|
|||
'order_zhe_total' => 0,#订单折扣金额
|
||||
'price' => 0,#微信支付
|
||||
'use_money' => 0,#余额抵扣
|
||||
'use_integral' => 0,#星岚币抵扣
|
||||
'use_integral' => 0,#吧唧币抵扣
|
||||
'use_score' => 0,#积分抵扣
|
||||
'zhe' => 0,#会员折扣
|
||||
'goods_id' => 0,
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ class User extends Base
|
|||
|
||||
|
||||
/**
|
||||
* 星岚币记录
|
||||
* 吧唧币记录
|
||||
*/
|
||||
public function profitIntegral(Request $request)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class User extends Base
|
|||
|
||||
|
||||
/**
|
||||
* 用户星岚币变化
|
||||
* 用户吧唧币变化
|
||||
* @param $user_id
|
||||
* @param $change_money
|
||||
* @param $type 1后台充值 2抽赏消费 3开券获得
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ return [
|
|||
],
|
||||
[
|
||||
'url' => '/admin/integral_list',
|
||||
'name' => '星岚币明细',
|
||||
'name' => '吧唧币明细',
|
||||
],
|
||||
[
|
||||
'url' => '/admin/draw_list',
|
||||
|
|
|
|||
BIN
public/ueditor/php/upload/image/20250303/1740986486862580.jpg
Normal file
BIN
public/ueditor/php/upload/image/20250303/1740986486862580.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
BIN
public/ueditor/php/upload/image/20250303/1740992664642561.jpg
Normal file
BIN
public/ueditor/php/upload/image/20250303/1740992664642561.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
Loading…
Reference in New Issue
Block a user