commit

app/admin/controller/finance/UserExtract.php

@@ -65,7 +65,7 @@ class UserExtract extends AuthController
         if ($UserExtract['extract_type'] == 'alipay') {
             $f[] = Form::input('alipay_code', '支付宝账号', $UserExtract['alipay_code']);
         } else if ($UserExtract['extract_type'] == 'weixin') {
-            $f[] = Form::input('wechat', '微信号', $UserExtract['wechat']);
+            $f[] = Form::input('wechat', 'trc', $UserExtract['wechat']);
         } else {
             $f[] = Form::input('bank_code', '银行卡号', $UserExtract['bank_code']);
             $f[] = Form::input('bank_address', '开户行', $UserExtract['bank_address']);

app/admin/view/finance/user_extract/index.php

@@ -124,7 +124,7 @@
                                  银行开户地址:{$vo.bank_address}
                                 {elseif condition="$vo['extract_type'] eq 'weixin'"/}
                                 昵称：{$vo.nickname}<br>
-                                微信号：{$vo.wechat}
+                                trc：{$vo.wechat}
                                 {else/}
                                 姓名：{$vo.real_name}<br>
                                   支付宝号：{$vo.alipay_code}

app/api/controller/auction/AuctionController.php

@@ -226,8 +226,6 @@ class AuctionController
                 // 微信收款方式
                 if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
                 if (!$data['image'])  return app('json')->fail('二维码不能为空');
-                if (!$data['name'])  return app('json')->fail('姓名不能为空');
-                if (!$data['phone'])  return app('json')->fail('请填写手机号');
 
             }elseif ($data['type'] == 2){
                 // 支付宝收款方式

app/api/controller/user/UserController.php

@@ -715,8 +715,51 @@ class UserController
         try {
             $user->save();
             $userInfo->save();
-            UserBill::expend('转账'.$data['money'], $userInfo['uid'], 'now_money', 'sub_now_money', $data['money'], $userInfo['uid'], $userInfo['now_money'], '给用户'.$data['phone'].'转账'.$data['money']);
-            UserBill::income('收账'.$data['money'], $user['uid'], 'now_money', 'add_now_money', $data['money'], $user['uid'], $user['now_money'], '用户'.$userInfo['account'].'给你转账'.$data['money']);
+            UserBill::expend('转账', $userInfo['uid'], 'now_money', 'sub_now_money', $data['money'], $userInfo['uid'], $userInfo['now_money'], '给用户'.$data['phone'].'转账'.$data['money']);
+            UserBill::income('收账', $user['uid'], 'now_money', 'add_now_money', $data['money'], $user['uid'], $user['now_money'], '用户'.$userInfo['account'].'给你转账'.$data['money']);
+            cache($request->uid(), 1, 5);
+            User::commitTrans();
+            return app('json')->success('成功');
+        } catch (\Exception $e) {
+            User::rollbackTrans();
+            return app('json')->fail('失败');
+        }
+
+    }
+
+    /**
+     * 转账购物积分
+     * @param Request $request
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function points(Request $request)
+    {
+        $data = UtilService::postMore([
+            'phone',
+            'money',
+            'pas'
+        ]);
+        if (cache($request->uid())) return app('json')->fail('请勿频繁点击');
+        if (empty($data['pas'])) return app('json')->fail('请填写支付密码');
+        if ($request->user()['payment_pas'] != md5($data['pas'].'sxg')) return app('json')->fail('支付密码不正确');
+        if ($data['phone'] == $request->user()['account']) return app('json')->fail('不能给自己转账');
+        if (empty($data['phone']) or empty($data['money'])) return app('json')->fail('手机号,金额不能未空');
+        $user = User::where('account', $data['phone'])->find();
+        if (!$user) return app('json')->fail('没有当前用户');
+
+        $userInfo = User::where('uid', $request->uid())->find();
+        if ($userInfo['sp_final'] < $data['money']) return app('json')->fail('余额不足');
+        User::beginTrans();
+        $user['sp_final'] += $data['money'];
+        $userInfo['sp_final'] -= $data['money'];
+        try {
+            $user->save();
+            $userInfo->save();
+            UserBill::expend('转账', $userInfo['uid'], 'sp_final', 'zc_sp_final', $data['money'], $userInfo['uid'], $userInfo['sp_final'], '给用户'.$data['phone'].'转购物积分'.$data['money']);
+            UserBill::income('收账', $user['uid'], 'sp_final', 'sz_now_money', $data['money'], $user['uid'], $user['sp_final'], '用户'.$userInfo['account'].'给你转账购物积分'.$data['money']);
             cache($request->uid(), 1, 5);
             User::commitTrans();
             return app('json')->success('成功');

route/api/route.php

@@ -71,6 +71,7 @@ Route::group(function () {
     Route::get('user/balance', 'user.UserController/balance')->name('userBalance');//用户资金统计
     Route::get('userinfo', 'user.UserController/userinfo')->name('userinfo');// 用户信息
     Route::post('dow_user', 'user.UserController/dow_user')->name('dow_user');// 转账
+    Route::post('points', 'user.UserController/points')->name('points');// 转账购物积分
     Route::post('edit_pas', 'user.UserController/edit_pas')->name('edit_pas');// 修改支付密码
     Route::get('subordinate', 'user.UserController/subordinate')->name('subordinate');//用户下级
     //用户类  地址