diff --git a/app/admin/controller/Finance.php b/app/admin/controller/Finance.php index 61de907..bb06606 100755 --- a/app/admin/controller/Finance.php +++ b/app/admin/controller/Finance.php @@ -120,7 +120,7 @@ class Finance extends Base /** - * 星岚币明细 + * 吧唧币明细 */ public function integral_list(Request $request) { diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index 618157b..0bc4336 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -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);#时间 diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index e9faa58..edff308 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -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; diff --git a/app/admin/view/Finance/integral_list.html b/app/admin/view/Finance/integral_list.html index 1cafa2c..27490a7 100755 --- a/app/admin/view/Finance/integral_list.html +++ b/app/admin/view/Finance/integral_list.html @@ -37,8 +37,8 @@ 用户信息 - 变化星岚币数量 - 变后星岚币数量 + 变化吧唧币数量 + 变后吧唧币数量 描述 变化时间 diff --git a/app/admin/view/Finance/record.html b/app/admin/view/Finance/record.html index 589a209..4828d23 100755 --- a/app/admin/view/Finance/record.html +++ b/app/admin/view/Finance/record.html @@ -40,7 +40,7 @@ 总金额 微信支付 消费余额 - 星岚币 + 吧唧币 diff --git a/app/admin/view/Order/buy_order.html b/app/admin/view/Order/buy_order.html index bb734d7..04d5f62 100755 --- a/app/admin/view/Order/buy_order.html +++ b/app/admin/view/Order/buy_order.html @@ -95,7 +95,7 @@

折扣金额

:{$vo['order_zhe_total']}

微信支付

:{$vo['price']}

余额抵扣

:{$vo['use_money']}
-

星岚币抵扣

:{$vo['use_integral']}
+

吧唧币抵扣

:{$vo['use_integral']}

积分支付

:{$vo['use_score']}

优惠券抵扣

:{$vo['use_coupon']}
diff --git a/app/admin/view/User/index.html b/app/admin/view/User/index.html index 00fe1a5..8efcd14 100755 --- a/app/admin/view/User/index.html +++ b/app/admin/view/User/index.html @@ -50,7 +50,7 @@ 用户信息 推荐人 余额 - 星岚币 + 吧唧币 积分 状态 时间 @@ -88,7 +88,7 @@
充值 {$vo['integral']} -
充值 +
充值 {$vo['score']}
充值 diff --git a/app/admin/view/User/user_profit_loss.html b/app/admin/view/User/user_profit_loss.html index 16d19e8..652aacf 100755 --- a/app/admin/view/User/user_profit_loss.html +++ b/app/admin/view/User/user_profit_loss.html @@ -36,7 +36,7 @@ 用户信息 充值余额 - + 微信支付 余额 背包赏品 diff --git a/app/admin/view/User/user_team.html b/app/admin/view/User/user_team.html index 0a4a284..89eb134 100755 --- a/app/admin/view/User/user_team.html +++ b/app/admin/view/User/user_team.html @@ -44,7 +44,7 @@ 用户信息 余额 - 星岚币 + 吧唧币 积分 佣金 状态 @@ -70,7 +70,7 @@ {$vo['integral']} - + {$vo['score']} diff --git a/app/api/controller/CardGoods.php b/app/api/controller/CardGoods.php index e626991..060a228 100755 --- a/app/api/controller/CardGoods.php +++ b/app/api/controller/CardGoods.php @@ -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, diff --git a/app/api/controller/Cardextractor.php b/app/api/controller/Cardextractor.php index 41f5d25..f49eb63 100755 --- a/app/api/controller/Cardextractor.php +++ b/app/api/controller/Cardextractor.php @@ -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, diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php index de1ec77..8d76e5c 100755 --- a/app/api/controller/Goods.php +++ b/app/api/controller/Goods.php @@ -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, diff --git a/app/api/controller/Infinite.php b/app/api/controller/Infinite.php index e0a4a74..efe2b43 100755 --- a/app/api/controller/Infinite.php +++ b/app/api/controller/Infinite.php @@ -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, diff --git a/app/api/controller/Notify.php b/app/api/controller/Notify.php index cb28d73..e14119c 100755 --- a/app/api/controller/Notify.php +++ b/app/api/controller/Notify.php @@ -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']); } diff --git a/app/api/controller/QuanYi.php b/app/api/controller/QuanYi.php index d22094f..f9ad604 100755 --- a/app/api/controller/QuanYi.php +++ b/app/api/controller/QuanYi.php @@ -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, diff --git a/app/api/controller/User.php b/app/api/controller/User.php index 6e875d1..8004b2c 100755 --- a/app/api/controller/User.php +++ b/app/api/controller/User.php @@ -230,7 +230,7 @@ class User extends Base /** - * 星岚币记录 + * 吧唧币记录 */ public function profitIntegral(Request $request) { diff --git a/app/common/model/User.php b/app/common/model/User.php index fc5fad8..48b8357 100755 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -169,7 +169,7 @@ class User extends Base /** - * 用户星岚币变化 + * 用户吧唧币变化 * @param $user_id * @param $change_money * @param $type 1后台充值 2抽赏消费 3开券获得 diff --git a/app/config/menu.php b/app/config/menu.php index f52d921..d8cc4b9 100755 --- a/app/config/menu.php +++ b/app/config/menu.php @@ -35,7 +35,7 @@ return [ ], [ 'url' => '/admin/integral_list', - 'name' => '星岚币明细', + 'name' => '吧唧币明细', ], [ 'url' => '/admin/draw_list', diff --git a/public/ueditor/php/upload/image/20250303/1740986486862580.jpg b/public/ueditor/php/upload/image/20250303/1740986486862580.jpg new file mode 100644 index 0000000..bd7e904 Binary files /dev/null and b/public/ueditor/php/upload/image/20250303/1740986486862580.jpg differ diff --git a/public/ueditor/php/upload/image/20250303/1740992664642561.jpg b/public/ueditor/php/upload/image/20250303/1740992664642561.jpg new file mode 100644 index 0000000..8e4e32c Binary files /dev/null and b/public/ueditor/php/upload/image/20250303/1740992664642561.jpg differ