1

app/common/model/store/Excel.php

@@ -23,7 +23,7 @@ class Excel extends BaseModel
             'searchLog'         => '搜索记录',
             'financial'         => '流水记录',
             'refundOrder'       => '退款单',
-            'integralLog'       => '积分日志',
+            'integralLog'       => '红包米日志',
             'importDelivery'    => '发货导入',
             'exportFinancial'   => '日/月账单',
             'financialLog'      => '转账记录',

app/common/repositories/store/order/StoreOrderCreateRepository.php

@@ -729,7 +729,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             unset($merchantCart);
         }
 
-        //积分配置
+        //红包米配置
         $sysIntegralConfig = systemConfig(['integral_money', 'integral_status', 'integral_order_rate']);
         $merIntegralFlag = false;
         $order_total_integral = 0;
@@ -754,7 +754,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             $merIntegralFlag = $merIntegralFlag || ((bool)$merIntegralConfig['mer_integral_status']);
             $integralFlag = $useIntegral && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0 && $merIntegralConfig['mer_integral_status'];
 
-            //计算积分抵扣
+            //计算红包米抵扣
             foreach ($merchantCart['list'] as &$cart) {
                 //只有普通商品可以抵扣
                 if ($cart['product_type'] == 0 && $integralFlag && $userIntegral > 0 && $merchantCart['order']['true_price'] > 0) {
@@ -770,14 +770,14 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                             $productIntegral = ceil(bcdiv($productIntegralPrice, $sysIntegralConfig['integral_money'], 3));
                             if ($productIntegral <= $userIntegral) {
                                 $userIntegral = bcsub($userIntegral, $productIntegral, 0);
-                                //使用多少积分抵扣了多少金额
+                                //使用多少红包米抵扣了多少金额
                                 $cart['integral'] = [
                                     'use' => $productIntegral,
                                     'price' => $productIntegralPrice
                                 ];
                             } else {
                                 $productIntegralPrice = bcmul($userIntegral, $sysIntegralConfig['integral_money'], 2);
-                                //使用多少积分抵扣了多少金额
+                                //使用多少红包米抵扣了多少金额
                                 $cart['integral'] = [
                                     'use' => $userIntegral,
                                     'price' => $productIntegralPrice
@@ -827,7 +827,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
 
             $giveIntegralFlag = $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_order_rate'] > 0;
             $total_give_integral = 0;
-            //计算赠送积分, 只有普通商品赠送积分
+            //计算赠送红包米, 只有普通商品赠送红包米
             if ($giveIntegralFlag && !$order_type && $pay_price > 0) {
                 $total_give_integral = floor(bcmul($pay_price, $sysIntegralConfig['integral_order_rate'], 0));
                 if ($total_give_integral > 0 && $svip_status && $svip_integral_rate > 0) {
@@ -1217,7 +1217,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                     'status' => 1,
                     'title' => '购买商品',
                     'number' => $groupOrder['integral'],
-                    'mark' => '购买商品使用积分抵扣' . floatval($groupOrder['integral_price']) . '元',
+                    'mark' => '购买商品使用红包米抵扣' . floatval($groupOrder['integral_price']) . '元',
                     'balance' => $user->integral
                 ]);
                 $user->save();
@@ -1240,12 +1240,12 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                         'uid' => $uid,
                         'link_id' => $_order->order_id,
                         'pm' => 0,
-                        'title' => '积分抵扣',
+                        'title' => '红包米抵扣',
                         'category' => 'mer_integral',
                         'type' => 'deduction',
                         'number' => $order['integral'],
                         'balance' => $user->integral,
-                        'mark' => '购买商品使用' . $order['integral'] . '积分抵扣' . floatval($order['integral_price']) . '元',
+                        'mark' => '购买商品使用' . $order['integral'] . '红包米抵扣' . floatval($order['integral_price']) . '元',
                         'mer_id' => $order['mer_id'],
                         'status' => 1
                     ];

app/common/repositories/store/order/StoreOrderRepository.php

@@ -623,9 +623,9 @@ class StoreOrderRepository extends BaseRepository
             app()->make(UserBillRepository::class)->incBill($groupOrder->uid, 'integral', 'lock', [
                 'link_id' => $groupOrder['group_order_id'],
                 'status' => 0,
-                'title' => '下单赠送积分',
+                'title' => '下单赠送红包米',
                 'number' => $groupOrder->give_integral,
-                'mark' => '成功消费' . floatval($groupOrder['pay_price']) . '元,赠送积分' . floatval($groupOrder->give_integral),
+                'mark' => '成功消费' . floatval($groupOrder['pay_price']) . '元,赠送红包米' . floatval($groupOrder->give_integral),
                 'balance' => $groupOrder->user->integral
             ]);
         }

app/common/repositories/store/order/StoreRefundOrderRepository.php

@@ -892,9 +892,9 @@ class StoreRefundOrderRepository extends BaseRepository
                 $userBillRepository->decBill($bill->uid, 'integral', 'refund_lock', [
                     'link_id' => $refundOrder->order->group_order_id,
                     'status' => 1,
-                    'title' => '扣除赠送积分',
+                    'title' => '扣除赠送红包米',
                     'number' => $number,
-                    'mark' => '订单退款扣除赠送积分' . intval($number),
+                    'mark' => '订单退款扣除赠送红包米' . intval($number),
                     'balance' => $refundOrder->user->integral
                 ]);
             }
@@ -1012,7 +1012,7 @@ class StoreRefundOrderRepository extends BaseRepository
             ], $refundOrder->mer_id);
         }
 
-        //退回积分
+        //退回红包米
         if ($refundOrder->integral > 0) {
             $make = app()->make(UserRepository::class);
             $make->update($refundOrder->uid, ['integral' => Db::raw('integral+' . $refundOrder->integral)]);
@@ -1023,7 +1023,7 @@ class StoreRefundOrderRepository extends BaseRepository
                 'status' => 1,
                 'title' => '订单退款',
                 'number' => $refundOrder->integral,
-                'mark' => '订单退款,返还' . intval($refundOrder->integral) . '积分',
+                'mark' => '订单退款,返还' . intval($refundOrder->integral) . '红包米',
                 'balance' => $userIntegral
             ]);
             $make1->incBill($refundOrder->uid, 'mer_integral', 'refund', [
@@ -1031,13 +1031,13 @@ class StoreRefundOrderRepository extends BaseRepository
                 'status' => 1,
                 'title' => '订单退款',
                 'number' => $refundOrder->integral,
-                'mark' => '订单退款,返还' . intval($refundOrder->integral) . '积分',
+                'mark' => '订单退款,返还' . intval($refundOrder->integral) . '红包米',
                 'balance' => $userIntegral,
                 'mer_id' => $refundOrder->mer_id
             ]);
         }
 
-        //退还赠送积分
+        //退还赠送红包米
         $this->refundGiveIntegral($refundOrder);
 
         app()->make(FinancialRecordRepository::class)->dec([

app/common/repositories/user/MemberinterestsRepository.php

@@ -45,8 +45,8 @@ class MemberinterestsRepository extends BaseRepository
     //签到收益
     const INTERESTS_TYPE = [
         1 => ['label'=> '会员特价', 'msg' => ''],
-        2 => ['label'=> '签到返利' , 'msg' => '积分倍数' ],
-        3 => ['label'=> '消费返利' , 'msg' => '积分倍数' ],
+        2 => ['label'=> '签到返利' , 'msg' => '红包米倍数' ],
+        3 => ['label'=> '消费返利' , 'msg' => '红包米倍数' ],
         4 => ['label'=> '专属客服' , 'msg' => '' ],
         5 => ['label'=> '经验翻倍' , 'msg' => '经验翻倍' ],
         6 => ['label'=> '会员优惠券', 'msg' => ''],

app/common/repositories/user/UserRepository.php

@@ -365,12 +365,12 @@ class UserRepository extends BaseRepository
     public function changeIntegralForm($id)
     {
         return Elm::createForm(Route::buildUrl('systemUserChangeIntegral', compact('id'))->build(), [
-            Elm::radio('type', '修改积分', 1)->options([
+            Elm::radio('type', '修改红包米', 1)->options([
                 ['label' => '增加', 'value' => 1],
                 ['label' => '减少', 'value' => 0],
             ])->requiredNum(),
-            Elm::number('now_money', '积分')->required()->min(0)->max(999999)
-        ])->setTitle('修改用户积分');
+            Elm::number('now_money', '红包米')->required()->min(0)->max(999999)
+        ])->setTitle('修改用户红包米');
     }
 
     /**
@@ -438,18 +438,18 @@ class UserRepository extends BaseRepository
                 $make->incBill($id, 'integral', 'sys_inc', [
                     'link_id' => $adminId,
                     'status' => 1,
-                    'title' => '系统增加积分',
+                    'title' => '系统增加红包米',
                     'number' => $integral,
-                    'mark' => '系统增加了' . $integral . '积分',
+                    'mark' => '系统增加了' . $integral . '红包米',
                     'balance' => $balance
                 ]);
             } else {
                 $make->decBill($id, 'integral', 'sys_dec', [
                     'link_id' => $adminId,
                     'status' => 1,
-                    'title' => '系统减少积分',
+                    'title' => '系统减少红包米',
                     'number' => $integral,
-                    'mark' => '系统减少了' . $integral . '积分',
+                    'mark' => '系统减少了' . $integral . '红包米',
                     'balance' => $balance
                 ]);
             }
@@ -951,7 +951,7 @@ class UserRepository extends BaseRepository
                         'status' => 1,
                         'title' => '邀请好友',
                         'number' => $integral,
-                        'mark' => '邀请好友奖励' . $integral . '积分',
+                        'mark' => '邀请好友奖励' . $integral . '红包米',
                         'balance' => $spread->integral
                     ]);
                 }
@@ -1270,7 +1270,7 @@ class UserRepository extends BaseRepository
     }
 
     /**
-     * TODO 积分增加
+     * TODO 红包米增加
      * @param int $uid
      * @param int $number
      * @param $title

app/controller/api/user/User.php

@@ -394,7 +394,7 @@ class User extends BaseController
     public function integralInfo(UserBillRepository $make)
     {
         if (!systemConfig('integral_status')) {
-            return app('json')->fail('积分功能未开启');
+            return app('json')->fail('红包米功能未开启');
         }
 
         $integral = $this->user->integral;
@@ -424,7 +424,7 @@ class User extends BaseController
     public function integralList(UserBillRepository $repository)
     {
         if (!systemConfig('integral_status')) {
-            return app('json')->fail('积分功能未开启');
+            return app('json')->fail('红包米功能未开启');
         }
         [$page, $limit] = $this->getPage();
         $data = $repository->userList(['category' => 'integral'], $this->user->uid, $page, $limit);

route/admin/marketing.php

@@ -17,15 +17,15 @@ use app\common\middleware\LogMiddleware;
 
 Route::group(function () {
 
-    //积分
+    //红包米
     Route::group('user/integral', function () {
         Route::get('config', '.UserIntegral/getConfig')->name('systemUserIntegralConfig')->option([
-            '_alias' => '积分配置获取',
+            '_alias' => '红包米配置获取',
             '_auth' => false,
             '_form' => 'systemUserIntegralConfigSave',
         ]);
         Route::post('config', '.UserIntegral/saveConfig')->name('systemUserIntegralConfigSave')->option([
-            '_alias' => '积分配置保存',
+            '_alias' => '红包米配置保存',
         ]);
     })->prefix('admin.user')->option([
         '_path' => '/marketing/integral/config',
@@ -34,13 +34,13 @@ Route::group(function () {
 
     Route::group('user/integral', function () {
         Route::get('title', '.UserIntegral/getTitle')->name('systemUserIntegralTitle')->option([
-            '_alias' => '积分统计',
+            '_alias' => '红包米统计',
         ]);
         Route::get('lst', '.UserIntegral/getList')->name('systemUserIntegralLst')->option([
-            '_alias' => '积分日志',
+            '_alias' => '红包米日志',
         ]);
         Route::get('excel', '.UserIntegral/excel')->name('systemUserIntegralExcel')->option([
-            '_alias' => '积分导出',
+            '_alias' => '红包米导出',
         ]);
     })->prefix('admin.user')->option([
         '_path' => '/marketing/integral/log',