zhongchuang
/
admin-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：用户信息添加持有可用豆豆积分

This commit is contained in:
wuhui_zzw 2024-01-03 18:01:48 +08:00
parent f0c9d80f19
commit 4edbcd9ead
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/model/user/User.php
View File

@ -11,6 +11,7 @@ use app\common\model\store\service\StoreService;
use app\common\model\wechat\WechatUser; use app\common\model\wechat\WechatUser;
use app\common\repositories\store\coupon\StoreCouponUserRepository; use app\common\repositories\store\coupon\StoreCouponUserRepository;
use app\common\repositories\store\order\StoreGroupOrderRepository; 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\store\service\StoreServiceLogRepository;
use app\common\repositories\user\UserBillRepository; use app\common\repositories\user\UserBillRepository;
use app\common\repositories\user\UserExtractRepository; use app\common\repositories\user\UserExtractRepository;
@ -264,6 +265,10 @@ class User extends BaseModel
return app()->make(UserHistoryRepository::class)->userTotalHistory($this->uid); return app()->make(UserHistoryRepository::class)->userTotalHistory($this->uid);
} }
public function getLegumesIntegralAttr(){
return app()->make(LegumesLogRepository::class)->getHoldLegumesIntegral((int)$this->uid);
}
public function getTotalCouponAttr() public function getTotalCouponAttr()
{ {
return app()->make(StoreCouponUserRepository::class)->userTotal($this->uid, 0); return app()->make(StoreCouponUserRepository::class)->userTotal($this->uid, 0);

2
app/controller/api/Auth.php
View File

@ -114,7 +114,7 @@ class Auth extends BaseController
public function userInfo() 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 = $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 = $user->toArray();
$data['total_consume'] = $user['pay_price']; $data['total_consume'] = $user['pay_price'];
$data['extension_status'] = systemConfig('extension_status'); $data['extension_status'] = systemConfig('extension_status');