edit

app/card/src/Api.php

@@ -167,7 +167,7 @@ class Api extends Core
             }
 
             if ($info['info']['end_dh_day'] && $info['info']['end_dh_day'] > 0) {
-                $data['eddate'] = $data['bdate'] + ($info['info']['end_dh_day'] * 86400);
+                $data['eddate'] = ($data['bdate'] ? $data['bdate'] : $data['cdate']) + ($info['info']['end_dh_day'] * 86400);
             }
 
             if (isset($data['eddate']) && $data['eddate'] && $data['eddate'] > 0) {
@@ -246,7 +246,7 @@ class Api extends Core
                 }
 
                 if ($v['info']['end_dh_day'] && $v['info']['end_dh_day'] > 0) {
-                    $v['eddate'] = $v['bdate'] + ($v['info']['end_dh_day'] * 86400);
+                    $v['eddate'] = ($v['bdate'] ? $v['bdate'] : $v['cdate']) + ($v['info']['end_dh_day'] * 86400);
                 }
 
                 if (isset($v['eddate']) && $v['eddate'] && $v['eddate'] > 0) {
@@ -362,7 +362,7 @@ class Api extends Core
                     continue;
                 }
                 if ($v['info']['end_dh_day'] && $v['info']['end_dh_day'] > 0) {
-                    $v['eddate'] = $v['bdate'] + ($v['info']['end_dh_day'] * 86400);
+                    $v['eddate'] = ($v['bdate'] ? $v['bdate'] : $v['cdate']) + ($v['info']['end_dh_day'] * 86400);
                 }
 
                 if (isset($v['eddate']) && $v['eddate'] && $v['eddate'] > 0) {

app/shop/lib/Sell.php

@@ -560,6 +560,21 @@ class Sell
                 $card_code = Dever::db('card/code')->find($card);
                 if ($card_code['dh_uid'] == $data['uid']) {
                     $card_info = Dever::db('card/info')->find($card_code['card_id']);
+                    $card_state = true;
+                    if (!$card_info) {
+                        $card_state = false;
+                    }
+                    if ($card_info['end_dh_day'] && $card_info['end_dh_day'] > 0) {
+                        $card_code['eddate'] = ($card_code['bdate'] ? $card_code['bdate'] : $card_code['cdate']) + ($card_info['end_dh_day'] * 86400);
+                    }
+
+                    if (isset($card_code['eddate']) && $card_code['eddate'] && $card_code['eddate'] > 0) {
+                        $time = time();
+                        if ($card_code['eddate'] <= $time) {
+                            $card_state = false;
+                        }
+                    }
+
                     if (!$card_code['total_cash']) {
                         $card_code['total_cash'] = $card_info['value'];
                     }
@@ -568,7 +583,7 @@ class Sell
                     }
                     $card_cash = $card_code['total_cash'] - $card_code['use_cash'];
 
-                    if ($card_cash > 0) {
+                    if ($card_state && $card_cash > 0) {
                         $data['card'] = array();
                         $card_goods = array();
                         $check = false;

app/shop/src/My.php

@@ -21,6 +21,9 @@ class My extends Core
 		$this->data['coupon_num'] = Dever::db('shop/user_coupon')->total(array('uid' => $this->uid, 'status' => 1));
 
 		$this->data['card_num'] = Dever::db('card/code')->total(array('dh_uid' => $this->uid));
+		if ($this->data['card_num'] > 0) {
+			
+		}
 
 		$this->data['score'] = Dever::load('score/lib/core')->getUserScore($this->uid);
 

service/agent/lib/Agreement.php

@@ -222,6 +222,20 @@ class Agreement
                 $up = array();
                 $up['content'] = Dever::array_encode($this->$method($agreement, $info));
                 $up['where_id'] = $info['id'];
+                $member = Dever::db('agent/member')->find($info['mid']);
+                $up['name'] = $member['name'];
+                $up['type'] = $member['type'];
+                $up['company_number'] = $member['company_number'];
+                $up['idcard'] = $member['idcard'];
+                $up['mobile'] = $member['mobile'];
+                $up['role'] = $member['role'];
+                $up['area'] = $member['area'];
+                $up['idcard_front'] = $member['idcard_front'];
+                $up['idcard_back'] = $member['idcard_back'];
+                $up['company_name'] = $member['company_name'];
+                $up['company_pic'] = $member['company_pic'];
+                $role = Dever::db('setting/role')->find($up['role']);
+                $up['agreement_name'] = $this->name($agreement, $up, $role);
                 $state = Dever::db('agent/member_agreement')->update($up);
             }
         }
@@ -252,9 +266,17 @@ class Agreement
                     $info['company_number'] = $member['company_number'];
                     $info['idcard'] = $member['idcard'];
                     $info['mobile'] = $member['mobile'];
+                    $info['role'] = $member['role'];
+                    $info['area'] = $member['area'];
+                    $info['idcard_front'] = $member['idcard_front'];
+                    $info['idcard_back'] = $member['idcard_back'];
+                    $info['company_name'] = $member['company_name'];
+                    $info['company_pic'] = $member['company_pic'];
 
                     $info['sign'] = '';
                     $info['status'] = 1;
+                    $role = Dever::db('setting/role')->find($info['role']);
+                    $info['agreement_name'] = $this->name($agreement, $info, $role);
                     Dever::db('agent/member_agreement')->insert($info);
                 }
             }

service/agent/src/Auth.php

@@ -51,6 +51,28 @@ class Auth
         }
     }
 
+    public function test_2()
+    {
+        $member = Dever::db('agent/member')->select();
+
+        if ($member) {
+            foreach ($member as $k => $v) {
+                if ($v['id'] >= 50000) {
+                    $info = Dever::db('agent/order')->find(array('mid' => $v['id']));
+                    if ($info) {
+                        $update = array();
+                        $update['where_id'] = $info['id'];
+                        $update['avatar'] = $v['avatar'];
+                        $update['sign'] = $v['sign'];
+                        $update['idcard_front'] = $v['idcard_front'];
+                        $update['idcard_back'] = $v['idcard_back'];
+                        Dever::db('agent/order')->update($update);
+                    }
+                }
+            }
+        }
+    }
+
 	/**
      * 验证码登录
      *