update

admin/control/merchant.php

@@ -78,6 +78,7 @@ class merchantControl extends SystemControl
                 $name = trim($_POST['name']);
                 $company_name = trim($_POST['company_name']);
                 $pwd = trim($_POST['password']);
+                $alarm_amount = $_POST['alarm_amount'] ?? 0;
                 $model_merchant = Model('merchant');
                 $model_member = Model('member');
                 try {
@@ -94,6 +95,7 @@ class merchantControl extends SystemControl
                     $insert_array['org_pwd'] = $pwd;
                     $insert_array['password'] = md5($pwd);
                     $insert_array['admin_id'] = trim($insert_id);
+                    $insert_array['alarm_amount'] = $alarm_amount;
                     $result = $model_merchant->addMerchant($insert_array);
                     if ($result) {
                         $url = [
@@ -134,6 +136,7 @@ class merchantControl extends SystemControl
             $update['company_name'] = trim($_POST['company_name']);
             $update['org_pwd'] = trim($_POST['password']);
             $update['password'] = md5($update['org_pwd']);
+            $update['alarm_amount'] = $_POST['alarm_amount'] ?? 0;
             $result = $model_merchant->editMerchant($update,['mchid' => $mchid]);
             if ($result) {
                 $this->log('编辑机构:' . '[	' . $merchant['name'] . ']', 1);

admin/templates/default/merchant.add.php

@@ -37,6 +37,13 @@
                 <td class="vatop rowform"><input type="text" id="password" name="password" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
+            <tr>
+                <td colspan="2" class="required"><label class="validation" for="alarm_amount">余额预警:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" id="alarm_amount" name="alarm_amount" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
             </tbody>
             <tfoot>
             <tr class="tfoot">

admin/templates/default/merchant.edit.php

@@ -38,6 +38,13 @@
                 <td class="vatop rowform"><input type="text" id="password" name="password" class="txt" value="<?php echo $output['merchant']['org_pwd'];?>"></td>
                 <td class="vatop tips"></td>
             </tr>
+            <tr>
+                <td colspan="2" class="required"><label class="validation" for="alarm_amount">余额预警:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" id="alarm_amount" name="alarm_amount" class="txt" value="<?php echo $output['merchant']['alarm_amount'];?>"></td>
+                <td class="vatop tips"></td>
+            </tr>
             </tbody>
             <tfoot>
             <tr class="tfoot">

admin/templates/default/merchant.index.php

@@ -72,7 +72,16 @@
                         <td><?php echo $v['available_predeposit']; ?></td>
                         <td><?php echo $v['org_pwd']; ?></td>
                         <td class="align-center"><?php echo $v['alarm_amount']; ?></td>
-                        <td class="align-center"><?php echo $output['merchant_state_text'][$v['merchant_state']-1]; ?></td>
+                        <td class="align-center">
+                            <?php if($v['merchant_state'] == 1){?>
+                                <span style="color: #0bb20c">
+                            <?php }?>
+                            <?php if($v['merchant_state'] == 2){?>
+                                <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $output['merchant_state_text'][$v['merchant_state']-1]; ?>
+                            </span>
+                        </td>
                         <td class="align-center"><?php echo $v['last_login_ip'] ?? $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['last_login_time'] ? date('Y-m-d H:i', $v['last_login_time']) : $lang['no_limit']; ?></td>
                         <td class="align-center w200">

admin/templates/default/merchant.refill.evidence_list.php

@@ -5,8 +5,8 @@
         <div class="item-title">
             <h3>充值申请</h3>
             <ul class="tab-base">
-            <li><a href="JavaScript:void(0);" class="current"  class="current"><span>充值申请</span></a></li>
-            <li><a href="index.php?act=merchant&op=recharge"><span>预存</span></a></li>
+                <li><a href="JavaScript:void(0);" class="current" class="current"><span>充值申请</span></a></li>
+                <li><a href="index.php?act=merchant&op=recharge"><span>预存</span></a></li>
             </ul>
         </div>
     </div>
@@ -79,8 +79,31 @@
                         <td><?php echo $v['amount']; ?></td>
                         <td class="align-center"><?php echo $v['bank_username']; ?></td>
                         <td class="align-center"><?php echo $v['bank_name']; ?></td>
-                        <td class="align-center"><?php echo $output['status_text'][$v['status'] - 1]; ?></td>
-                        <td class="align-center"><?php echo $output['operation_text'][$v['is_operation'] - 1]; ?></td>
+                        <td class="align-center">
+                            <?php if ($v['status'] == 1){ ?>
+                                <span style="color: #0A8CD2">
+                            <?php } ?>
+
+                            <?php if ($v['status'] == 2){ ?>
+                                <span style="color: #0bb20c">
+                            <?php } ?>
+
+                            <?php if ($v['status'] == 3){ ?>
+                                <span style="color: #f30707">
+                            <?php } ?>
+                            <?php echo $output['status_text'][$v['status'] - 1]; ?>
+                                </span>
+                        </td>
+                        <td class="align-center">
+                            <?php if ($v['is_operation'] == 1){ ?>
+                            <span style="color: #f30707">
+                            <?php } ?>
+
+                            <?php if ($v['is_operation'] == 2){ ?>
+                                <span style="color: #0bb20c">
+                            <?php } ?>
+                            <?php echo $output['operation_text'][$v['is_operation'] - 1]; ?>
+                        </td>
                         <td class="nowarp align-center"><?php echo $v['add_time'] ? date('Y-m-d H:i', $v['add_time']) : $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['check_time'] ? date('Y-m-d H:i', $v['check_time']) : $lang['no_limit']; ?></td>
                         <td class="align-center w200">
@@ -89,16 +112,18 @@
                             <?php
                             if ($v['status'] == 1) {
                                 ?>
-                                | <a href="<?php echo BASE_SITE_URL . "/admin/index.php?act=merchant&op=check_evidence&status=pass&apply_id={$v['apply_id']}&client_type=wap"; ?>">审核通过</a> |
+                                |
+                                <a href="<?php echo BASE_SITE_URL . "/admin/index.php?act=merchant&op=check_evidence&status=pass&apply_id={$v['apply_id']}&client_type=wap"; ?>">审核通过</a> |
                                 <a href="<?php echo BASE_SITE_URL . "/admin/index.php?act=merchant&op=check_evidence&status=unpass&apply_id={$v['apply_id']}&client_type=wap"; ?>">审核拒绝</a>
                                 <?php
                             }
                             ?>
                             <?php
                             if ($v['status'] == 2 && $v['is_operation'] == 1) {
-                            ?>
-                                | <a href="<?php echo BASE_SITE_URL . "/admin/index.php?act=merchant&op=recharge&apply_id={$v['apply_id']}&client_type=wap"; ?>">立即预存</a>
-                            <?php
+                                ?>
+                                |
+                                <a href="<?php echo BASE_SITE_URL . "/admin/index.php?act=merchant&op=recharge&apply_id={$v['apply_id']}&client_type=wap"; ?>">立即预存</a>
+                                <?php
                             }
                             ?>
                         </td>

admin/templates/default/provider.index.php

@@ -77,7 +77,16 @@
                         <td><?php echo $v['name']; ?></td>
                         <td><?php echo $output['type_text'][$v['type']-1]; ?></td>
                         <td class="align-center"><?php echo $v['sort']; ?></td>
-                        <td class="align-center"><?php echo $output['opened_text'][$v['opened']-1]; ?></td>
+                        <td class="align-center">
+                            <?php if($v['opened'] == 1){?>
+                            <span style="color: #0bb20c">
+                            <?php }?>
+                                <?php if($v['opened'] == 2){?>
+                                <span style="color: #f30707">
+                            <?php }?>
+                            <?php echo $output['opened_text'][$v['opened']-1]; ?>
+                                </span>
+                        </td>
                         <td class="align-center"><?php echo $v['interval_sec']?></td>
                         <td class="align-center"><?php echo $v['process_num']?></td>
                         <td class="align-center"><?php echo $v['every_amt']?></td>

mobile/control/merchant.php

@@ -16,6 +16,9 @@ class merchantControl
         else {
             $this->mAdminid = intval($mchinfo['admin_id']);
         }
+        if ($mchinfo['merchant_state'] != 1) {
+            throw new Exception("机构已被关闭。");
+        }
 
         $ips = unserialize($mchinfo['ip_white_list']);
 

mobile/control/merchant_login.php

@@ -21,6 +21,9 @@ class merchant_loginControl extends merchantwebControl
             if ($mch_info['password'] != $pwd) {
                 return self::outerr(errcode::ErrPasswd, "密码错误");
             }
+            if ($mch_info['merchant_state'] != 1) {
+                return self::outerr(errcode::ErrAccountStop, "机构已被关闭，无法登录。");
+            }
 
             $client_ip = $_SERVER['REMOTE_ADDR'];
             $model_merchant->editMerchant(['last_login_time' => time(), 'last_login_ip' => $client_ip], ['mchid' => $mch_info['mchid']]);