rabin 3 lat temu
rodzic
commit
fff31ab7ae
2 zmienionych plików z 15 dodań i 2 usunięć
  1. 7 1
      app/shop/database/sell_order.php
  2. 8 1
      service/agent/src/My.php

+ 7 - 1
app/shop/database/sell_order.php

@@ -115,7 +115,12 @@ if ($search_option_shop_type == 1) {
     );
     $refund_search = 'select';
 }
-
+$mul = false;
+if (Dever::load('manage/auth')->checkFunc('menu_61.menu_85', 'piliangfafang', '批量发放')) {
+    $mul = '{status} == 4';
+} elseif (Dever::load('manage/auth')->checkFunc('menu_61.menu_218', 'piliangfafang', '批量发放')) {
+    $mul = '{status} == 4';
+}
 return array
 (
     # 表名
@@ -698,6 +703,7 @@ return array
         'edit' => false,
         'insert' => false,
         'excel' => $excel,
+        'mul' => $mul,
 
         # 表格使用html模式,默认是js渲染模式
         'list_table' => 'html',

+ 8 - 1
service/agent/src/My.php

@@ -1051,7 +1051,14 @@ class My extends Core
         if ($where['id']) {
             $info = Dever::db('agent/member_agreement')->find($where);
             if ($info && $info['status'] == 1) {
-                $state = Dever::db('agent/member_agreement')->update(array('sign' => $sign, 'where_id' => $info['id'], 'status' => 2, 'qdate' => time()));
+                $u = array();
+                $u = array('sign' => $sign, 'where_id' => $info['id'], 'status' => 2);
+                if ($info['qdate'] && $info['qdate'] > 0) {
+                    
+                } else {
+                    $u['qdate'] = time();
+                }
+                $state = Dever::db('agent/member_agreement')->update($u);
                 if ($state) {
                     $role = Dever::db('setting/role')->find($info['role']);
                     $info['sign'] = $sign;