11

app/business/WithdrawBusiness.php

@@ -113,6 +113,15 @@ class WithdrawBusiness
                 if (10 > $param['money']) {
                     throw new \Exception('最小提现金额:10元');
                 }
+            }elseif ($param['mold'] == 24) {
+
+                if (10 > $param['money']) {
+                    throw new \Exception('最小提现金额:10元');
+                }
+            }elseif ($param['mold'] == 25) {
+                if (100 > $param['money']) {
+                    throw new \Exception('最小提现金额:100元');
+                }
             } else {
                 throw new \Exception('提现功能暂未开放!');
             }

app/controller/WithdrawController.php

@@ -49,34 +49,27 @@ class WithdrawController
                 throw new \Exception('请实名后再进行提现!');
             }
 
-//                $is_buy   = Db::table('wa_payorder')
-//                    ->where('user_id',  $param['user_data']['id'])
-//                    ->where('is_pay', 2)
-//                    ->where('goods_type', 1)
-//                    ->first();
-//                if(!$is_buy){
-//                    Db::rollBack();
-//                    return error('功能暂未开放!',[],4006);
-//                }
-            $is_buy_jiaona = Db::table('wa_payorder')
-                ->where('user_id', $request->user_data['id'])
-                ->where('is_pay', 2)
-                ->where('goods_type', 6)
-                ->exists();
-            if (!$is_buy_jiaona) {
-                Db::rollBack();
-                return error('请先完成全球通金卡激活后即可免费提现!', [], 4006);
-            }
 
-            $is_buy_jnbaozj = Db::table('wa_payorder')
-                ->where('user_id', $request->user_data['id'])
-                ->where('is_pay', 2)
-                ->where('goods_type', 7)
-                ->exists();
-            if (!$is_buy_jnbaozj) {
-                Db::rollBack();
-                return error('请缴纳保证金，缴纳成功立即返还保证金!', [], 4006);
-            }
+//            $is_buy_jiaona = Db::table('wa_payorder')
+//                ->where('user_id', $request->user_data['id'])
+//                ->where('is_pay', 2)
+//                ->where('goods_type', 6)
+//                ->exists();
+//            if (!$is_buy_jiaona) {
+//                Db::rollBack();
+//                return error('请先完成全球通金卡激活后即可免费提现!', [], 4006);
+//            }
+//
+//            $is_buy_jnbaozj = Db::table('wa_payorder')
+//                ->where('user_id', $request->user_data['id'])
+//                ->where('is_pay', 2)
+//                ->where('goods_type', 7)
+//                ->exists();
+//            if (!$is_buy_jnbaozj) {
+//                Db::rollBack();
+//                return error('请缴纳保证金，缴纳成功立即返还保证金!', [], 4006);
+//            }
+
             if ($param['mold'] == 2) {
                 $carkdatalist = Db::table('wa_user_social_cark')
                     ->where('user_id', $request->user_data['id'])->where('type', 1)->first();

plugin/admin/app/view/user/index.html

@@ -224,6 +224,16 @@
 						title: "定向补贴",align: "center",
 						field: "money_twenty",
 						sort: true,
+                        width: 150
+					},{
+						title: "共富分红钱包",align: "center",
+						field: "money_twenty_four",
+						sort: true,
+                        width: 150
+					},{
+						title: "共富基金钱包",align: "center",
+						field: "money_twenty_five",
+						sort: true,
                         width: 150
 					},{
 						title: "佣金钱包",align: "center",

plugin/admin/app/view/user/subordinate.html

@@ -157,6 +157,16 @@
                         field: "money_twenty",
                         sort: true,
                         width: 150
+                    },{
+                        title: "共富分红钱包",align: "center",
+                        field: "money_twenty_four",
+                        sort: true,
+                        width: 150
+                    },{
+                        title: "共富基金钱包",align: "center",
+                        field: "money_twenty_five",
+                        sort: true,
+                        width: 150
                     },{
                         title: "佣金钱包",align: "center",
                         field: "money_twenty_one",