diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index c984b04..23d9a76 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -11,6 +11,7 @@ use app\common\model\store\service\StoreService; use app\common\model\wechat\WechatUser; use app\common\repositories\store\coupon\StoreCouponUserRepository; use app\common\repositories\store\order\StoreGroupOrderRepository; +use app\common\repositories\store\platformCommission\LegumesLogRepository; use app\common\repositories\store\service\StoreServiceLogRepository; use app\common\repositories\user\UserBillRepository; use app\common\repositories\user\UserExtractRepository; @@ -264,6 +265,10 @@ class User extends BaseModel return app()->make(UserHistoryRepository::class)->userTotalHistory($this->uid); } + public function getLegumesIntegralAttr(){ + return app()->make(LegumesLogRepository::class)->getHoldLegumesIntegral((int)$this->uid); + } + public function getTotalCouponAttr() { return app()->make(StoreCouponUserRepository::class)->userTotal($this->uid, 0); diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 4dd5335..9ff9b92 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -114,7 +114,7 @@ class Auth extends BaseController public function userInfo() { $user = $this->request->userInfo()->hidden(['label_id', 'group_id', 'pwd', 'addres', 'card_id', 'last_time', 'last_ip', 'create_time', 'mark', 'status', 'spread_uid', 'spread_time', 'real_name', 'birthday', 'brokerage_price']); - $user->append(['service', 'topService', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread', 'total_recharge', 'lock_integral', 'total_integral']); + $user->append(['service', 'topService', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread', 'total_recharge', 'lock_integral', 'total_integral','legumes_integral']); $data = $user->toArray(); $data['total_consume'] = $user['pay_price']; $data['extension_status'] = systemConfig('extension_status');