rabin 3 年之前
父節點
當前提交
9533691643
共有 4 個文件被更改,包括 18 次插入6 次删除
  1. 8 0
      service/agent/lib/Agreement.php
  2. 2 4
      service/agent/lib/Manage.php
  3. 6 2
      service/bill/lib/Cron.php
  4. 2 0
      service/option/lib/Agreement.php

+ 8 - 0
service/agent/lib/Agreement.php

@@ -393,6 +393,8 @@ class Agreement
 
         if ($info['sign']) {
         	$info['sign'] = Dever::pic($info['sign']);
+            $temp = explode('?', $info['sign']);
+            $info['sign'] = $temp[0];
         	if (strstr($info['sign'], 'http')) {
         		$pdf->Image($info['sign'], $x, $y, 20, 20);
         	}
@@ -699,6 +701,8 @@ class Agreement
 
         if ($info['sign']) {
         	$info['sign'] = Dever::pic($info['sign']);
+            $temp = explode('?', $info['sign']);
+            $info['sign'] = $temp[0];
         	if (strstr($info['sign'], 'http')) {
         		$pdf->Image($info['sign'], $x, $y, 15, 15);
         	}
@@ -1173,6 +1177,8 @@ class Agreement
 
         if ($info['sign']) {
         	$info['sign'] = Dever::pic($info['sign']);
+            $temp = explode('?', $info['sign']);
+            $info['sign'] = $temp[0];
         	if (strstr($info['sign'], 'http')) {
         		$pdf->Image($info['sign'], $x, $y, 30, 30);
         	}
@@ -1613,6 +1619,8 @@ class Agreement
 
         if ($info['sign']) {
             $info['sign'] = Dever::pic($info['sign']);
+            $temp = explode('?', $info['sign']);
+            $info['sign'] = $temp[0];
             if (strstr($info['sign'], 'http')) {
                 $pdf->Image($info['sign'], $x, $y, 30, 30);
             }

+ 2 - 4
service/agent/lib/Manage.php

@@ -258,16 +258,14 @@ class Manage
             }
 
             # 是否同步修改期权表
-            /*
-            $option_member = Dever::db('option/member')->find(array('mobile' => $member['mobile']));
+            $option_member = Dever::db('option/member')->find(array('mobile' => $member['mobile'], 'main' => 2));
             if ($option_member) {
                 $mobile_member = Dever::db('option/member')->find(array('mobile' => $mobile));
                 if ($mobile_member && $mobile_member['id'] != $member['id']) {
-                    Dever::alert('无法修改手机号,当前手机号已被代理商期权账户'.$mobile_member['name'].'使用');
+                    Dever::alert('无法修改手机号,当前手机号已被代理商期权账户'.$mobile_member['name'].'使用');
                 }
                 Dever::db('option/member')->update(array('where_id' => $option_member['id'], 'mobile' => $mobile));
             }
-            */
 
             # 同步修改其他表的手机号
             Dever::db('agent/member_agreement')->updates(array('option_mid' => $member['id'], 'set_mobile' => $mobile));

+ 6 - 2
service/bill/lib/Cron.php

@@ -485,11 +485,15 @@ class Cron
     public function shop_stat_api(){
         $month = Dever::input('month');
         $y = date('Y');
-        $m = date('m')-1;
         if($month){
             $month = $month;
         }else{
-            $month = $y.'-'.'0'.$m;
+            $m = date('m')-1;
+            if ($m == 0) {
+                $y = $y - 1;
+                $m = 12;
+            }
+            $month = $y.'-'.$m;
         }
         $start_time = $month .'-01 00:00:00';
         $end_time = date('Y-m-d', strtotime($start_time. ' +1 month -1 day')).' 23:59:59';

+ 2 - 0
service/option/lib/Agreement.php

@@ -529,6 +529,8 @@ class Agreement
 
         if ($info['sign']) {
             $info['sign'] = Dever::pic($info['sign']);
+            $temp = explode('?', $info['sign']);
+            $info['sign'] = $temp[0];
             if (strstr($info['sign'], 'http')) {
                 $pdf->Image($info['sign'], $x, $y, 20, 20);
             }