diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index beed773c7..7927a141e 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -54,7 +54,7 @@ class Index extends Controller /** * 修改用户资料 * @login true - * @param integer $id 会员ID + * @param integer $id 用户ID * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException diff --git a/app/data/controller/api/News.php b/app/data/controller/api/News.php index c4bad0f06..927e44614 100644 --- a/app/data/controller/api/News.php +++ b/app/data/controller/api/News.php @@ -37,8 +37,8 @@ class News extends Controller $this->app->db->name('DataNewsItem')->where(['code' => $code])->update([ 'num_read' => $this->app->db->raw('`num_read`+1'), ]); - if (($mid = input('uid', 0)) > 0) { - $data = ['uid' => $mid, 'code' => $code, 'type' => 3, 'status' => 2]; + if (($uid = input('uid', 0)) > 0) { + $data = ['uid' => $uid, 'code' => $code, 'type' => 3, 'status' => 2]; $this->app->db->name('DataNewsXCollect')->where($data)->delete(); $this->app->db->name('DataNewsXCollect')->insert($data); } diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php index c0f7d5e1f..49c003fc1 100644 --- a/app/data/service/PaymentService.php +++ b/app/data/service/PaymentService.php @@ -331,7 +331,7 @@ abstract class PaymentService /** * 创建支付订单 - * @param string $openid 会员OPENID + * @param string $openid 用户OPENID * @param string $orderNo 交易订单单号 * @param string $paymentAmount 交易订单金额(元) * @param string $paymentTitle 交易订单名称 diff --git a/app/data/service/PrizeService.php b/app/data/service/PrizeService.php index adaff5735..561a9b0f0 100644 --- a/app/data/service/PrizeService.php +++ b/app/data/service/PrizeService.php @@ -118,7 +118,7 @@ class PrizeService extends Service $this->app->db->name($this->table)->insert(array_merge($map, [ 'uid' => $this->fromer['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'], ])); - // 更新会员奖利金额 + // 更新用户奖利金额 UserService::instance()->syncLevel($this->fromer['id']); } return true; @@ -150,7 +150,7 @@ class PrizeService extends Service $this->app->db->name($this->table)->insert(array_merge($map, [ 'uid' => $this->fromer['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'], ])); - // 更新会员奖利金额 + // 更新用户奖利金额 UserService::instance()->syncLevel($this->fromer['id']); } return true; @@ -175,7 +175,7 @@ class PrizeService extends Service $this->app->db->name($this->table)->insert(array_merge($map, [ 'uid' => $this->fromer['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'], ])); - // 更新会员奖利金额 + // 更新用户奖利金额 UserService::instance()->syncLevel($this->fromer['id']); } return true; diff --git a/app/data/service/UserService.php b/app/data/service/UserService.php index 7057563a5..de08c8cfd 100644 --- a/app/data/service/UserService.php +++ b/app/data/service/UserService.php @@ -210,8 +210,8 @@ class UserService extends Service } /** - * 同步计算会员级别 - * @param integer $uid 指定会员uid + * 同步计算用户级别 + * @param integer $uid 指定用户uid * @param boolean $parent 同步计算上级 * @return boolean * @throws \think\db\exception\DataNotFoundException @@ -228,7 +228,7 @@ class UserService extends Service $teamsIndirect = $this->app->db->name('DataUser')->where(['pid2' => $uid])->count(); $teamsUsers = $this->app->db->name('DataUser')->whereLike('path', "%-{$uid}-%")->count(); $orderAmount = $this->app->db->name('ShopOrder')->where(['uid' => $uid])->whereIn('status', [3, 4, 5])->sum('amount_total'); - // 计算会员级别 + // 计算用户级别 foreach ($this->app->db->name('DataUserLevel')->where(['status' => 1])->order('number desc')->cursor() as $item) { $l1 = empty($item['goods_vip_status']) || $user['vip_auth'] > 0; $l2 = empty($item['teams_users_status']) || $item['teams_users_number'] <= $teamsUsers; diff --git a/app/data/service/payment/AlipayPaymentService.php b/app/data/service/payment/AlipayPaymentService.php index 280617b76..925ef920e 100644 --- a/app/data/service/payment/AlipayPaymentService.php +++ b/app/data/service/payment/AlipayPaymentService.php @@ -59,7 +59,7 @@ class AlipayPaymentService extends PaymentService /** * 创建订单支付参数 - * @param string $openid 会员OPENID + * @param string $openid 用户OPENID * @param string $orderNo 交易订单单号 * @param string $paymentAmount 交易订单金额(元) * @param string $paymentTitle 交易订单名称 diff --git a/app/data/service/payment/EmptyPaymentService.php b/app/data/service/payment/EmptyPaymentService.php index e9b0d616e..881547bd0 100644 --- a/app/data/service/payment/EmptyPaymentService.php +++ b/app/data/service/payment/EmptyPaymentService.php @@ -35,7 +35,7 @@ class EmptyPaymentService extends PaymentService /** * 创建支付订单 - * @param string $openid 会员OPENID + * @param string $openid 用户OPENID * @param string $orderNo 交易订单单号 * @param string $paymentAmount 交易订单金额(元) * @param string $paymentTitle 交易订单名称 diff --git a/app/data/service/payment/JoinPaymentService.php b/app/data/service/payment/JoinPaymentService.php index 9858d8372..5144117e1 100644 --- a/app/data/service/payment/JoinPaymentService.php +++ b/app/data/service/payment/JoinPaymentService.php @@ -57,7 +57,7 @@ class JoinPaymentService extends PaymentService /** * 创建订单支付参数 - * @param string $openid 会员OPENID + * @param string $openid 用户OPENID * @param string $orderNo 交易订单单号 * @param string $paymentAmount 交易订单金额(元) * @param string $paymentTitle 交易订单名称 diff --git a/app/data/service/payment/WechatPaymentService.php b/app/data/service/payment/WechatPaymentService.php index 31c7ef77e..4bbd3a815 100644 --- a/app/data/service/payment/WechatPaymentService.php +++ b/app/data/service/payment/WechatPaymentService.php @@ -35,7 +35,7 @@ class WechatPaymentService extends PaymentService /** * 创建微信支付订单 - * @param string $openid 会员OPENID + * @param string $openid 用户OPENID * @param string $orderNo 交易订单单号 * @param string $paymentAmount 交易订单金额(元) * @param string $paymentTitle 交易订单名称 diff --git a/app/data/view/shop_goods/form.html b/app/data/view/shop_goods/form.html index b1ad5a104..c496b68dd 100644 --- a/app/data/view/shop_goods/form.html +++ b/app/data/view/shop_goods/form.html @@ -94,7 +94,7 @@