@@ -45,12 +45,13 @@ public function index(Request $request)
4545 $ user = $ request ->session ()->get ('user ' );
4646
4747 $ view ['articleList ' ] = Article::where ('is_del ' , 0 )->orderBy ('sort ' , 'desc ' )->orderBy ('id ' , 'desc ' )->paginate (5 );
48- $ view ['wechat_qrcode ' ] = static ::$ config ['wechat_qrcode ' ];
49- $ view ['alipay_qrcode ' ] = static ::$ config ['alipay_qrcode ' ];
48+ $ view ['wechat_qrcode ' ] = self ::$ config ['wechat_qrcode ' ];
49+ $ view ['alipay_qrcode ' ] = self ::$ config ['alipay_qrcode ' ];
50+ $ view ['referral_status ' ] = self ::$ config ['referral_status ' ];
5051
5152 $ user ['totalTransfer ' ] = $ this ->flowAutoShow ($ user ['transfer_enable ' ] - $ user ['u ' ] - $ user ['d ' ]);
5253 $ user ['usedTransfer ' ] = $ this ->flowAutoShow ($ user ['u ' ] + $ user ['d ' ]);
53- $ user ['usedPercent ' ] = round (($ user ['u ' ] + $ user ['d ' ]) / $ user ['transfer_enable ' ], 2 );
54+ $ user ['usedPercent ' ] = $ user [ ' transfer_enable ' ] > 0 ? round (($ user ['u ' ] + $ user ['d ' ]) / $ user ['transfer_enable ' ], 2 ) : 1 ;
5455 $ view ['info ' ] = $ user ;
5556
5657 return Response::view ('user/index ' , $ view );
@@ -700,7 +701,7 @@ public function addOrder(Request $request)
700701 // 生成订单
701702 $ order = new Order ();
702703 $ order ->orderId = $ orderId ;
703- $ order ->user_id = $ user[ ' id ' ] ;
704+ $ order ->user_id = $ user-> id ;
704705 $ order ->coupon_id = !empty ($ coupon ) ? $ coupon ->id : 0 ;
705706 $ order ->totalOriginalPrice = $ goods ->price ;
706707 $ order ->totalPrice = $ totalPrice ;
@@ -714,7 +715,7 @@ public function addOrder(Request $request)
714715 $ orderGoods = new OrderGoods ();
715716 $ orderGoods ->oid = $ order ->oid ;
716717 $ orderGoods ->orderId = $ orderId ;
717- $ orderGoods ->user_id = $ user[ ' id ' ] ;
718+ $ orderGoods ->user_id = $ user-> id ;
718719 $ orderGoods ->goods_id = $ goods_id ;
719720 $ orderGoods ->num = 1 ;
720721 $ orderGoods ->original_price = $ goods ->price ;
@@ -726,8 +727,8 @@ public function addOrder(Request $request)
726727
727728 // 记录余额操作日志
728729 $ userBalanceLogObj = new UserBalanceLog ();
729- $ userBalanceLogObj ->user_id = $ user[ ' id ' ] ;
730- $ userBalanceLogObj ->order_id = $ order ->id ;
730+ $ userBalanceLogObj ->user_id = $ user-> id ;
731+ $ userBalanceLogObj ->order_id = $ order ->oid ;
731732 $ userBalanceLogObj ->before = $ user ->balance ;
732733 $ userBalanceLogObj ->after = $ user ->balance - $ totalPrice ;
733734 $ userBalanceLogObj ->balance = $ totalPrice ;
@@ -755,11 +756,11 @@ public function addOrder(Request $request)
755756
756757 // 写入返利日志
757758 $ referralLog = new ReferralLog ();
758- $ referralLog ->user_id = $ user[ ' id ' ] ;
759- $ referralLog ->ref_user_id = $ user[ ' referral_uid ' ] ;
759+ $ referralLog ->user_id = $ user-> id ;
760+ $ referralLog ->ref_user_id = $ user-> referral_uid ;
760761 $ referralLog ->order_id = $ order ->oid ;
761762 $ referralLog ->amount = $ totalPrice ;
762- $ referralLog ->ref_amount = $ totalPrice * static ::$ config ['referral_percent ' ];
763+ $ referralLog ->ref_amount = $ totalPrice * self ::$ config ['referral_percent ' ];
763764 $ referralLog ->status = 0 ;
764765 $ referralLog ->save ();
765766
@@ -829,13 +830,13 @@ public function referral(Request $request)
829830 // 生成个人推广链接
830831 $ user = $ request ->session ()->get ('user ' );
831832
832- $ view ['referral_traffic ' ] = static ::$ config ['referral_traffic ' ];
833- $ view ['referral_percent ' ] = static ::$ config ['referral_percent ' ];
834- $ view ['referral_money ' ] = static ::$ config ['referral_money ' ];
833+ $ view ['referral_traffic ' ] = $ this -> flowAutoShow ( self ::$ config ['referral_traffic ' ]) ;
834+ $ view ['referral_percent ' ] = self ::$ config ['referral_percent ' ];
835+ $ view ['referral_money ' ] = self ::$ config ['referral_money ' ];
835836 $ view ['referralLogList ' ] = ReferralLog::where ('ref_user_id ' , $ user ['id ' ])->with ('user ' )->paginate ();
836837 $ view ['totalAmount ' ] = ReferralLog::where ('ref_user_id ' , $ user ['id ' ])->sum ('ref_amount ' );
837838 $ view ['canAmount ' ] = ReferralLog::where ('ref_user_id ' , $ user ['id ' ])->where ('status ' , 0 )->sum ('ref_amount ' );
838- $ view ['link ' ] = static ::$ config ['website_url ' ] . '/register?aff= ' . $ user ['id ' ];
839+ $ view ['link ' ] = self ::$ config ['website_url ' ] . '/register?aff= ' . $ user ['id ' ];
839840
840841 return Response::view ('user/referral ' , $ view );
841842 }
@@ -847,8 +848,8 @@ public function extractMoney(Request $request)
847848
848849 // 校验可以提现金额是否超过系统设置的阀值
849850 $ ref_amount = ReferralLog::where ('ref_user_id ' , $ user ['id ' ])->where ('status ' , 0 )->sum ('ref_amount ' );
850- if ($ ref_amount < static ::$ config ['referral_money ' ]) {
851- return Response::json (['status ' => 'fail ' , 'data ' => '' , 'message ' => '申请失败:满 ' . static ::$ config ['referral_money ' ] . '元才可以提现,继续努力吧 ' ]);
851+ if ($ ref_amount < self ::$ config ['referral_money ' ]) {
852+ return Response::json (['status ' => 'fail ' , 'data ' => '' , 'message ' => '申请失败:满 ' . self ::$ config ['referral_money ' ] . '元才可以提现,继续努力吧 ' ]);
852853 }
853854
854855 // 判断是否已存在申请
0 commit comments