edit

app/shop/lib/Sell.php

@@ -614,17 +614,16 @@ class Sell
                                     }
                                 }
                             }
-                            $data['card']['cash'] = $price;
-                            $data['price'] -= $data['card']['cash'];
                         } else {
                             $price = $data['price'];
-                            if ($card_cash >= $price) {
-                                $data['card']['cash'] = $price;
-                                $data['price'] = 0;
-                            } else {
-                                $data['card']['cash'] = $card_cash;
-                                $data['price'] -= $data['card']['cash'];
-                            }
+                        }
+
+                        if ($card_cash >= $price) {
+                            $data['card']['cash'] = $price;
+                            $data['price'] = 0;
+                        } else {
+                            $data['card']['cash'] = $card_cash;
+                            $data['price'] -= $data['card']['cash'];
                         }
 
                         if ($xian && ($price <= 0 || ($card_info['min'] > 0 && $price < $card_info['min']))) {

service/agent/lib/Manage.php

@@ -621,7 +621,7 @@ class Manage
                         }
                     }
                 }
-                return;
+                return $cash * $total;
             }
             
         } elseif ($v['type'] == 3) {

service/agent/lib/Order.php

@@ -620,7 +620,7 @@ class Order
 
         $button = $this->show_button($process, $info, $role, $parent_member);
 
-        if (($info['status'] == 3 || $info['status'] == 4) && $info['agent_cash'] > 0) {
+        if (($info['status'] == 3 || $info['status'] == 4) && $info['agent_cash'] >= 0) {
 
             if (isset($process[3]) && $process[3]) {
                 $process[3]['type'] = explode(',', $process[3]['type']);
@@ -1311,9 +1311,11 @@ class Order
                 } elseif ($v['type'] == 2) {
                     $card = Dever::db('card/info')->find($v['type_id']);
                     if ($card['create_type'] == 3) {
+                        $card['value'] = round($info['price']*($v['num']/100), 2);
                         $v['num'] = $v['num'] . '%';
                     } else {
                         $v['num'] = $v['num'] * $t;
+                        $card['value'] = $card['value'] * $v['num'];
                     }
                     
                     $table['body'][] = array('电子券', $card['name'], $card['value'], $v['num']);

service/agent/src/Auth.php

@@ -6,6 +6,51 @@ use Dever;
 
 class Auth
 {
+    public function test()
+    {
+        $data = Dever::db('agent/member')->fetchAll('select count(uid) as num,value from churen_invite_code group by value order by num asc');
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['num'] > 1) {
+                    $info = Dever::db('agent/member')->fetchAll('select * from churen_invite_code where value = '.$v['value'].' order by id asc');
+                    if ($info) {
+                        foreach ($info as $v1) {
+                            $user = Dever::db('agent/member')->fetchAll('select * from churen_invite_code where uid = '.$v1['uid'].' order by id asc');
+                            if ($user) {
+                                foreach ($user as $k2 => $v2) {
+                                    if ($k2 > 0) {
+                                        Dever::db('agent/member')->query('delete from churen_invite_code where uid = '.$v1['uid'].' and id = ' . $v2['id']);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public function test1()
+    {
+        $data = Dever::db('agent/member')->fetchAll('select count(uid) as num,uid from churen_invite_code group by uid order by num asc;');
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['num'] > 1) {
+                    $user = Dever::db('agent/member')->fetchAll('select * from churen_invite_code where uid = '.$v['uid'].' order by id asc');
+                    if ($user) {
+                        foreach ($user as $k2 => $v2) {
+                            if ($k2 > 0) {
+                                Dever::db('agent/member')->query('delete from churen_invite_code where uid = '.$v['uid'].' and id = ' . $v2['id']);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
 	/**
      * 验证码登录
      *

service/agent/src/My.php

@@ -739,6 +739,9 @@ class My extends Core
         if ($cash > $this->user['cash']) {
             Dever::alert('您的可提现金额不足');
         }
+        if ($cash < 50) {
+            Dever::alert('未满50元不可提现');
+        }
         /*
         $name = Dever::input('name');
         if (!$name) {